[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Ubuntu dpkg 1.13.24ubuntu4



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.7
Date: Tue, 13 Feb 2007 12:30:55 +0100
Source: dpkg
Binary: dpkg dselect dpkg-dev
Architecture: source
Version: 1.13.24ubuntu4
Distribution: feisty
Urgency: low
Maintainer: ubuntu-devel@lists.ubuntu.com
Changed-By: Martin Pitt <martin.pitt@ubuntu.com>
Description: 
 dpkg       - package maintenance system for Debian
 dpkg-dev   - package building tools for Debian
 dselect    - user tool to manage Debian packages
Changes: 
 dpkg (1.13.24ubuntu4) feisty; urgency=low
 .
   [ Martin Pitt ]
   * scripts/dpkg-source.pl: Check that debian/control complies to
     https://wiki.ubuntu.com/DebianMaintainerField: Refuse to build a source
     package if we have an Ubuntu version number, but Maintainer: is not an
     Ubuntu address. Output a warning if there is no XSBC-Original-Maintainer:
     field for packages with an Ubuntu version number.
   * debian/control: Change Maintainer/XSBC-Original-Maintainer field.
 .
   [ Colin Watson ]
   * scripts/dpkg-gencontrol.pl: Fix regular expression that special-cased
     Origin:, Bugs:, and Maintainer:. The broken one caused X[SBC]-* fields to
     go into the .deb control record unprocessed. (LP: #84850)
Files: 
 1ac9188b7bcaa5f20aa40d3894a5d5cb 918 admin required dpkg_1.13.24ubuntu4.dsc
 543ba64c9917cb60f632fc3a6a29eb3c 4996590 admin required dpkg_1.13.24ubuntu4.tar.gz
Original-Maintainer: Dpkg Developers <team@dpkg.org>
diff -pruN 1.13.24ubuntu3/debian/changelog 1.13.24ubuntu4/debian/changelog
--- 1.13.24ubuntu3/debian/changelog	2007-02-08 15:03:36.000000000 +0000
+++ 1.13.24ubuntu4/debian/changelog	2007-02-13 11:36:08.000000000 +0000
@@ -1,3 +1,20 @@
+dpkg (1.13.24ubuntu4) feisty; urgency=low
+
+  [ Martin Pitt ]
+  * scripts/dpkg-source.pl: Check that debian/control complies to
+    https://wiki.ubuntu.com/DebianMaintainerField: Refuse to build a source
+    package if we have an Ubuntu version number, but Maintainer: is not an
+    Ubuntu address. Output a warning if there is no XSBC-Original-Maintainer:
+    field for packages with an Ubuntu version number.
+  * debian/control: Change Maintainer/XSBC-Original-Maintainer field.
+
+  [ Colin Watson ]
+  * scripts/dpkg-gencontrol.pl: Fix regular expression that special-cased
+    Origin:, Bugs:, and Maintainer:. The broken one caused X[SBC]-* fields to
+    go into the .deb control record unprocessed. (LP: #84850)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 13 Feb 2007 12:30:55 +0100
+
 dpkg (1.13.24ubuntu3) feisty; urgency=low
 
   * Add Launchpad-Bugs-Fixed to dpkg-genchanges too, to make it not
diff -pruN 1.13.24ubuntu3/debian/control 1.13.24ubuntu4/debian/control
--- 1.13.24ubuntu3/debian/control	2006-06-07 08:28:07.000000000 +0100
+++ 1.13.24ubuntu4/debian/control	2007-02-13 11:35:26.000000000 +0000
@@ -1,7 +1,8 @@
 Source: dpkg
 Section: admin
 Priority: required
-Maintainer: Dpkg Developers <team@dpkg.org>
+Maintainer: ubuntu-devel@lists.ubuntu.com
+XSBC-Original-Maintainer: Dpkg Developers <team@dpkg.org>
 Uploaders: Frank Lichtenheld <djpig@debian.org>, Guillem Jover <guillem@debian.org>, Brendan O'Dea <bod@debian.org>, Christian Perrier <bubulle@debian.org>
 Origin: debian
 Bugs: debbugs://bugs.debian.org
diff -pruN 1.13.24ubuntu3/scripts/dpkg-gencontrol.pl 1.13.24ubuntu4/scripts/dpkg-gencontrol.pl
--- 1.13.24ubuntu3/scripts/dpkg-gencontrol.pl	2007-02-08 16:16:43.000000000 +0000
+++ 1.13.24ubuntu4/scripts/dpkg-gencontrol.pl	2007-02-13 10:29:58.000000000 +0000
@@ -127,7 +127,7 @@ for $_ (keys %fi) {
     $v= $fi{$_};
     if (s/^C //) {
 #print STDERR "G key >$_< value >$v<\n";
-        if (m/^Origin|Bugs|Maintainer$/) { $f{$_}=$v; }
+        if (m/^(Origin|Bugs|Maintainer)$/) { $f{$_}=$v; }
         elsif (m/^Source$/) { &setsourcepackage; }
         elsif (s/^X[CS]*B[CS]*-//i) { $f{$_}= $v; }
 	elsif (m/^X[CS]+-|^(Standards-Version|Uploaders)$|^Build-(Depends|Conflicts)(-Indep)?$/i) { }
diff -pruN 1.13.24ubuntu3/scripts/dpkg-source.pl 1.13.24ubuntu4/scripts/dpkg-source.pl
--- 1.13.24ubuntu3/scripts/dpkg-source.pl	2007-02-08 15:51:45.000000000 +0000
+++ 1.13.24ubuntu4/scripts/dpkg-source.pl	2007-02-13 11:30:04.000000000 +0000
@@ -286,6 +286,17 @@ if ($opmode eq 'build') {
     $basedirname= $basename;
     $basedirname =~ s/_/-/;
 
+    # check that Maintainer/XSBC-Original-Maintainer comply to
+    # https://wiki.ubuntu.com/DebianMaintainerField
+    if ($version =~ /ubuntu/) {
+            if ($fi{'C Maintainer'} !~ /ubuntu/) {
+                    &error(_g('Version number suggests Ubuntu changes, but Maintainer: does not have Ubuntu address'));
+            }
+            unless ($fi{'C Xsbc-Original-Maintainer'}) {
+                    &warn(_g('Version number suggests Ubuntu changes, but there is no XSBC-Original-Maintainer field'))
+            }
+    }
+
     $origdir= "$dir.orig";
     $origtargz= "$basename.orig.tar.gz";
     if (@ARGV) {

Reply to: