Hello community,
here is the log from the commit of package deb for openSUSE:Factory
checked in at Sat Apr 18 13:54:54 CEST 2009.
--------
--- deb/deb.changes 2009-04-06 15:34:49.000000000 +0200
+++ /mounts/work_src_done/STABLE/deb/deb.changes 2009-04-16 11:57:40.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Apr 16 11:55:35 CEST 2009 - puzel@suse.cz
+
+- update to debhelper-7.2.7
+ * fix calling the same helper for separate packages in the override of dh
+ binary-indep/binary-arch
+ * add --remaining-packages option
+ * dh_icons: ignore gnome and hicolor themes (will be handled
+ by triggers)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
debhelper_7.2.6.tar.bz2
New:
----
debhelper_7.2.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deb.spec ++++++
--- /var/tmp/diff_new_pack.W29099/_old 2009-04-18 13:54:43.000000000 +0200
+++ /var/tmp/diff_new_pack.W29099/_new 2009-04-18 13:54:43.000000000 +0200
@@ -17,7 +17,7 @@
# norootforbuild
-%define debhelper_ver 7.2.6
+%define debhelper_ver 7.2.7
Name: deb
BuildRequires: gcc-c++ ncurses-devel texlive-latex update-alternatives zlib-devel
@@ -32,7 +32,7 @@
Requires: cpio patch make html2text update-alternatives
AutoReqProv: on
Version: 1.15.0
-Release: 5
+Release: 6
Summary: Tools for Debian Packages
Source: dpkg_%{version}.tar.bz2
Source1: debhelper_%{debhelper_ver}.tar.bz2
@@ -188,6 +188,13 @@
%{perl_vendorlib}/Dpkg.pm
%changelog
+* Thu Apr 16 2009 puzel@suse.cz
+- update to debhelper-7.2.7
+ * fix calling the same helper for separate packages in the override of dh
+ binary-indep/binary-arch
+ * add --remaining-packages option
+ * dh_icons: ignore gnome and hicolor themes (will be handled
+ by triggers)
* Mon Apr 06 2009 puzel@suse.cz
- add a hack to detect architecture correctly (bnc#469337)
* Mon Mar 16 2009 puzel@suse.cz
++++++ debhelper_7.2.6.tar.bz2 -> debhelper_7.2.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/debhelper.pod new/debhelper/debhelper.pod
--- old/debhelper/debhelper.pod 2009-03-07 20:47:09.000000000 +0100
+++ new/debhelper/debhelper.pod 2009-03-23 19:59:13.000000000 +0100
@@ -118,6 +118,14 @@
Do not act on the specified package even if an -a, -i, or -p option lists
the package as one that should be acted on.
+=item B<--remaining-packages>
+
+Do not act on the packages which have already been acted on by this debhelper
+command earlier (i.e. if the command is present in the package debhelper log).
+For example, if you need to call the command with special options only for a
+couple of binary packages, pass this option to the last call of the command to
+process the rest of packages with default settings.
+
=item B<--ignore=>I<file>
Ignore the specified file. This can be used if debian/ contains a debhelper
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/debian/changelog new/debhelper/debian/changelog
--- old/debhelper/debian/changelog 2009-03-15 22:54:52.000000000 +0100
+++ new/debhelper/debian/changelog 2009-03-27 19:15:45.000000000 +0100
@@ -1,3 +1,15 @@
+debhelper (7.2.7) unstable; urgency=low
+
+ * Fix calling the same helper for separate packages in the override of dh
+ binary-indep/binary-arch. Closes: #520567
+ * Add --remaining-packages option (Modestas Vainius)
+ Closes: #520615
+ * Pass -L UTF-8 to po4a to work around bug #520942
+ * dh_icons: ignore gnome and hicolor themes (will be handled
+ by triggers). Closes: #521181
+
+ -- Joey Hess Fri, 27 Mar 2009 14:15:29 -0400
+
debhelper (7.2.6) unstable; urgency=low
* Examples files updated to add dh_bugfiles, remove obsolete
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/Debian/Debhelper/Dh_Getopt.pm new/debhelper/Debian/Debhelper/Dh_Getopt.pm
--- old/debhelper/Debian/Debhelper/Dh_Getopt.pm 2009-03-01 02:01:01.000000000 +0100
+++ new/debhelper/Debian/Debhelper/Dh_Getopt.pm 2009-03-23 19:59:13.000000000 +0100
@@ -91,6 +91,8 @@
"N=s" => \&ExcludePackage,
"no-package=s" => \&ExcludePackage,
+ "remaining-packages" => \$dh{EXCLUDE_LOGGED},
+
"dbg-package=s" => \&AddDebugPackage,
"s" => \&AddPackage,
@@ -145,10 +147,41 @@
sub parseopts {
my $options=shift;
+ my @ARGV_extra;
+
+ # DH_INTERNAL_OPTIONS is used to pass additional options from
+ # dh through an override target to a command.
+ if (defined $ENV{DH_INTERNAL_OPTIONS}) {
+ $ENV{DH_INTERNAL_OPTIONS}=~s/^\s+//;
+ $ENV{DH_INTERNAL_OPTIONS}=~s/\s+$//;
+ @ARGV_extra=split(/\s+/,$ENV{DH_INTERNAL_OPTIONS});
+ my $ret=getoptions(\@ARGV_extra, $options);
+ if (!$ret) {
+ warning("warning: unknown options will be a fatal error in a future debhelper release");
+ #error("unknown option; aborting");
+ }
+
+ # Avoid forcing acting on packages specified in
+ # DH_INTERNAL_OPTIONS. This way, -p can be specified
+ # at the command line to act on a specific package, and if
+ # nothing is specified, the excludes will cause the set of
+ # packages DH_INTERNAL_OPTIONS specifies to be acted on.
+ if (defined $dh{DOPACKAGES}) {
+ foreach my $package (getpackages()) {
+ if (! grep { $_ eq $package } @{$dh{DOPACKAGES}}) {
+ $exclude_package{$package}=1;
+ }
+ }
+ }
+ delete $dh{DOPACKAGES};
+ delete $dh{DOINDEP};
+ delete $dh{DOARCH};
+ delete $dh{DOSAME};
+ }
+
# DH_OPTIONS can contain additional options
# to be parsed like @ARGV, but with unknown options
# skipped.
- my @ARGV_extra;
if (defined $ENV{DH_OPTIONS}) {
$ENV{DH_OPTIONS}=~s/^\s+//;
$ENV{DH_OPTIONS}=~s/\s+$//;
@@ -159,14 +192,6 @@
}
}
- # DH_INTERNAL_OPTIONS is used to pass additional options from
- # dh through an override target to a command.
- if (defined $ENV{DH_INTERNAL_OPTIONS}) {
- $ENV{DH_INTERNAL_OPTIONS}=~s/^\s+//;
- $ENV{DH_INTERNAL_OPTIONS}=~s/\s+$//;
- unshift @ARGV, split(/\s+/,$ENV{DH_INTERNAL_OPTIONS});
- }
-
my $ret=getoptions(\@ARGV, $options);
if (!$ret) {
warning("warning: unknown options will be a fatal error in a future debhelper release");
@@ -186,7 +211,7 @@
if ($dh{DOINDEP} || $dh{DOARCH} || $dh{DOSAME}) {
# User specified that all arch (in)dep package be
# built, and there are none of that type.
- warning("I have no package to build");
+ warning("You asked that all arch in(dep) packages be built, but there are none of that type.");
exit(0);
}
push @{$dh{DOPACKAGES}},getpackages();
@@ -199,6 +224,10 @@
my $package;
my %packages_seen;
foreach $package (@{$dh{DOPACKAGES}}) {
+ if (defined($dh{EXCLUDE_LOGGED}) &&
+ grep { $_ eq basename($0) } load_log($package)) {
+ $exclude_package{$package}=1;
+ }
if (! $exclude_package{$package}) {
if (! exists $packages_seen{$package}) {
$packages_seen{$package}=1;
@@ -208,9 +237,9 @@
}
@{$dh{DOPACKAGES}}=@package_list;
- # If there are no packages to act on now, it's an error.
if (! defined $dh{DOPACKAGES} || ! @{$dh{DOPACKAGES}}) {
- error("I have no package to build");
+ warning("No packages to build.");
+ exit(0);
}
if (defined $dh{U_PARAMS}) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/Debian/Debhelper/Dh_Lib.pm new/debhelper/Debian/Debhelper/Dh_Lib.pm
--- old/debhelper/Debian/Debhelper/Dh_Lib.pm 2009-03-07 20:47:22.000000000 +0100
+++ new/debhelper/Debian/Debhelper/Dh_Lib.pm 2009-03-23 20:03:34.000000000 +0100
@@ -15,7 +15,7 @@
&filedoublearray &getpackages &basename &dirname &xargs %dh
&compat &addsubstvar &delsubstvar &excludefile &package_arch
&is_udeb &udeb_filename &debhelper_script_subst &escape_shell
- &inhibit_log);
+ &inhibit_log &load_log &write_log);
my $max_compat=7;
@@ -74,9 +74,6 @@
# Check if packages to build have been specified, if not, fall back to
# the default, doing them all.
if (! defined $dh{DOPACKAGES} || ! @{$dh{DOPACKAGES}}) {
- if ($dh{DOINDEP} || $dh{DOARCH} || $dh{DOSAME}) {
- error("You asked that all arch in(dep) packages be built, but there are none of that type.");
- }
push @{$dh{DOPACKAGES}},@allpackages;
}
@@ -105,7 +102,22 @@
if ($? == 0 && $write_log) {
write_log(basename($0), @{$dh{DOPACKAGES}});
}
-}
+}
+
+sub load_log {
+ my ($package, $db)=@_;
+ my $ext=pkgext($package);
+
+ my @log;
+ open(LOG, "<", "debian/${ext}debhelper.log") || return;
+ while (<LOG>) {
+ chomp;
+ push @log, $_;
+ $db->{$package}{$_}=1 if defined $db;
+ }
+ close LOG;
+ return @log;
+}
sub write_log {
my $cmd=shift;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/dh new/debhelper/dh
--- old/debhelper/dh 2009-03-07 00:22:47.000000000 +0100
+++ new/debhelper/dh 2009-03-23 20:03:46.000000000 +0100
@@ -376,7 +376,7 @@
my %logged;
my %startpoint;
foreach my $package (@packages) {
- my @log=loadlog($package);
+ my @log=load_log($package, \%logged);
if ($dh{AFTER}) {
# Run commands in the sequence that come after the
# specified command.
@@ -386,7 +386,7 @@
# no commands remain to run after it, communicating to
# future dh instances that the specified command should not
# be run again.
- writelog($sequence[$startpoint{$package}-1], $package);
+ write_log($sequence[$startpoint{$package}-1], $package);
}
elsif ($dh{REMAINING}) {
# Start at the beginning so all remaining commands will get
@@ -443,6 +443,10 @@
my @exclude=@{shift()};
my @options=@_;
+ # If some packages are excluded, add flags
+ # to prevent them from being acted on.
+ push @options, map { "-N$_" } @exclude;
+
# Check for override targets in debian/rules and
# run them instead of running the command directly.
my $override_command;
@@ -454,11 +458,6 @@
$command="debian/rules";
@options="override_".$override_command;
}
- else {
- # If some packages are excluded, add flags
- # to prevent them from being acted on.
- push @options, map { "-N$_" } @exclude;
- }
# 3 space indent lines the command being run up under the
# sequence name after "dh ".
@@ -480,30 +479,11 @@
# been run by the rules file target.
my %packages=map { $_ => 1 } @packages;
map { delete $packages{$_} } @exclude;
- writelog($override_command, keys %packages);
+ write_log($override_command, keys %packages);
}
}
}
-sub loadlog {
- my $package=shift;
- my $ext=pkgext($package);
-
- my @log;
- open(LOG, "<", "debian/${ext}debhelper.log") || return;
- while (<LOG>) {
- chomp;
- push @log, $_;
- $logged{$package}{$_}=1;
- }
- close LOG;
- return @log;
-}
-
-sub writelog {
- Debian::Debhelper::Dh_Lib::write_log(@_);
-}
-
{
my %targets;
my $rules_parsed;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/dh_icons new/debhelper/dh_icons
--- old/debhelper/dh_icons 2008-12-17 00:13:03.000000000 +0100
+++ new/debhelper/dh_icons 2009-03-26 20:20:04.000000000 +0100
@@ -46,6 +46,8 @@
opendir(DIRHANDLE, $icondir);
while (my $subdir = readdir(DIRHANDLE)) {
next if $subdir =~ /^\./;
+ next if $subdir eq "gnome";
+ next if $subdir eq "hicolor";
my $needs_cache = 0;
find sub {
$needs_cache = 1 if -f and (/\.png$/ or /\.svg$/ or /\.xpm$/ or /\.icon$/);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/doc/PROGRAMMING new/debhelper/doc/PROGRAMMING
--- old/debhelper/doc/PROGRAMMING 2009-03-01 02:01:02.000000000 +0100
+++ new/debhelper/doc/PROGRAMMING 2009-03-23 20:03:21.000000000 +0100
@@ -250,5 +250,12 @@
inhibit_log()
Prevent logging the program's successful finish to
debian/*debhelper.log
+load_log($package, $hashref)
+ Loads the log file for the given package and returns a list of
+ logged commands.
+ (Passing a hashref also causes it to populate the hash.)
+write_log($cmd, $package ...)
+ Writes the log files for the specified package(s), adding
+ the cmd to the end.
-- Joey Hess
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/Makefile new/debhelper/Makefile
--- old/debhelper/Makefile 2008-12-17 00:13:03.000000000 +0100
+++ new/debhelper/Makefile 2009-03-23 20:27:52.000000000 +0100
@@ -36,7 +36,7 @@
cat debhelper.pod | \
$(MAKEMANLIST) `find . -maxdepth 1 -type f -perm +100 -name "dh_*" | sort` | \
$(POD2MAN) --name="debhelper" --section=7 > debhelper.7
- po4a man/po4a/po4a.cfg
+ po4a -L UTF-8 man/po4a/po4a.cfg
set -e; \
for lang in $(LANGS); do \
dir=man/$$lang; \
++++++ debhelper-no-localized-manpages.diff ++++++
--- /var/tmp/diff_new_pack.W29099/_old 2009-04-18 13:54:43.000000000 +0200
+++ /var/tmp/diff_new_pack.W29099/_new 2009-04-18 13:54:43.000000000 +0200
@@ -1,6 +1,7 @@
---- debhelper/Makefile
-+++ debhelper/Makefile
-@@ -27,27 +27,13 @@
+diff -up debhelper/Makefile.orig debhelper/Makefile
+--- debhelper/Makefile.orig 2009-04-16 11:42:25.000000000 +0200
++++ debhelper/Makefile 2009-04-16 11:42:36.000000000 +0200
+@@ -27,27 +27,12 @@ PERLLIBDIR=$(shell perl -MConfig -e 'pri
POD2MAN=pod2man -c Debhelper -r "$(VERSION)"
@@ -10,11 +11,10 @@
build: version
find . -maxdepth 1 -type f -perm +100 -name "dh*" \
-exec $(POD2MAN) {} {}.1 \;
-+
cat debhelper.pod | \
$(MAKEMANLIST) `find . -maxdepth 1 -type f -perm +100 -name "dh_*" | sort` | \
$(POD2MAN) --name="debhelper" --section=7 > debhelper.7
-- po4a man/po4a/po4a.cfg
+- po4a -L UTF-8 man/po4a/po4a.cfg
- set -e; \
- for lang in $(LANGS); do \
- dir=man/$$lang; \
@@ -29,7 +29,7 @@
version:
printf "package Debian::Debhelper::Dh_Version;\n\$$version='$(VERSION)';\n1" > \
-@@ -55,10 +41,6 @@
+@@ -55,10 +40,6 @@ version:
clean:
rm -f *.1 *.7 Debian/Debhelper/Dh_Version.pm
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org