The following commit has been merged in the master branch:
commit fe4d094139533b2d0531461628c528a3f2ad3f28
Author: Benjamin Drung <[email protected]>
Date: Tue May 24 12:12:22 2011 +0200
Merge from Ubuntu: debuild: Enforce Ubuntu merge policy.
diff --git a/debian/changelog b/debian/changelog
index 591c0ce..959a88e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,11 +17,13 @@ devscripts (2.10.74) UNRELEASED; urgency=low
* dget.1: Mention `debcheckout` under `SEE ALSO`. Thanks to Paul Menzel for
the patch. (Closes: #596245)
* debchange, uupdate: Use dpkg-vendor instead of lsb_release.
+ * Merge from Ubuntu:
+ + debuild: Enforce Ubuntu merge policy.
[ David Prévot ]
* Partial manual pages convention review (Closes: #626015).
- -- Benjamin Drung <[email protected]> Sun, 22 May 2011 19:37:52 +0200
+ -- Benjamin Drung <[email protected]> Tue, 24 May 2011 12:09:19 +0200
devscripts (2.10.73) unstable; urgency=low
diff --git a/scripts/debuild.pl b/scripts/debuild.pl
index 064383c..2ec7355 100755
--- a/scripts/debuild.pl
+++ b/scripts/debuild.pl
@@ -1167,6 +1167,16 @@ EOT
close CHANGES
or fatal "problem writing to ../$changes: $!";
+ # check Ubuntu merge Policy: When merging with Debian, -v must be used
+ # and the remaining changes described
+ my $ch = join "\n", @changefilecontents;
+ if ($sourceonly && $version =~ /ubuntu1$/ && $ENV{'DEBEMAIL'} =~
/ubuntu/ &&
+ $ch =~ /(merge|sync).*Debian/i) {
+ push (@warnings, "Ubuntu merge policy: when merging Ubuntu packages
with Debian, -v must be used") unless $since;
+ push (@warnings, "Ubuntu merge policy: when merging Ubuntu packages
with Debian, changelog must describe the remaining Ubuntu changes")
+ unless $ch =~ /Changes:.*(remaining|Ubuntu)(.|\n
)*(differen|changes)/is;
+ }
+
run_hook('final-clean', $cleansource);
# Final dpkg-buildpackage action: clean target again
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
