[kernel] r18746 - in dists/sid/linux-2.6/debian: . patches/debian

[Ben Hutchings]

Author: benh
Date: Mon Feb 27 03:38:04 2012
New Revision: 18746

Log:
version: Use maintainer rather than uploader address for official binary packages

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/debian/version.patch
   dists/sid/linux-2.6/debian/rules.real

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Feb 27 01:13:21 2012	(r18745)
+++ dists/sid/linux-2.6/debian/changelog	Mon Feb 27 03:38:04 2012	(r18746)
@@ -24,6 +24,8 @@
   * [powerpc/powerpc64] Enable IBM_EMAC (previously IBM_NEW_EMAC)
   * [x86] drm/i915: do not enable RC6p on Sandy Bridge (Closes: #660265)
   * ipsec: be careful of non existing mac headers (Closes: #660804)
+  * version: Use maintainer rather than uploader address for official
+    binary packages
 
   [ Bastian Blank ]
   * Don't advertise Xen support for rt images. (closes: #659988)

Modified: dists/sid/linux-2.6/debian/patches/debian/version.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/debian/version.patch	Mon Feb 27 01:13:21 2012	(r18745)
+++ dists/sid/linux-2.6/debian/patches/debian/version.patch	Mon Feb 27 03:38:04 2012	(r18746)
@@ -12,7 +12,7 @@
 +#ifdef LINUX_COMPILE_DISTRIBUTION_OFFICIAL_BUILD
 +	" (" LINUX_COMPILE_DISTRIBUTION " "
 +	     LINUX_COMPILE_DISTRIBUTION_VERSION ")"
-+	" (" LINUX_COMPILE_DISTRIBUTION_UPLOADER ")"
++	" (" LINUX_COMPILE_DISTRIBUTION_MAINTAINER ")"
 +#else
 +# ifdef LINUX_COMPILE_DISTRIBUTION_VERSION
 +	" (" LINUX_COMPILE_DISTRIBUTION_VERSION ")"
@@ -27,7 +27,7 @@
 +#ifdef LINUX_COMPILE_DISTRIBUTION_OFFICIAL_BUILD
 +	" (" LINUX_COMPILE_DISTRIBUTION " "
 +	     LINUX_COMPILE_DISTRIBUTION_VERSION ")"
-+	" (" LINUX_COMPILE_DISTRIBUTION_UPLOADER ")"
++	" (" LINUX_COMPILE_DISTRIBUTION_MAINTAINER ")"
 +#else
 +# ifdef LINUX_COMPILE_DISTRIBUTION_VERSION
 +	" (" LINUX_COMPILE_DISTRIBUTION_VERSION ")"
@@ -49,7 +49,7 @@
 +
 +  if [ "$DISTRIBUTION_OFFICIAL_BUILD" ]; then
 +    echo \#define LINUX_COMPILE_DISTRIBUTION_OFFICIAL_BUILD
-+    echo \#define LINUX_COMPILE_DISTRIBUTION_UPLOADER \"$DISTRIBUTION_UPLOADER\"
++    echo \#define LINUX_COMPILE_DISTRIBUTION_MAINTAINER \"$DISTRIBUTION_MAINTAINER\"
 +    echo \#define LINUX_COMPILE_DISTRIBUTION_VERSION \"$DISTRIBUTION_VERSION\"
 +    echo \#define LINUX_COMPILE_BY \"unknown\"
 +    echo \#define LINUX_COMPILE_HOST \"$DISTRIBUTION\"

Modified: dists/sid/linux-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-2.6/debian/rules.real	Mon Feb 27 01:13:21 2012	(r18745)
+++ dists/sid/linux-2.6/debian/rules.real	Mon Feb 27 03:38:04 2012	(r18746)
@@ -10,7 +10,7 @@
 DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_HOST_GNU_TYPE)
 DEB_HOST_MULTIARCH:= $(shell dpkg-architecture -a'$(ARCH)' -qDEB_HOST_MULTIARCH)
 DEB_BUILD_ARCH    := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_BUILD_ARCH)
-UPLOADER  := $(shell dpkg-parsechangelog | sed -ne 's,^Maintainer: .[^<]*<\([^>]*\)>,\1,p')
+MAINTAINER := $(shell sed -ne 's,^Maintainer: .[^<]*<\([^>]*\)>,\1,p' debian/control)
 DISTRIBUTION := $(shell dpkg-parsechangelog | sed -ne 's,^Distribution: ,,p')
 
 export PYTHONPATH = $(CURDIR)/debian/lib/python
@@ -26,7 +26,7 @@
 stamp = [ -d $(dir $@) ] || mkdir $(dir $@); touch $@
 
 setup_env := env -u ABINAME -u ABINAME_PART -u ARCH -u FEATURESET -u FLAVOUR -u VERSION -u LOCALVERSION
-setup_env += DISTRIBUTION_OFFICIAL_BUILD=1 DISTRIBUTION_UPLOADER=$(UPLOADER) DISTRIBUTION_VERSION="$(SOURCEVERSION)"
+setup_env += DISTRIBUTION_OFFICIAL_BUILD=1 DISTRIBUTION_MAINTAINER=$(MAINTAINER) DISTRIBUTION_VERSION="$(SOURCEVERSION)"
 
 MAKE_CLEAN = $(setup_env) $(MAKE)
 MAKE_SELF := $(MAKE) -f debian/rules.real $(MAKEOVERRIDES)