diff -Nru ubuntu-defaults-builder-0.29/bin/dh_ubuntu_defaults ubuntu-defaults-builder-0.30/bin/dh_ubuntu_defaults --- ubuntu-defaults-builder-0.29/bin/dh_ubuntu_defaults 2012-04-02 14:26:15.000000000 +0000 +++ ubuntu-defaults-builder-0.30/bin/dh_ubuntu_defaults 2012-04-03 07:22:05.000000000 +0000 @@ -113,6 +113,7 @@ my $package = shift; my $file = shift; + return if $dh{DISABLE_RESTRICTIONS}; return unless $package =~ /^ubuntu-/; # check if our template (NOT the package's file) has a "NotUbuntu:" tag; @@ -585,7 +586,9 @@ } } -init(); +init(options => { + "disable-restrictions" => \$dh{DISABLE_RESTRICTIONS}, +}); init_macros(); diff -Nru ubuntu-defaults-builder-0.29/debian/changelog ubuntu-defaults-builder-0.30/debian/changelog --- ubuntu-defaults-builder-0.29/debian/changelog 2012-04-02 14:29:53.000000000 +0000 +++ ubuntu-defaults-builder-0.30/debian/changelog 2012-04-03 07:28:22.000000000 +0000 @@ -1,3 +1,10 @@ +ubuntu-defaults-builder (0.30) precise; urgency=low + + * bin/dh_ubuntu_defaults: Add (undocumented) --disable-restrictions option. + (LP: #971994) + + -- Martin Pitt Tue, 03 Apr 2012 09:28:22 +0200 + ubuntu-defaults-builder (0.29) precise; urgency=low * bin/dh_ubuntu_defaults: Fix unintentional closure binding of $tmp in diff -Nru ubuntu-defaults-builder-0.29/test/run ubuntu-defaults-builder-0.30/test/run --- ubuntu-defaults-builder-0.29/test/run 2012-04-02 14:12:14.000000000 +0000 +++ ubuntu-defaults-builder-0.30/test/run 2012-04-03 07:26:13.000000000 +0000 @@ -386,6 +386,25 @@ 'desktop', 'background.jpg')) self.build(expect_fail=True) + def test_ubuntu_restrictions_disable(self): + '''Disable ubuntu-* restrictions''' + + self.rename_package('ubuntu-defaults-test') + self.enable_example('desktop/default-session.txt') + + rules_path = os.path.join(self.pkgdir, 'debian', 'rules') + with open(rules_path) as f: + rules = f.read() + rules = rules.replace('dh_ubuntu_defaults', 'dh_ubuntu_defaults --disable-restrictions') + with open(rules_path, 'w') as f: + f.write(rules) + + self.build(expect_fail=False) + + with open(os.path.join(self.debdir, + 'usr/share/ubuntu-defaults-test/default-session.txt')) as f: + self.assertEqual(f.read(), 'ubuntu-2d') + def test_image_syntax(self): '''syntax check of ubuntu-defaults-image'''