Ubuntu dpkg 1.16.1.1ubuntu2
This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes. It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
Format: 1.8
Date: Tue, 01 Nov 2011 15:36:14 -0400
Source: dpkg
Binary: libdpkg-dev dpkg dpkg-dev libdpkg-perl dselect
Architecture: source
Version: 1.16.1.1ubuntu2
Distribution: precise
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Changed-By: Colin Watson <cjwatson@ubuntu.com>
Description:
dpkg - Debian package management system
dpkg-dev - Debian package development tools
dselect - Debian package management front-end
libdpkg-dev - Debian package management static library
libdpkg-perl - Dpkg perl modules
Changes:
dpkg (1.16.1.1ubuntu2) precise; urgency=low
.
* Don't export build flags for packages using debhelper compat level 9 or
above. This is a layering violation which will go away after 12.04 (see
https://lists.ubuntu.com/archives/ubuntu-devel/2011-November/034351.html).
Checksums-Sha1:
ec9a8ef17763e6e954a6e1bd6a2ddc9342b4b3d1 2175 dpkg_1.16.1.1ubuntu2.dsc
b1ef00c1d8ff69f8da1d6f528f65e4b7af430745 5472188 dpkg_1.16.1.1ubuntu2.tar.bz2
Checksums-Sha256:
2143edc75e37f570bd39a7367b117a80496bf5b75c9ce2515d24107005d01d0f 2175 dpkg_1.16.1.1ubuntu2.dsc
4b16dc9b1c2f07165a9cb2ec331d335dc44a81da49463965fe0db91be91a3a17 5472188 dpkg_1.16.1.1ubuntu2.tar.bz2
Files:
b46abd7568108d79a1fe1049cccd4ae0 2175 admin required dpkg_1.16.1.1ubuntu2.dsc
bc001b48664c6b616a773350a756eb22 5472188 admin required dpkg_1.16.1.1ubuntu2.tar.bz2
Original-Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
diff -pruN 1.16.1.1ubuntu1/debian/changelog 1.16.1.1ubuntu2/debian/changelog
--- 1.16.1.1ubuntu1/debian/changelog 2011-10-26 08:50:02.000000000 +0000
+++ 1.16.1.1ubuntu2/debian/changelog 2011-11-01 19:36:15.000000000 +0000
@@ -1,3 +1,11 @@
+dpkg (1.16.1.1ubuntu2) precise; urgency=low
+
+ * Don't export build flags for packages using debhelper compat level 9 or
+ above. This is a layering violation which will go away after 12.04 (see
+ https://lists.ubuntu.com/archives/ubuntu-devel/2011-November/034351.html).
+
+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 01 Nov 2011 15:36:14 -0400
+
dpkg (1.16.1.1ubuntu1) precise; urgency=low
* Resynchronise with Debian. Remaining changes:
diff -pruN 1.16.1.1ubuntu1/scripts/dpkg-buildpackage.pl 1.16.1.1ubuntu2/scripts/dpkg-buildpackage.pl
--- 1.16.1.1ubuntu1/scripts/dpkg-buildpackage.pl 2011-10-26 08:32:17.000000000 +0000
+++ 1.16.1.1ubuntu2/scripts/dpkg-buildpackage.pl 2011-11-01 18:13:15.000000000 +0000
@@ -297,17 +297,31 @@ if (defined $parallel) {
# Temporarily continue to export build flags to the environment. This is to
# avoid regressing various defaults in packages in the near term; we expect
# to drop this after Ubuntu 12.04 LTS.
-my $build_flags = Dpkg::BuildFlags->new();
-$build_flags->load_config();
-foreach my $flag ($build_flags->list()) {
- # While -Werror=format-security does catch many real bugs, it also
- # causes many build failures and causes a number of configure tests to
- # silently fail. It was not exported to the environment in any released
- # version of Ubuntu.
- $build_flags->strip($flag, '-Werror=format-security', undef);
- $ENV{$flag} = $build_flags->get($flag);
- printf(_g("%s: export %s from dpkg-buildflags (origin: %s): %s\n"),
- $progname, $flag, $build_flags->get_origin($flag), $ENV{$flag});
+# We don't do this if debhelper compat level >= 9 is in use, as a
+# lesser-evil workaround for an interaction with debhelper's build flags
+# handling. See:
+# https://lists.ubuntu.com/archives/ubuntu-devel/2011-November/034351.html
+my $debhelper_compat = 1;
+if (open my $debhelper_compat_file, 'debian/compat') {
+ my $line = <$debhelper_compat_file>;
+ close $debhelper_compat_file;
+ if (defined $line and length $line) {
+ $debhelper_compat = int($line);
+ }
+}
+if ($debhelper_compat < 9) {
+ my $build_flags = Dpkg::BuildFlags->new();
+ $build_flags->load_config();
+ foreach my $flag ($build_flags->list()) {
+ # While -Werror=format-security does catch many real bugs, it also
+ # causes many build failures and causes a number of configure tests
+ # to silently fail. It was not exported to the environment in any
+ # released version of Ubuntu.
+ $build_flags->strip($flag, '-Werror=format-security', undef);
+ $ENV{$flag} = $build_flags->get($flag);
+ printf(_g("%s: export %s from dpkg-buildflags (origin: %s): %s\n"),
+ $progname, $flag, $build_flags->get_origin($flag), $ENV{$flag});
+ }
}
my $cwd = cwd();
Reply to: