[debhelper-devel] [debhelper] 01/03: Merge tag 'debian/9.20150101'
Niels Thykier
nthykier at moszumanska.debian.org
Sun Jan 7 21:43:07 UTC 2018
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to annotated tag Release_2.4.0
in repository debhelper.
commit 201364b9d46c89ce22187582897e5f92e1227fc8
Merge: 52631c1 84ed0f5
Author: Daniel Drake <drake at endlessm.com>
Date: Fri Mar 27 07:08:13 2015 -0600
Merge tag 'debian/9.20150101'
Release debhelper/9.20150101 into unstable
Format: 1.8
Date: Thu, 01 Jan 2015 17:05:01 +0100
Source: debhelper
Binary: debhelper
Architecture: source all
Version: 9.20150101
Distribution: unstable
Urgency: medium
Maintainer: Debhelper Maintainers <debhelper-devel at lists.alioth.debian.org>
Changed-By: Niels Thykier <niels at thykier.net>
Description:
debhelper - helper programs for debian/rules
Closes: 773965
Changes:
debhelper (9.20150101) unstable; urgency=medium
.
[ Niels Thykier ]
* Revert detection of unsafe binNMUs under compat 9 and
earlier. It had some false-positives. (Closes: #773965)
.
[ Axel Beckert ]
* Document that dh_installdocs will error out on --link-doc
between arch:all and arch:any packages in man 7 debhelper.
Checksums-Sha1:
fab280c1e9a4dccfefbb55f28afbb2af17a16a2e 851 debhelper_9.20150101.dsc
1da23389c3b9a8b5df21daddeac597a8bd4f7253 545089 debhelper_9.20150101.tar.gz
5ea1083f60b60bbb1f503977dc3e05f0bb41debd 813022 debhelper_9.20150101_all.deb
Checksums-Sha256:
ec248bb73510c64a03f80b48cc4904137503cbd8e6c75363d0e8c27b1236075b 851 debhelper_9.20150101.dsc
fd8d81d71d1bb0ba4b58c517465551231dd60811b98c867e4344bc55ec6a45f2 545089 debhelper_9.20150101.tar.gz
6a78781bbc063201c91eff9cdcbbaf339cf2fbca60a303ef82983a1a3ecc79f6 813022 debhelper_9.20150101_all.deb
Files:
02c8ccbc48c11da3f71f03bf4b77038e 851 devel optional debhelper_9.20150101.dsc
10e53fc2d752bddc5bb66bfeaba7582e 545089 devel optional debhelper_9.20150101.tar.gz
47715860eb2e1cb5772632868e7e7204 813022 devel optional debhelper_9.20150101_all.deb
Conflicts:
Debian/Debhelper/Buildsystem/autoconf.pm
Debian/Debhelper/Dh_Lib.pm
debian/control
dh_gencontrol
dh_installdeb
man/po4a/po/de.po
man/po4a/po/debhelper.pot
man/po4a/po/es.po
man/po4a/po/fr.po
Debian/Debhelper/Buildsystem/autoconf.pm | 3 +
Debian/Debhelper/Buildsystem/cmake.pm | 2 +-
Debian/Debhelper/Buildsystem/makefile.pm | 4 +-
Debian/Debhelper/Buildsystem/perl_build.pm | 2 +-
Debian/Debhelper/Buildsystem/python_distutils.pm | 2 +-
Debian/Debhelper/Dh_Lib.pm | 60 +-
autoscripts/postinst-emacsen | 4 +-
autoscripts/preinst-emacsen | 5 +
autoscripts/prerm-emacsen | 4 +-
debhelper.pod | 30 +-
debian/changelog | 231 +
debian/control | 9 +-
debian/copyright | 4 -
dh | 5 +-
dh_clean | 11 +-
dh_compress | 6 +-
dh_fixperms | 6 +-
dh_gencontrol | 5 +-
dh_install | 6 +-
dh_installchangelogs | 10 +-
dh_installdeb | 6 +-
dh_installdocs | 19 +-
dh_installemacsen | 26 +-
dh_installinit | 19 +-
dh_installman | 2 +-
dh_installudev | 2 +-
dh_makeshlibs | 10 +-
dh_perl | 10 +-
dh_python | 292 -
dh_shlibdeps | 39 +-
doc/TODO | 1 -
man/po4a/add.de | 2 +-
man/po4a/add.pt | 10 +
man/po4a/po/pt.po | 7499 ++++++++++++++++++++++
man/po4a/po4a.cfg | 118 +-
t/size | 3 +-
36 files changed, 8004 insertions(+), 463 deletions(-)
diff --cc Debian/Debhelper/Buildsystem/autoconf.pm
index 4bde20f,56a4288..2eed6a3
--- a/Debian/Debhelper/Buildsystem/autoconf.pm
+++ b/Debian/Debhelper/Buildsystem/autoconf.pm
@@@ -48,6 -35,11 +48,9 @@@ sub configure
push @opts, "--includedir=\${prefix}/include";
push @opts, "--mandir=\${prefix}/share/man";
push @opts, "--infodir=\${prefix}/share/info";
- push @opts, "--sysconfdir=/etc";
- push @opts, "--localstatedir=/var";
+ if (defined $ENV{DH_VERBOSE} && $ENV{DH_VERBOSE} ne "") {
+ push @opts, "--disable-silent-rules";
+ }
my $multiarch=dpkg_architecture_value("DEB_HOST_MULTIARCH");
if (! compat(8)) {
if (defined $multiarch) {
diff --cc Debian/Debhelper/Buildsystem/cmake.pm
index ea6210c,db971db..6539e44
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@@ -41,19 -41,9 +41,19 @@@ sub configure
my @flags;
# Standard set of cmake flags
- push @flags, "-DCMAKE_INSTALL_PREFIX=/usr";
+ if (get_buildprofile("eos-app")) {
+ # Get package app id for prefix
+ my $app_prefix = package_eos_app_id();
+ push @flags, "-DCMAKE_INSTALL_PREFIX=/endless/" . $app_prefix;
+
+ # Always include the RPATH from the app link paths.
+ push @flags, "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON";
+ }
+ else {
+ push @flags, "-DCMAKE_INSTALL_PREFIX=/usr";
+ }
push @flags, "-DCMAKE_VERBOSE_MAKEFILE=ON";
- push @flags, "-DCMAKE_BUILD_TYPE=RelWithDebInfo";
+ push @flags, "-DCMAKE_BUILD_TYPE=None";
# CMake doesn't respect CPPFLAGS, see #653916.
if ($ENV{CPPFLAGS} && ! compat(8)) {
diff --cc Debian/Debhelper/Dh_Lib.pm
index f429887,0519d20..3ce803e
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@@ -777,9 -786,10 +787,10 @@@ sub sourcepackage
# for the system's arch) or independant. If nothing is specified,
# returns all packages. Also, "both" returns the union of "arch" and "indep"
# packages.
- # As a side effect, populates %package_arches and %package_types with the
- # types of all packages (not only those returned).
+ #
+ # As a side effect, populates %package_arches and %package_types
+ # with the types of all packages (not only those returned).
-my (%package_types, %package_arches);
+my (%package_types, %package_arches, %package_eos_app_ids);
sub getpackages {
my $type=shift;
@@@ -792,9 -801,13 +803,14 @@@
my $package="";
my $arch="";
my $package_type;
+ my $eos_app_id;
my @list=();
my %seen;
+ my @profiles=();
+ my $included_in_build_profile;
+ if (exists $ENV{'DEB_BUILD_PROFILES'}) {
+ @profiles=split /\s+/, $ENV{'DEB_BUILD_PROFILES'};
+ }
open (CONTROL, 'debian/control') ||
error("cannot read debian/control: $!\n");
while (<CONTROL>) {
@@@ -817,23 -831,37 +834,42 @@@
if (/^(?:X[BC]*-)?Package-Type:\s*(.*)/) {
$package_type=$1;
}
+ if (/^(?:XCBS-)?EOS-AppId:\s*(.*)/) {
+ $eos_app_id=$1;
+ }
+
+ # rely on libdpkg-perl providing the parsing functions because
+ # if we work on a package with a Build-Profiles field, then a
+ # high enough version of dpkg-dev is needed anyways
+ if (/^Build-Profiles:\s*(.*)/) {
+ my $build_profiles=$1;
+ eval {
+ require Dpkg::BuildProfiles;
+ my @restrictions=Dpkg::BuildProfiles::parse_build_profiles($build_profiles);
+ if (@restrictions) {
+ $included_in_build_profile=Dpkg::BuildProfiles::evaluate_restriction_formula(\@restrictions, \@profiles);
+ }
+ };
+ if ($@) {
+ error("The control file has a Build-Profiles field. Requires libdpkg-perl >= 1.17.14");
+ }
+ }
+
if (!$_ or eof) { # end of stanza.
if ($package) {
$package_types{$package}=$package_type;
$package_arches{$package}=$arch;
+ $package_eos_app_ids{$package}=$eos_app_id;
}
- if ($package &&
+ if ($package && $included_in_build_profile &&
((($type eq 'indep' || $type eq 'both') && $arch eq 'all') ||
- (($type eq 'arch' || $type eq 'both') && ($arch eq 'any' ||
- ($arch ne 'all' &&
- samearch(buildarch(), $arch)))) ||
- ! $type)) {
+ (($type eq 'arch' || $type eq 'both') &&
+ ($arch eq 'any' ||
+ ($arch ne 'all' && samearch(buildarch(), $arch))
+ )
+ ) || ! $type)
+ ) {
push @list, $package;
$package="";
$arch="";
diff --cc debian/changelog
index 4e79549,a6408c7..0ec9271
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,110 -1,234 +1,341 @@@
+ debhelper (9.20150101) unstable; urgency=medium
+
+ [ Niels Thykier ]
+ * Revert detection of unsafe binNMUs under compat 9 and
+ earlier. It had some false-positives. (Closes: #773965)
+
+ [ Axel Beckert ]
+ * Document that dh_installdocs will error out on --link-doc
+ between arch:all and arch:any packages in man 7 debhelper.
+
+ -- Niels Thykier <niels at thykier.net> Thu, 01 Jan 2015 17:05:01 +0100
+
+ debhelper (9.20141222) unstable; urgency=medium
+
+ * Add missing entry about #747141.
+ * Fix typo in comment in dh_installman. Thanks to Raphael
+ Geissert for spotting it. (Closes: #772502)
+
+ -- Niels Thykier <niels at thykier.net> Mon, 22 Dec 2014 01:02:52 +0100
+
+ debhelper (9.20141221) unstable; urgency=medium
+
+ [ Niels Thykier ]
+ * New debhelper maintainers. (Closes: #768507)
+ - Add Niels Thykier to uploaders.
+ * dh_installdeb: Raise required dpkg version for dir_to_symlink to
+ 1.17.13 (see #769843, msg #10). Thanks to Guillem Jover.
+ * Refuse to build packages using --link-doc between arch:any and
+ arch:all packages (or vice versa) as it results in broken
+ packages.
+ - In compat 9 or less: Only during an actual binNMU.
+ - In compat 10 or newer: Unconditionally.
+ (Closes: #747141)
+
+ [ Bernhard R. Link ]
+ - Add Bernhard Link to uploaders.
+
+ [ Axel Beckert ]
+ * dh_installdeb: Raise required dpkg version for symlink_to_dir to
+ 1.17.14. It is needed in case of relative symlinks. (Closes: #770245)
+
+ -- Niels Thykier <niels at thykier.net> Sun, 21 Dec 2014 21:21:18 +0100
+
+ debhelper (9.20141107) unstable; urgency=medium
+
+ * I'm leaving Debian, and Debhelper needs a new maintainer.
+
+ -- Joey Hess <joeyh at debian.org> Fri, 07 Nov 2014 17:15:10 -0400
+
+ debhelper (9.20141022) unstable; urgency=low
+
+ * dh_installdeb: Sort conffile list so there is a stable order for
+ reproducible builds. Closes: #766384 Thanks, Jérémy Bobbio.
+
+ -- Joey Hess <joeyh at debian.org> Wed, 22 Oct 2014 14:43:12 -0400
+
+ debhelper (9.20141010) unstable; urgency=medium
+
+ [ Johannes Schauer ]
+ * Depend on libdpkg-perl (>= 1.17.14) for build profiles support. Note to
+ backporters: If you remove that dependency, debhelper will throw an error
+ when a binary package stanza in debian/control has the Build-Profiles
+ field.
+ * Use libdpkg-perl functionality to parse the content of the Build-Profiles
+ field, if there is one. In that case, use libdpkg-perl to evaluate whether
+ the binary package should be built or not.
+ Closes: #763766
+
+ -- Joey Hess <joeyh at debian.org> Fri, 10 Oct 2014 17:42:56 -0400
+
+ debhelper (9.20141003) unstable; urgency=medium
+
+ * dh_clean: Skip over .git, .svn, .bzr, .hg, and CVS directories
+ and avoid cleaning their contents. Closes: #760033
+
+ -- Joey Hess <joeyh at debian.org> Fri, 03 Oct 2014 15:16:00 -0400
+
+ debhelper (9.20140817) unstable; urgency=medium
+
+ * Added Portuguese translation of the man pages, by Américo Monteiro.
+ Closes: #758043
+ * Updated German translation from Chris Leick.
+ Closes: #735610
+
+ -- Joey Hess <joeyh at debian.org> Sun, 17 Aug 2014 10:42:25 -0400
+
+ debhelper (9.20140809) unstable; urgency=medium
+
+ * dh_perl: Add perlapi-* dependency on packages installed to
+ $Config{vendorarch} Closes: #751684
+ * dh_perl: Use vendorlib and vendorarch from Config instead of
+ hardcoding their values. Closes: #750021
+ * Typo: Closes: #755237
+
+ -- Joey Hess <joeyh at debian.org> Sat, 09 Aug 2014 11:24:41 -0400
+
+ debhelper (9.20140613) unstable; urgency=medium
+
+ * Pass --disable-silent-rules in dh_auto_configure if DH_VERBOSE is set.
+ Closes: #751207. Thanks, Helmut Grohne.
+ * Minor typos. Closes: #741144, #744176
+ * dh_installinit: Fix uninitialized value warning when --name is used.
+
+ -- Joey Hess <joeyh at debian.org> Fri, 13 Jun 2014 11:50:09 -0400
+
+ debhelper (9.20140228) unstable; urgency=medium
+
+ * Fix breakage in no-act mode introduced in last release.
+
+ -- Joey Hess <joeyh at debian.org> Fri, 28 Feb 2014 15:02:35 -0400
+
+ debhelper (9.20140227) unstable; urgency=medium
+
+ * dh_compress: Avoid compressing .map files, which may be html
+ usemaps. Closes: #704443
+ * dh_installdocs: When doc dirs are symlinked make the dependency
+ versioned per policy. Closes: #676777
+ * dh_makeshlibs: Defer propagating dpkg-gensymbols error until
+ all packages have been processed. Closes: #736640
+ * dh: Reject unknown parameters that are not dashed command-line
+ parameters intended to be passed on to debhelper commands.
+ Closes: #737635
+ * perl_build: Use realclean instead of distclean. Closes: #737662
+ * Initial implementation of support for Build-Profiles fields.
+ Thanks, Daniel Schepler.
+ * dh_gencontrol: Revert change made in version 4.0.13 that avoided
+ passing -p to dpkg-gencontrol when only operating on one package.
+ There seems to be no benefit to doing that, and it breaks when using
+ Build-Profiles, since while debhelper may know a profile only allows
+ for one package, dpkg-gencontrol may see other packages in the
+ control file.
+
+ -- Joey Hess <joeyh at debian.org> Thu, 27 Feb 2014 11:49:56 -0400
+
+ debhelper (9.20131227) unstable; urgency=medium
+
+ [ Guillem Jover ]
+ * dh_shlibdeps: Use new dpkg-shlibdeps -l option instead of LD_LIBRARY_PATH
+ Closes: #717505
+ * Depend on dpkg-dev (>= 1.17.0), the version that introduced
+ dpkg-shlibdeps -l option.
+
+ -- Joey Hess <joeyh at debian.org> Fri, 27 Dec 2013 21:52:53 -0400
+
+ debhelper (9.20131213) unstable; urgency=low
+
+ [ Joey Hess ]
+ * cmake: Configure with -DCMAKE_BUILD_TYPE=None
+ Closes: #701233
+
+ [ Andreas Beckmann ]
+ * dh_installdeb: Add support for dpkg-maintscript-helper commands
+ symlink_to_dir and dir_to_symlink that were added in dpkg 1.17.2.
+ Closes: #731723
+
+ -- Joey Hess <joeyh at debian.org> Fri, 13 Dec 2013 14:46:26 -0400
+
+ debhelper (9.20131127) unstable; urgency=low
+
+ * dh_compress: Exclude several more compressed file formats.
+ Closes: #730483
+
+ -- Joey Hess <joeyh at debian.org> Wed, 27 Nov 2013 19:19:41 -0400
+
+ debhelper (9.20131110) unstable; urgency=low
+
+ * dh_installinit: Revert changes that added versioned dependency on
+ sysv-rc to support upstart, which later grew to a versioned dependency
+ on sysv-rc | file-rc, and which seems to want to continue growing
+ to list other init systems, which there currently seem to be far too
+ many of, for far too little benefit.
+ The sysv-rc dependency is already met in stable.
+ The file-rc dependency is not, so if someone cares about that, they
+ need to find a properly designed solution, which this was not.
+ Closes: #729248
+
+ -- Joey Hess <joeyh at debian.org> Sun, 10 Nov 2013 15:23:29 -0400
+
+ debhelper (9.20131105) unstable; urgency=low
+
+ * Fix (horrible) make output parsing code to work with make 4.0.
+ Closes: #728800 Thanks, Julien Pinon
+
+ -- Joey Hess <joeyh at debian.org> Tue, 05 Nov 2013 22:17:03 -0400
+
+ debhelper (9.20131104) unstable; urgency=low
+
+ [ Joey Hess ]
+ * Debhelper is now team maintained. There is a new
+ debhelper-devel mailing list which maintainers of other dh_
+ commands are encouraged to join also.
+ <https://lists.alioth.debian.org/mailman/listinfo/debhelper-devel>
+ * dh_installchangelogs: Avoid installing binNMU changelog file
+ in --no-act mode. Closes: #726930
+
+ [ Modestas Vainius ]
+ * Update dh_installemacsen and related scripts to follow emacs
+ policy v2.0 (as of emacsen-common 2.0.5). Closes: #728620
+
+ -- Joey Hess <joeyh at debian.org> Mon, 04 Nov 2013 15:34:21 -0400
+
+ debhelper (9.20130921) unstable; urgency=low
+
+ * dh: Call dh_installxfonts after dh_link, so that it will
+ notice fonts installed via symlinks. Closes: #721264
+ * Fix FTBFS with perl 5.18. Closes: #722501
+ * dh_installchangelogs: Add changelog.md to the list of common
+ changelog filenames.
+
+ -- Joey Hess <joeyh at debian.org> Sat, 21 Sep 2013 13:16:34 -0400
+
+ debhelper (9.20130720) unstable; urgency=low
+
+ * dh_python: Removed this deprecated and unused command.
+ Closes: #717374
+ (Thanks, Luca Falavigna)
+ * Type fixes. Closes: #719216
+ * dh_installinit: Fix a longstanding accidental behavior that caused
+ a file named debian/package to be installed as the init script.
+ Only fixed in v10 since packages might depend on this behavior.
+ Closes: #719359
+ * dh_install, dh_installdocs, dh_clean: Fix uses of find -exec
+ which cause it to ignore exit status of the commands run.
+ Closes: 719598
+ * makefile buildsystem: Tighten heuristic to detect if makefile target
+ exists. An error message that some other target does not exist just means
+ the makefile spaghetti has problems later on when run with -n,
+ but not that the called target didn't exist. Closes: #718121
+
+ -- Joey Hess <joeyh at debian.org> Tue, 20 Aug 2013 12:46:25 -0400
+
+debhelper (9.20130630co2endless10) eos; urgency=low
+
+ * Debian/Debhelper/Buildsystem/cmake.pm:
+ - Force usage of RPATH for the eos-app build profile.
+ [endlessm/eos-shell#3608]
+
+ -- Dan Nicholson <nicholson at endlessm.com> Mon, 08 Sep 2014 12:16:49 -0700
+
+debhelper (9.20130630co2endless9) eos; urgency=low
+
+ [ Andreas Beckmann ]
+ * dh_installdeb: Add support for dpkg-maintscript-helper commands
+ symlink_to_dir and dir_to_symlink that were added in dpkg 1.17.2.
+ Closes: #731723
+
+ -- Dan Nicholson <nicholson at endlessm.com> Tue, 02 Sep 2014 15:15:11 -0700
+
+debhelper (9.20130630co2endless8) eos; urgency=low
+
+ * Debian/Debhelper/Buildsystem/python_distutils.pm:
+ - Fix prefix setting when eos-app is not set.
+
+ -- Dan Nicholson <nicholson at endlessm.com> Wed, 16 Jul 2014 22:28:54 -0700
+
+debhelper (9.20130630co2endless7) eos; urgency=low
+
+ * Debian/Debhelper/Buildsystem/python_distutils.pm:
+ - Set a prefix derived from the app id when eos-app is set in
+ DEB_BUILD_PROFILES.
+
+ -- Dan Nicholson <nicholson at endlessm.com> Wed, 09 Jul 2014 17:48:01 -0700
+
+debhelper (9.20130630co2endless6) eos; urgency=low
+
+ * dh_gencontrol: Always add Eos-Appid control field for eos-app profiles.
+
+ -- Dan Nicholson <nicholson at endlessm.com> Mon, 30 Jun 2014 11:57:34 -0700
+
+debhelper (9.20130630co2endless5) eos; urgency=low
+
+ * dh_install: Handle lack of trailing / in paths when the install file
+ specifies the entire usr, etc or var directory.
+ * dh_installdirs: Prepend /endless app prefix to installation directories
+ for eos-app profiles.
+
+ -- Dan Nicholson <nicholson at endlessm.com> Mon, 30 Jun 2014 07:17:26 -0700
+
+debhelper (9.20130630co2endless4) eos; urgency=low
+
+ * dh_install: Handle absolute paths install file specifications. These
+ paths are always relative to the debian build directories, so the
+ leading / is meaningless and can be stripped out.
+
+ -- Dan Nicholson <nicholson at endlessm.com> Fri, 27 Jun 2014 05:57:27 -0700
+
+debhelper (9.20130630co2endless3) eos; urgency=medium
+
+ * Debian/Debhelper/Buildsystem/cmake.pm:
+ * Debian/Debhelper/Buildsystem/qmake.pm:
+ - Fix prefix to prepend /endless/ to the app id for eos-app profiles.
+
+ -- Dan Nicholson <nicholson at endlessm.com> Thu, 26 Jun 2014 12:00:29 -0700
+
+debhelper (9.20130630co2endless2) eos; urgency=low
+
+ * dh_install:
+ - Use package specific app id for install paths instead of main package
+ id.
+
+ -- Dan Nicholson <nicholson at endlessm.com> Wed, 25 Jun 2014 11:31:09 -0700
+
+debhelper (9.20130630co2endless1) eos; urgency=low
+
+ * Debian/Debhelper/Dh_Lib.pm:
+ - Support reading a profile from the DEB_BUILD_PROFILES variable.
+ - Read the desired app id from the XCBS-EOS-AppId control field.
+ - Support querying the package's EOS app id. Use the main package's
+ app id if the package does not specify an explicit id.
+ * Debian/Debhelper/Buildsystem/autoconf.pm:
+ * Debian/Debhelper/Buildsystem/cmake.pm:
+ * Debian/Debhelper/Buildsystem/qmake.pm:
+ - Set a prefix derived from the app id when eos-app is set in
+ DEB_BUILD_PROFILES.
+ * dh_install:
+ - Adjust prefix of specified install paths for eos-app packages.
+ * dh_eosapp:
+ - New dh script moving all contents of /usr to /endless/<app> when
+ eos-app is set in DEB_BUILD_PROFILES.
+ * dh:
+ - Run dh_eosapp at the end of the install sequence.
+
+ -- Dan Nicholson <nicholson at endlessm.com> Wed, 18 Jun 2014 17:59:47 +0000
+
+debhelper (9.20130630co2) alphacentauri; urgency=low
+
+ * Add --upstart-only dummy argument to dh_installinit
+
+ -- Sjoerd Simons <sjoerd.simons at collabora.co.uk> Mon, 12 Aug 2013 09:49:15 +0200
+
+debhelper (9.20130630co1) alphacentauri; urgency=low
+
+ * Use Debian version essentially as-is.
+ * Add dependency on dh-apparmor to furfill the expectations of some Ubuntu
+ packages
+
+ -- Sjoerd Simons <sjoerd.simons at collabora.co.uk> Tue, 06 Aug 2013 11:55:59 +0200
+
debhelper (9.20130630) unstable; urgency=low
* perl_build: Use -- long option names, for compatibility with
diff --cc debian/control
index 62b57bc,d3d3f9c..f363f94
--- a/debian/control
+++ b/debian/control
@@@ -10,7 -11,7 +11,7 @@@ Homepage: http://joeyh.name/code/debhel
Package: debhelper
Architecture: all
- Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg (>= 1.16.2), dpkg-dev (>= 1.16.2), binutils, po-debconf, man-db (>= 2.5.1-1), dh-apparmor
-Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg (>= 1.16.2), dpkg-dev (>= 1.17.0), binutils, po-debconf, man-db (>= 2.5.1-1), libdpkg-perl (>= 1.17.14)
++Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg (>= 1.16.2), dpkg-dev (>= 1.17.0), binutils, po-debconf, man-db (>= 2.5.1-1), libdpkg-perl (>= 1.17.14), dh-apparmor
Suggests: dh-make
Conflicts: dpkg-cross (<< 1.18), python-support (<< 0.5.3), python-central (<< 0.5.6), automake (<< 1.11.2)
Multi-Arch: foreign
diff --cc dh
index 0afd375,f3bd321..e58614e
--- a/dh
+++ b/dh
@@@ -393,9 -392,9 +392,10 @@@ my @i = qw
dh_usrlocal
dh_link
+ dh_installxfonts
dh_compress
dh_fixperms
+ dh_eosapp
};
my @ba=qw{
dh_strip
diff --cc dh_gencontrol
index bd77837,41e09cb..6103d71
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@@ -68,15 -65,7 +68,12 @@@ foreach my $package (@{$dh{DOPACKAGES}}
}
# Generate and install control file.
- doit("dpkg-gencontrol", "-p$package", "-l$changelog", "-T$substvars",
+ my @command="dpkg-gencontrol";
- if (getpackages() > 1) {
- push @command, "-p$package";
- }
+ if (get_buildprofile("eos-app")) {
+ # Add the app id field.
+ push @command, "-DEos-Appid=" . package_eos_app_id($package);
+ }
- doit(@command, "-l$changelog", "-T$substvars",
++ doit(@command, "-p$package", "-l$changelog", "-T$substvars",
"-P$tmp",@{$dh{U_PARAMS}});
# This chmod is only necessary if the user sets the umask to
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git
More information about the debhelper-devel
mailing list