r3798 - in people/waldi/kernel/source/linux-2.6/debian: . bin

[Bastian Blank]

Author: waldi
Date: 2005-08-09 22:52:43 +0000 (Tue, 09 Aug 2005)
New Revision: 3798

Modified:
   people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
   people/waldi/kernel/source/linux-2.6/debian/rules.real
Log:
debian/bin/gencontrol.py, debian/rules.real: Use DH_OPTIONS.


Modified: people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-09 22:39:24 UTC (rev 3797)
+++ people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-09 22:52:43 UTC (rev 3798)
@@ -379,7 +379,7 @@
                 flavour_makeflags = subarch_makeflags + " FLAVOUR='%s'" % flavour
                 cmds_binary = []
                 cmds_binary.append(("$(MAKE) -f debian/rules.real binary-flavour %s" % flavour_makeflags,))
-                cmds_binary.append(("$(MAKE) -f debian/rules.real binary-dummy PACKAGES_ARG='%s'" % ' '.join(["-p%s" % i['Package'] for i in dummy_packages]),))
+                cmds_binary.append(("$(MAKE) -f debian/rules.real binary-dummy DH_OPTIONS='%s'" % ' '.join(["-p%s" % i['Package'] for i in dummy_packages]),))
                 cmds_build = []
                 cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % flavour_makeflags,))
                 cmds_setup = []
@@ -404,10 +404,10 @@
 
         cmds = []
         for i in extra_pn[arch]:
-            makeflags = ""
+            tmp = []
             if i.has_key('X-Version-Overwrite-Epoch'):
-                    makeflags = "GENCONTROL_ARGS='-v1:%s'" % source_version
-            cmds.append("$(MAKE) -f debian/rules.real binary-dummy PACKAGES_ARG='-p%s' %s" % (i['Package'], makeflags))
+                    tmp.append("-v1:%s" % source_version)
+            cmds.append("$(MAKE) -f debian/rules.real binary-dummy DH_OPTIONS='-p%s' GENCONTROL_ARGS='%s'" % (i['Package'], ' '.join(tmp)))
         makefile.append(("binary-%s:: binary-%s-extra" % (arch, arch), None))
         makefile.append(("binary-%s-extra:" % arch, cmds))
 

Modified: people/waldi/kernel/source/linux-2.6/debian/rules.real
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-09 22:39:24 UTC (rev 3797)
+++ people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-09 22:52:43 UTC (rev 3798)
@@ -210,12 +210,12 @@
 binary-dummy:
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs $(PACKAGES_ARG)
-	dh_installdocs $(PACKAGES_ARG)
-	dh_compress $(PACKAGES_ARG)
-	dh_fixperms $(PACKAGES_ARG)
-	dh_installdeb $(PACKAGES_ARG)
-	dh_gencontrol $(PACKAGES_ARG) -- $(GENCONTROL_ARGS)
-	dh_md5sums $(PACKAGES_ARG)
-	dh_builddeb $(PACKAGES_ARG)
+	dh_installchangelogs
+	dh_installdocs
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol -- $(GENCONTROL_ARGS)
+	dh_md5sums
+	dh_builddeb