r1326 - trunk/kernel/amd64/kernel-image-2.6.8-amd64-2.6.8/debian

[Frederik Sch??ler]

Author: fschueler-guest
Date: 2004-08-26 00:09:44 -0600 (Thu, 26 Aug 2004)
New Revision: 1326

Modified:
   trunk/kernel/amd64/kernel-image-2.6.8-amd64-2.6.8/debian/changelog
   trunk/kernel/amd64/kernel-image-2.6.8-amd64-2.6.8/debian/control
   trunk/kernel/amd64/kernel-image-2.6.8-amd64-2.6.8/debian/rules
Log:
Added Roberto Lumbreras <rover@debian.org> patch, who sponsored the upload to sid.


Modified: trunk/kernel/amd64/kernel-image-2.6.8-amd64-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/amd64/kernel-image-2.6.8-amd64-2.6.8/debian/changelog	2004-08-26 06:07:00 UTC (rev 1325)
+++ trunk/kernel/amd64/kernel-image-2.6.8-amd64-2.6.8/debian/changelog	2004-08-26 06:09:44 UTC (rev 1326)
@@ -5,8 +5,14 @@
     - Fixed typos in packages description: e64mt -> em64t
     - Added missing cross-compile wrapper scripts to allow building on i386.
 
- -- Frederik Schüler <fschueler@gmx.net>  Mon, 23 Aug 2004 15:43:09 +0200
+  * Roberto Lumbreras:
+    - Sponsoring the upload
+    - Removed i386 from architecture list of kernel-headers-2.6.8-2, it is
+      already provided by kernel-image-2.6.8-i386 and hacked debian/rules so
+      make-kpkg does not compliant
 
+ -- Frederik Schüler <fschueler@gmx.net>  Tue, 24 Aug 2004 20:53:15 +0200
+
 kernel-image-2.6.8-amd64 (2.6.8-1) unstable; urgency=low
 
   * New upstream version

Modified: trunk/kernel/amd64/kernel-image-2.6.8-amd64-2.6.8/debian/control
===================================================================
--- trunk/kernel/amd64/kernel-image-2.6.8-amd64-2.6.8/debian/control	2004-08-26 06:07:00 UTC (rev 1325)
+++ trunk/kernel/amd64/kernel-image-2.6.8-amd64-2.6.8/debian/control	2004-08-26 06:09:44 UTC (rev 1326)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 2), kernel-package (>= 8.054), kernel-tree-2.6.8-1, module-init-tools, gcc-3.4 (>= 3.4.1-6) [i386], dpkg-dev (>= 1.10.23)
 
 Package: kernel-headers-2.6.8-2
-Architecture: amd64 i386
+Architecture: amd64
 Section: devel
 Priority: optional
 Depends: coreutils | fileutils (>= 4.0), kernel-kbuild-2.6-3

Modified: trunk/kernel/amd64/kernel-image-2.6.8-amd64-2.6.8/debian/rules
===================================================================
--- trunk/kernel/amd64/kernel-image-2.6.8-amd64-2.6.8/debian/rules	2004-08-26 06:07:00 UTC (rev 1325)
+++ trunk/kernel/amd64/kernel-image-2.6.8-amd64-2.6.8/debian/rules	2004-08-26 06:09:44 UTC (rev 1326)
@@ -95,6 +95,7 @@
 	rm -f unpack-stamp build-stamp
 	rm -rf kernel-source-$(version) build-* install-*
 	rm -f bin/touch.orig
+	rm -f header-install.out
 	dh_clean
 
 install: build
@@ -108,10 +109,12 @@
 # Build architecture-dependent files here.
 binary-arch: install
 	dh_testdir
+ifneq ($(debarch),i386)
 	cd kernel-source-$(version); \
 		 HEADER_CLEAN_HOOK=$(CURDIR)/header-install.out \
 			 make-kpkg $(appvan) kernel-headers
 	mv kernel-source-$(version)/debian/files debian
+endif
 
 	for i in $(flavours); do \
 		cp -al build-$$i install-$$i; \
@@ -135,6 +138,8 @@
 	  dpkg-deb -b debian/$$DIR ..; \
 	  rm $$DEB; \
 	done
+	sed -e 's/_amd64\.deb/_i386.deb/' debian/files > debian/files.tmp
+	mv debian/files.tmp debian/files
 endif
 	mv *.deb ..