[pkg-nvidia-devel] r786 - in /packages/nvidia-graphics-modules-i386/trunk/debian: changelog rules

[rra at users.alioth.debian.org]

Author: rra
Date: Fri Apr  9 06:58:39 2010
New Revision: 786

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=786
Log:
Build arch-dependent metapackages in binary-arch, not binary-indep

The binary-indep target was building the metapackages, but the
metapackages are all arch-dependent.  This happens to work if one
uses the default dpkg-buildpackage invocation, since it just calls
debian/rules binary and doesn't pay attention to which sub-target
does what.  But it would fail with any of the options to do specific
builds.

Instead, build the meta-packages in binary-arch, but before building
the kernel packages.  This will mean that we'll build empty dummy
packages for the kernel packages and then replace them in debian/files
with the real packages, but that should be harmless.

Modified:
    packages/nvidia-graphics-modules-i386/trunk/debian/changelog
    packages/nvidia-graphics-modules-i386/trunk/debian/rules

Modified: packages/nvidia-graphics-modules-i386/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules-i386/trunk/debian/changelog?rev=786&op=diff
==============================================================================
--- packages/nvidia-graphics-modules-i386/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-modules-i386/trunk/debian/changelog Fri Apr  9 06:58:39 2010
@@ -8,6 +8,7 @@
     specific corresponding kernels, and since we may not always have
     builds for the kernel version tracked by the metapackage, we should
     not make the user upgrade to use our metapackages.
+  * Build arch-dependent metapackages in binary-arch, not binary-indep.
   * General debian/rules cleanup.
     - Use dpkg-parsechangelog instead of head -1 | sed.
     - Merge unpack and build rules.

Modified: packages/nvidia-graphics-modules-i386/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules-i386/trunk/debian/rules?rev=786&op=diff
==============================================================================
--- packages/nvidia-graphics-modules-i386/trunk/debian/rules (original)
+++ packages/nvidia-graphics-modules-i386/trunk/debian/rules Fri Apr  9 06:58:39 2010
@@ -37,7 +37,12 @@
 	rm -f *.deb
 	dh_clean
 
+# Use debhelper to build the metapackages and then build the kernel
+# packages.  debhelper will build dummy packages based on debian/control for
+# the kernel packages, which will then be overwritten by the real packages.
+binary: binary-arch binary-indep
 binary-indep:
+binary-arch: build
 	dh_installdirs
 	dh_installchangelogs
 	dh_installdocs
@@ -47,8 +52,6 @@
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
-
-binary-arch: build
 	cp control.template modules/nvidia-kernel/debian/
 	set -e; cd modules/nvidia-kernel; \
 	    for i in $(flavours); do \