[Pkg-sysvinit-commits] r738 - sysvinit/trunk/debian

[Thomas Hood]

Author: jdthood-guest
Date: 2006-02-04 16:07:07 +0000 (Sat, 04 Feb 2006)
New Revision: 738

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/control
   sysvinit/trunk/debian/rules
Log:
Do #340285

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-02-04 15:44:05 UTC (rev 737)
+++ sysvinit/trunk/debian/changelog	2006-02-04 16:07:07 UTC (rev 738)
@@ -33,6 +33,9 @@
     that zoneinfo is available
   * shutdown(8): Fix typo  (Closes: #350830)
   * Add README.Debian for sysv-rc
+  * debian/rules:
+    + Handle older dpkg-architecture
+    + Tweak Build-Depends on libselinux1-dev   (Closes: #340285)
 
   [ A Costa / TH ]
   * man pages: 10_doc_manuals.dpatch: Fix a shipload o' typos

Modified: sysvinit/trunk/debian/control
===================================================================
--- sysvinit/trunk/debian/control	2006-02-04 15:44:05 UTC (rev 737)
+++ sysvinit/trunk/debian/control	2006-02-04 16:07:07 UTC (rev 738)
@@ -4,7 +4,7 @@
 Maintainer: sysvinit maintainers <pkg-sysvinit-devel at lists.alioth.debian.org>
 Uploaders: Miquel van Smoorenburg <miquels at cistron.nl>, Petter Reinholdtsen <pere at debian.org>, Thomas Hood <jdthood at yahoo.co.uk>
 Standards-Version: 3.6.2.1
-Build-Depends: dpatch, libselinux1-dev (>= 1.14-1) [!hurd-i386 !kfreebsd-i386], libsepol1-dev [!hurd-i386 !kfreebsd-i386]
+Build-Depends: dpatch, libselinux1-dev (>= 1.14) [!hurd-i386 !kfreebsd-i386], libsepol1-dev [!hurd-i386 !kfreebsd-i386]
 
 Package: sysvinit
 Essential: yes

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2006-02-04 15:44:05 UTC (rev 737)
+++ sysvinit/trunk/debian/rules	2006-02-04 16:07:07 UTC (rev 738)
@@ -12,8 +12,16 @@
 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-export DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS \
-                                   2>/dev/null|| true)
+export DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null || true)
+
+# Handle fact that sarge dpkg-architecture doesn't have DEB_HOST_ARCH_OS
+ifeq ($(DEB_HOST_ARCH_OS),)
+  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))
+  ifeq ($(DEB_HOST_ARCH_OS),gnu)
+    DEB_HOST_ARCH_OS := hurd
+  endif
+endif
+
 LIBC6	= libc6
 ifeq ($(DEB_HOST_ARCH), alpha)
 LIBC6	= libc6.1