-
Committer:
Bazaar Package Importer
-
Author(s):
Steve Kowalik
-
Date:
2007-11-11 08:14:51 UTC
-
Revision ID:
james.westby@ubuntu.com-20071111081451-zv0qc4kuurls0kyz
Tags: 2.10.10ubuntu1
* Merge from Debian unstable.
* Remaining Ubuntu changes:
- debian/control:
+ DebianMaintainerField foo.
+ Build-depend on lsb-release.
- debian/rules:
+ Actually run tests in test-stamp target.
- scripts/debchange.1:
+ Add info about --security option.
- scripts/debchange.pl:
+ Add --security option, which acts like --nmu, but adds security update
template instead of NMU template to changelog.
+ 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.
+ Default to "hardy" as distribution.
+ Add "ubuntu1" to version string for new versions.
- scripts/debuild.pl:
+ Preserve DEBEMAIL environment variable inside debuild.
+ Enforce Ubuntu merge policy.
- test/debchange.pl:
+ Test for debchange.pl
* Change the default URL parameter of rmadison to be ubuntu. The old
behaviour can be used by 'rmadison -u debian'.