[Glibc-bsd-commits] r3911 - in trunk: kfreebsd-10/debian kfreebsd-9/debian

[Robert Millan]

Author: rmh
Date: 2011-12-01 21:49:14 +0000 (Thu, 01 Dec 2011)
New Revision: 3911

Modified:
   trunk/kfreebsd-10/debian/rules
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/rules
Log:
Fix it right this time...

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2011-12-01 07:06:30 UTC (rev 3910)
+++ trunk/kfreebsd-10/debian/rules	2011-12-01 21:49:14 UTC (rev 3911)
@@ -281,16 +281,15 @@
 	KW_CONFIG_DIR=debian/arch/$(DEB_HOST_ARCH_CPU)/installer kernel-wedge install-files \
 		$(version)-$(abiname) debian/arch/$(DEB_HOST_ARCH_CPU)/installer
 
-	# override file
-	mkdir -p $(CURDIR)/debian/zlib-modules-$(version)-$(abiname)-*-di/usr/share/lintian/overrides
-	install -p -o root -g root -m 644 \
-		debian/zlib-modules.overrides \
-		$(CURDIR)/debian/zlib-modules-$(version)-$(abiname)-*-di/usr/share/lintian/overrides/zlib-modules-$(version)-$(abiname)-$*-di
-
-	# fixup kernel path (so that this udeb can be installed alongside
-	# other major versions of kfreebsd)
 	for i in debian/arch/$(DEB_HOST_ARCH_CPU)/*.installer ; do \
 		subarch=`basename $$i .installer` ; \
+		# override file \n\
+		mkdir -p $(CURDIR)/debian/zlib-modules-$(version)-$(abiname)-$${subarch}-di/usr/share/lintian/overrides ; \
+		install -p -o root -g root -m 644 \
+			debian/zlib-modules.overrides \
+			$(CURDIR)/debian/zlib-modules-$(version)-$(abiname)-$${subarch}-di/usr/share/lintian/overrides/zlib-modules-$(version)-$(abiname)-$${subarch}-di ; \
+		\
+		# fixup kernel path (so that this udeb can be installed alongside other major versions of kfreebsd) \n\
 		mv debian/kernel-image-$(version)-$(abiname)-$${subarch}-di/boot/kfreebsd{,-$(major)}.gz ; \
 	done
 endif

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-12-01 07:06:30 UTC (rev 3910)
+++ trunk/kfreebsd-9/debian/changelog	2011-12-01 21:49:14 UTC (rev 3911)
@@ -2,7 +2,7 @@
 
   * Fix kernel-image major number suffix hack.
 
- -- Robert Millan <rmh at debian.org>  Wed, 30 Nov 2011 19:25:57 +0100
+ -- Robert Millan <rmh at debian.org>  Thu, 01 Dec 2011 22:48:24 +0100
 
 kfreebsd-9 (9.0~svn227451-5) unstable; urgency=medium
 

Modified: trunk/kfreebsd-9/debian/rules
===================================================================
--- trunk/kfreebsd-9/debian/rules	2011-12-01 07:06:30 UTC (rev 3910)
+++ trunk/kfreebsd-9/debian/rules	2011-12-01 21:49:14 UTC (rev 3911)
@@ -293,16 +293,15 @@
 	KW_CONFIG_DIR=debian/arch/$(DEB_HOST_ARCH_CPU)/installer kernel-wedge install-files \
 		$(version)-$(abiname) debian/arch/$(DEB_HOST_ARCH_CPU)/installer
 
-	# override file
-	mkdir -p $(CURDIR)/debian/zlib-modules-$(version)-$(abiname)-*-di/usr/share/lintian/overrides
-	install -p -o root -g root -m 644 \
-		debian/zlib-modules.overrides \
-		$(CURDIR)/debian/zlib-modules-$(version)-$(abiname)-*-di/usr/share/lintian/overrides/zlib-modules-$(version)-$(abiname)-$*-di
-
-	# fixup kernel path (so that this udeb can be installed alongside
-	# other major versions of kfreebsd)
 	for i in debian/arch/$(DEB_HOST_ARCH_CPU)/*.installer ; do \
 		subarch=`basename $$i .installer` ; \
+		# override file \n\
+		mkdir -p $(CURDIR)/debian/zlib-modules-$(version)-$(abiname)-$${subarch}-di/usr/share/lintian/overrides ; \
+		install -p -o root -g root -m 644 \
+			debian/zlib-modules.overrides \
+			$(CURDIR)/debian/zlib-modules-$(version)-$(abiname)-$${subarch}-di/usr/share/lintian/overrides/zlib-modules-$(version)-$(abiname)-$${subarch}-di ; \
+		\
+		# fixup kernel path (so that this udeb can be installed alongside other major versions of kfreebsd) \n\
 		mv debian/kernel-image-$(version)-$(abiname)-$${subarch}-di/boot/kfreebsd{,-$(major)}.gz ; \
 	done
 endif