[Glibc-bsd-commits] r4683 - trunk/kfreebsd-kernel-headers/debian

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-07-05 21:02:33 +0000 (Fri, 05 Jul 2013)
New Revision: 4683

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/control
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
Revert Multiarch switch from last upload. Glibc is not happy about it.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2013-07-05 20:03:53 UTC (rev 4682)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2013-07-05 21:02:33 UTC (rev 4683)
@@ -1,8 +1,9 @@
 kfreebsd-kernel-headers (9.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Revert Multiarch switch from last upload. Glibc is not happy about it.
 
- -- Robert Millan <rmh at debian.org>  Wed, 03 Jul 2013 20:20:16 +0200
+ -- Robert Millan <rmh at debian.org>  Fri, 05 Jul 2013 23:01:41 +0200
 
 kfreebsd-kernel-headers (9.0-1) unstable; urgency=low
 

Modified: trunk/kfreebsd-kernel-headers/debian/control
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/control	2013-07-05 20:03:53 UTC (rev 4682)
+++ trunk/kfreebsd-kernel-headers/debian/control	2013-07-05 21:02:33 UTC (rev 4683)
@@ -6,7 +6,6 @@
  Guillem Jover <guillem at debian.org>,
  Robert Millan <rmh at debian.org>
 Build-Depends: debhelper (>= 7), quilt, kfreebsd-source-9.1,
- dpkg-dev (>= 1.16.0~),
 Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/kfreebsd-kernel-headers/
 Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/kfreebsd-kernel-headers/
 Standards-Version: 3.9.4

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2013-07-05 20:03:53 UTC (rev 4682)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2013-07-05 21:02:33 UTC (rev 4683)
@@ -101,14 +101,12 @@
 	dh_installdirs
 	dh_install --sourcedir=$(CURDIR)
 
-	mkdir -p $(HEADERS_PACKAGE)/usr/include/$(DEB_HOST_MULTIARCH)/machine
+ifneq ($(filter amd64, $(kfreebsd_cpu)),)
+	sh debian/generate-asm.sh $(kfreebsd_cpu) $(CURDIR)/sys $(HEADERS_PACKAGE)/usr/include
+else
+	mkdir -p $(HEADERS_PACKAGE)/usr/include/machine
 	cd $(CURDIR)/sys/$(kfreebsd_cpu)/include \
-		&& find . -type f -name "*.h" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/include/$(DEB_HOST_MULTIARCH)/machine \;
-
-ifeq ($(kfreebsd_cpu), amd64)
-	mkdir -p $(HEADERS_PACKAGE)/usr/include/i386-kfreebsd-gnu/machine
-	cd $(CURDIR)/sys/i386/include \
-		&& find . -type f -name "*.h" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/include/i386-kfreebsd-gnu/machine \;
+		&& find . -type f -name "*.h" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/include/machine \;
 endif
 
 ifneq ($(filter i386 amd64, $(kfreebsd_cpu)),)