--- /usr/bin/dpkg-genchanges 2007-03-06 11:38:13.000000000 +0100 +++ dpkg-genchanges 2007-05-02 12:07:31.000000000 +0200 @@ -252,6 +252,16 @@ } } +# check Ubuntu merge Policy: When merging with Debian, -v must be used and the +# remaining changes described +if ($f{'Version'} =~ /ubuntu1$/ && $ENV{'DEBEMAIL'} =~ /ubuntu/ && + $f{'Changes'} =~ /merge.*(from|to|with).*Debian/i) { + &error(_g("when merging Ubuntu packages to Debian, -v must be used")) unless $since; + &error(_g("when merging Ubuntu packages to Debian, changelog must describe the remaining Ubuntu changes")) + unless $f{'Changes'} =~ /(remaining|Ubuntu).*(differen|changes)/is; +} + + for $p (keys %p2f) { my ($pp, $aa) = (split / /, $p); defined($p2i{"C $pp"}) ||