-
Committer:
Bazaar Package Importer
-
Author(s):
Colin Watson
-
Date:
2009-04-27 15:03:40 UTC
-
Revision ID:
james.westby@ubuntu.com-20090427150340-551qmx2tqvl8rtfq
Tags: 2.10.48ubuntu1
* Resynchronise with Debian. Remaining changes:
- rmadison: Change default URL parameter to ubuntu.
- scripts/debchange.pl:
+ Adjust --security template for Ubuntu.
+ Add -U/--upstream flag that forces original "just increment
the end" behaviour; Ubuntu is upstream for some pieces of software.
+ Add --distributor= to override lsb_release output.
+ Add "karmic" as valid release name.
+ Default to "karmic" as distribution.
+ Add "ubuntu1" to version string for new versions, with tweaks for
special cases.
+ Add -R/--rebuild flag for Ubuntu's no-change rebuilds.
- Add test/debchange.pl, test/Makefile: debchange test suite; call it
during build in debian/rules. Also add lsb-release build dependency for
this, so that debchange uses Ubuntu mode.
- scripts/debuild.pl: Enforce Ubuntu merge policy.
- scripts/debsign.{sh,1}: Implement DEBSIGN_ALWAYS_RESIGN variable to skip
the "Would you like to use the current signature?" question. (Debian
#447955)
- scripts/uupdate.{sh,1}: Use -0ubuntu1 default revision on Ubuntu.
- scripts/dscverify.pl: Add Ubuntu keyrings.
- scripts/debcommit.pl: Re-enable --fixes integration for launchpad
bugs, as the code is present in our dpkg-dev.
- Drop universe packages from Recommends to Suggests:
+ libcrypt-ssleay-perl: only needed for a corner case (uscan on SSL
download sites), wasn't installed by default in previous releases
either, and seems quite dead upstream
+ libsoap-lite-perl: only needed for one less common command ("select")
for bts, which isn't useful for Ubuntu itself, and pulls in a lot of
other universe Perl libraries
+ debian-{keyring,maintainers}: not useful enough in Ubuntu
+ equivs: too much of a hack to install by default
+ libyaml-syck-perl: transition-check is fairly Debian-specific
* scripts/debcommit.pl: Handle new location of find_launchpad_closes
function in dpkg 1.15.0 (Debian #525823).