From fb0d34ac16dced24297dcbc3312addee92af0857 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 21 Apr 2009 17:02:23 -0400 Subject: dh_fixperms: Ensure lintian overrides are mode 644. (Patch from #459548) --- debian/changelog | 7 +++++++ dh_fixperms | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index 12bfc24f..e275d4cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debhelper (7.2.9) UNRELEASED; urgency=low + + * dh_fixperms: Ensure lintian overrides are mode 644. + (Patch from #459548) + + -- Joey Hess Tue, 21 Apr 2009 17:01:41 -0400 + debhelper (7.2.8) unstable; urgency=low * dh_desktop: Now a deprecated no-op, since desktop-file-utils diff --git a/dh_fixperms b/dh_fixperms index d9c726ca..1d4a33f3 100755 --- a/dh_fixperms +++ b/dh_fixperms @@ -105,6 +105,13 @@ foreach my $package (@{$dh{DOPACKAGES}}) { "-name '*.ali' $find_options -print0", "2>/dev/null | xargs -0r chmod uga-w"); } + + # Lintian overrides should never be executable, too. + if (-d "$tmp/usr/share/lintian") { + complex_doit("find $tmp/usr/share/lintian/overrides", + "-type f $find_options -print0", + "2>/dev/null | xargs -0r chmod 644"); + } } =head1 SEE ALSO -- cgit v1.2.3 From defe98b290826ce9fd4ee098b3cdccb5513a7f06 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Wed, 29 Apr 2009 23:42:23 +0200 Subject: Fix permissions of *.cmxs files --- dh_fixperms | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dh_fixperms b/dh_fixperms index 1d4a33f3..6fa50652 100755 --- a/dh_fixperms +++ b/dh_fixperms @@ -82,6 +82,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) { # ..and desktop files .. complex_doit("find $tmp/usr/share/applications -type f $find_options -print0", "2>/dev/null | xargs -0r chmod 644"); + + # ..and OCaml native-code shared objects .. + complex_doit("find $tmp -perm -5 -type f", + "\\( -name '*.cmxs' \\) $find_options -print0", + "2>/dev/null | xargs -0r chmod 644"); # .. and perl modules. complex_doit("find $tmp/usr/lib/perl5 $tmp/usr/share/perl5 -type f", -- cgit v1.2.3 From a9c14bddba25c44ae2b3b9551002812761968a8f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 2 May 2009 20:44:24 -0400 Subject: dh_fixperms: Fix permissions of OCaml .cmxs files. Closes: #526221 --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index e275d4cb..9b944408 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ debhelper (7.2.9) UNRELEASED; urgency=low * dh_fixperms: Ensure lintian overrides are mode 644. (Patch from #459548) + * dh_fixperms: Fix permissions of OCaml .cmxs files. Closes: #526221 -- Joey Hess Tue, 21 Apr 2009 17:01:41 -0400 -- cgit v1.2.3 From 30dc53b5fc56e50f12cf46682a92dcbd4a9c6294 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 May 2009 14:46:50 -0400 Subject: dh: Add --without to allow disabling sequence addons (particularly useful to disable the default python-support addon). --- debian/changelog | 2 ++ dh | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9b944408..34eae09c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ debhelper (7.2.9) UNRELEASED; urgency=low * dh_fixperms: Ensure lintian overrides are mode 644. (Patch from #459548) * dh_fixperms: Fix permissions of OCaml .cmxs files. Closes: #526221 + * dh: Add --without to allow disabling sequence addons (particularly + useful to disable the default python-support addon). -- Joey Hess Tue, 21 Apr 2009 17:01:41 -0400 diff --git a/dh b/dh index 2a91b92d..427a1c9d 100755 --- a/dh +++ b/dh @@ -53,6 +53,10 @@ than once, and is used when there is a third-party package that provides debhelper commands. See the PROGRAMMING file for documentation about the sequence addon interface. +=item B<--without> I + +The inverse of --with, disables using the given addon. + =item B<--until> I Run commands in the sequence until and including I, then stop. @@ -172,6 +176,10 @@ default. This is how to use dh_pycentral instead. # Stash this away before init modifies it. my @ARGV_orig=@ARGV; +# python-support is enabled by default, at least for now +# (and comes first so python-central loads later and can disable it). +unshift @ARGV, "--with=python-support"; + init(options => { "until=s" => \$dh{UNTIL}, "after=s" => \$dh{AFTER}, @@ -181,6 +189,10 @@ init(options => { my ($option,$value)=@_; push @{$dh{WITH}},$value; }, + "without=s" => sub { + my ($option,$value)=@_; + @{$dh{WITH}} = grep { $_ ne $value } @{$dh{WITH}}; + }, }); inhibit_log(); @@ -253,9 +265,6 @@ $sequences{binary} = [@{$sequences{install}}, qw{ }, @b]; $sequences{'binary-arch'} = [@{$sequences{binary}}]; -# --with python-support is enabled by default, at least for now -unshift @{$dh{WITH}}, "python-support"; - # sequence addon interface sub _insert { my $offset=shift; @@ -339,11 +348,11 @@ elsif ($sequence eq 'binary-indep') { while (@ARGV_orig) { my $opt=shift @ARGV_orig; next if $opt eq $sequence; - if ($opt =~ /^--?(after|until|before|with)$/) { + if ($opt =~ /^--?(after|until|before|with|without)$/) { shift @ARGV_orig; next; } - elsif ($opt =~ /^--?(no-act|remaining|(after|until|before|with)=)/) { + elsif ($opt =~ /^--?(no-act|remaining|(after|until|before|with|without)=)/) { next; } push @options, $opt; -- cgit v1.2.3 From 9b415b170a7f4a56035bf43ebb57c96a8b4b224d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 May 2009 14:50:17 -0400 Subject: releasing version 7.2.9 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 34eae09c..0b204eb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (7.2.9) UNRELEASED; urgency=low +debhelper (7.2.9) unstable; urgency=low * dh_fixperms: Ensure lintian overrides are mode 644. (Patch from #459548) @@ -6,7 +6,7 @@ debhelper (7.2.9) UNRELEASED; urgency=low * dh: Add --without to allow disabling sequence addons (particularly useful to disable the default python-support addon). - -- Joey Hess Tue, 21 Apr 2009 17:01:41 -0400 + -- Joey Hess Mon, 04 May 2009 14:46:53 -0400 debhelper (7.2.8) unstable; urgency=low -- cgit v1.2.3 From fa78ca81c39a4c255e23e601eb2752a7be2e9ba3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 7 May 2009 07:34:31 -0400 Subject: clarify --- dh_auto_configure | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dh_auto_configure b/dh_auto_configure index 41f6210f..f06bf72f 100755 --- a/dh_auto_configure +++ b/dh_auto_configure @@ -31,8 +31,9 @@ you're encouraged to skip using dh_auto_configure at all, and just run =item B<--> I -Pass "params" to the program that is run. These can be used to supplement -or override the standard parameters that dh_auto_configure passes. +Pass "params" to the program that is run, after the standard +parameters that dh_auto_configure passes. This can be used to supplement +or override those parameters. =back -- cgit v1.2.3 From 94f05f40141f7005a711850eee8f5f7566c3a647 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 7 May 2009 16:33:46 -0400 Subject: Close COMPAT_IN filehandle. Closes: #527464 --- Debian/Debhelper/Dh_Lib.pm | 1 + debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm index b57c4d97..829eabfc 100644 --- a/Debian/Debhelper/Dh_Lib.pm +++ b/Debian/Debhelper/Dh_Lib.pm @@ -300,6 +300,7 @@ sub dirname { # Try the file.. open (COMPAT_IN, "debian/compat") || error "debian/compat: $!"; my $l=; + close COMPAT_IN; if (! defined $l || ! length $l) { warning("debian/compat is empty, assuming level $c"); } diff --git a/debian/changelog b/debian/changelog index 0b204eb8..3b9e42ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +debhelper (7.2.10) UNRELEASED; urgency=low + + * Close COMPAT_IN filehandle. Closes: #527464 + + -- Joey Hess Thu, 07 May 2009 16:33:25 -0400 + debhelper (7.2.9) unstable; urgency=low * dh_fixperms: Ensure lintian overrides are mode 644. -- cgit v1.2.3 From 0cd329f4736b8d1178a543e2540478597c22dcc3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 May 2009 13:13:26 -0400 Subject: dh_auto_configure: Clarify man page re adding configure parameters. Closes: #527256 --- debian/changelog | 2 ++ dh_auto_configure | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3b9e42ae..05369192 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ debhelper (7.2.10) UNRELEASED; urgency=low * Close COMPAT_IN filehandle. Closes: #527464 + * dh_auto_configure: Clarify man page re adding configure + parameters. Closes: #527256 -- Joey Hess Thu, 07 May 2009 16:33:25 -0400 diff --git a/dh_auto_configure b/dh_auto_configure index f06bf72f..da1f7511 100755 --- a/dh_auto_configure +++ b/dh_auto_configure @@ -33,7 +33,9 @@ you're encouraged to skip using dh_auto_configure at all, and just run Pass "params" to the program that is run, after the standard parameters that dh_auto_configure passes. This can be used to supplement -or override those parameters. +or override those parameters. For example: + + dh_auto_configure -- --with-foo --enable-bar =back -- cgit v1.2.3 From c26285a657cc521716be404799dda430df1e6c8e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 May 2009 13:20:11 -0400 Subject: mention quilt --- dh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dh b/dh index 427a1c9d..ea1605f1 100755 --- a/dh +++ b/dh @@ -171,6 +171,13 @@ default. This is how to use dh_pycentral instead. %: dh --with python-central $@ +To patch your package using quilt, you can tell dh to use quilt's dh +sequence addons like this: + + #!/usr/bin/make -f + %: + dh --with quilt $@ + =cut # Stash this away before init modifies it. -- cgit v1.2.3 From e136c5ed3db0ef8d403bccabcdb1b4b91af35a73 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 10 May 2009 13:07:06 -0400 Subject: dh_auto_configure: Pass packlist=0 when running Makefile.PL, in case it is a Build.PL passthru, to avoid it creating the .packlist file. Closes: #527990 --- debian/changelog | 3 +++ dh_auto_configure | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 05369192..7ef8a63c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ debhelper (7.2.10) UNRELEASED; urgency=low * Close COMPAT_IN filehandle. Closes: #527464 * dh_auto_configure: Clarify man page re adding configure parameters. Closes: #527256 + * dh_auto_configure: Pass packlist=0 when running Makefile.PL, + in case it is a Build.PL passthru, to avoid it creating + the .packlist file. Closes: #527990 -- Joey Hess Thu, 07 May 2009 16:33:25 -0400 diff --git a/dh_auto_configure b/dh_auto_configure index da1f7511..2dc3eb32 100755 --- a/dh_auto_configure +++ b/dh_auto_configure @@ -91,7 +91,7 @@ elsif (-e "Makefile.PL") { # If set to a true value then MakeMaker's prompt function will # # always return the default without waiting for user input. $ENV{PERL_MM_USE_DEFAULT}=1; - doit("perl", "Makefile.PL", "INSTALLDIRS=vendor", @{$dh{U_PARAMS}}); + doit("perl", "Makefile.PL", "INSTALLDIRS=vendor", "create_packlist=0", @{$dh{U_PARAMS}}); } elsif (-e "Build.PL") { $ENV{PERL_MM_USE_DEFAULT}=1; # Module::Build can also use this. -- cgit v1.2.3 From dd0ea070fcb2935b570dda4677039901cf601799 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 10 May 2009 13:09:00 -0400 Subject: releasing version 7.2.10 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7ef8a63c..e8150273 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (7.2.10) UNRELEASED; urgency=low +debhelper (7.2.10) unstable; urgency=low * Close COMPAT_IN filehandle. Closes: #527464 * dh_auto_configure: Clarify man page re adding configure @@ -7,7 +7,7 @@ debhelper (7.2.10) UNRELEASED; urgency=low in case it is a Build.PL passthru, to avoid it creating the .packlist file. Closes: #527990 - -- Joey Hess Thu, 07 May 2009 16:33:25 -0400 + -- Joey Hess Sun, 10 May 2009 13:07:08 -0400 debhelper (7.2.9) unstable; urgency=low -- cgit v1.2.3 From 4e6b4536d7611a303b4e57de932dce5bd07ee93f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 May 2009 14:51:03 -0400 Subject: dh: Support --with addon,addon,... Closes: #528178 --- debian/changelog | 7 +++++++ dh | 9 +++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index e8150273..22bc55ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debhelper (7.2.11) UNRELEASED; urgency=low + + * dh: Support --with addon,addon,... + Closes: #528178 + + -- Joey Hess Mon, 11 May 2009 14:50:33 -0400 + debhelper (7.2.10) unstable; urgency=low * Close COMPAT_IN filehandle. Closes: #527464 diff --git a/dh b/dh index ea1605f1..701f588e 100755 --- a/dh +++ b/dh @@ -11,7 +11,7 @@ use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS -B sequence [B<--with> I] [B<--until> I] [B<--before> I] [B<--after> I] [B<--remaining>] [S>] +B sequence [B<--with> I[,I,...]] [B<--until> I] [B<--before> I] [B<--after> I] [B<--remaining>] [S>] =head1 DESCRIPTION @@ -45,11 +45,12 @@ you should Build-Depend on debhelper 7.0.50 or above.) =over 4 -=item B<--with> I +=item B<--with> I[,I,...] Add the debhelper commands specified by the given addon to appropriate places in the sequence of commands that is run. This option can be repeated more -than once, and is used when there is a third-party package that provides +than once, or multiple addons can be listed, separated by commas. +This is used when there is a third-party package that provides debhelper commands. See the PROGRAMMING file for documentation about the sequence addon interface. @@ -194,7 +195,7 @@ init(options => { "remaining" => \$dh{REMAINING}, "with=s" => sub { my ($option,$value)=@_; - push @{$dh{WITH}},$value; + push @{$dh{WITH}},split(",", $value); }, "without=s" => sub { my ($option,$value)=@_; -- cgit v1.2.3