-
Committer:
Bazaar Package Importer
-
Author(s):
Benjamin Drung
-
Date:
2011-05-22 19:49:16 UTC
-
mfrom:
(10.9.4 sid)
(10.7.8 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20110522194916-tmmamo4499eh1z0a
Tags: 2.10.73ubuntu1
* Merge from Debian unstable (LP: #717389); remaining changes:
- Demote 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; universe only.
+ debian-{keyring,maintainers}: not useful enough in Ubuntu; universe
only.
+ equivs: too much of a hack to install by default; universe only.
+ libyaml-syck-perl: transition-check is fairly Debian-specific.
- scripts/debchange.{pl,1}:
+ 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= and DEBCHANGE_DISTRIBUTOR to override lsb_release
output.
+ Default to "oneiric" 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.
+ Don't use the last distribution in debian/changelog when doing
"dch -r" on Ubuntu. "Just because it was last uploaded to jaunty
doesn't mean that's the right thing to do now." Thanks to Colin
Watson. (LP: #429288)
- scripts/debsign.{sh,1}: Implement DEBSIGN_ALWAYS_RESIGN variable to skip
the "Would you like to use the current signature?" question. (Debian
#447955)
- scripts/debuild.pl: Enforce Ubuntu merge policy.
- scripts/dscverify.pl: Add Ubuntu keyrings.
- scripts/rmadison.pl: Change default URL parameter to ubuntu.
- Add test/debchange.pl, test/Makefile: debchange test suite.
- Rename XS-Vcs-* to XS-Debian-Vcs-*.
* debchange: Use dpkg-vendor instead of lsb_release.
* debchange: Add DEBCHANGE_DISTRIBUTOR to array of config variables. Thanks
to Adam Dorsey for the patch. (LP: #783693)