diffstat for coreutils_5.2.1-2 coreutils_5.2.1-2osso1

 changelog |   13 +++++++++++++
 control   |    2 +-
 rules     |   16 ++++++++++++----
 3 files changed, 26 insertions(+), 5 deletions(-)

diff -u coreutils-5.2.1/debian/rules coreutils-5.2.1/debian/rules
--- coreutils-5.2.1/debian/rules
+++ coreutils-5.2.1/debian/rules
@@ -12,6 +12,14 @@
 include /usr/share/dbs/dbs-build.mk
 include /usr/share/dbs/dpkg-arch.mk
 
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
+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
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 CFLAGS = "-g -DSYSLOG_SUCCESS -DSYSLOG_FAILURE -DSYSLOG_NON_ROOT -O0"
 else
@@ -44,7 +52,7 @@
 	dh_testdir
 
 	cd $(BUILD_TREE) && $(MAKE)
-	cd $(BUILD_TREE) && $(MAKE) check
+	#cd $(BUILD_TREE) && $(MAKE) check
 
 	touch build-stamp
 
@@ -75,17 +83,17 @@
 	mv $(d)/usr/share/man/man1/md5sum.1 $(d)/usr/share/man/man1/md5sum.textutils.1
 
 	# some things we don't do for hurd
-ifneq ($(DEB_HOST_GNU_SYSTEM),gnu)
+ifneq ($(DEB_HOST_ARCH_OS),hurd)
 		# touch used to be in /usr/bin, don't break scripts
 		ln -s /bin/touch $(d)/usr/bin/touch
 endif
 
 	# remove stuff provided by other packages
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
 		# kill from procps is linux-specific
 		rm -f $(d)/usr/bin/kill $(d)/usr/share/man/man1/kill.1
 endif
-ifneq ($(DEB_HOST_GNU_SYSTEM),gnu)
+ifneq ($(DEB_HOST_ARCH_OS),hurd)
 		rm -f $(d)/usr/bin/su $(d)/usr/share/man/man1/su.1
 endif
 
diff -u coreutils-5.2.1/debian/changelog coreutils-5.2.1/debian/changelog
--- coreutils-5.2.1/debian/changelog
+++ coreutils-5.2.1/debian/changelog
@@ -1,3 +1,16 @@
+coreutils (5.2.1-2osso1) unstable; urgency=low
+
+  * armel: s/DEB_HOST_GNU_SYSTEM/DEB_HOST_ARCH_OS/
+
+ -- Ed Bartosh <eduard.bartosh@nokia.com>  Wed, 24 May 2006 15:07:07 +0300
+
+coreutils (5.2.1-2osso) unstable; urgency=low
+
+  * don't perform check - it fails under scratchbox
+  * build-dependency to help2man removed
+
+ -- Ed Bartosh <eduard.bartosh@nokia.com>  Thu,  6 Apr 2006 20:05:47 +0300
+
 coreutils (5.2.1-2) unstable; urgency=low
 
   * remove su for kfreebsd (Closes: #225131)
diff -u coreutils-5.2.1/debian/control coreutils-5.2.1/debian/control
--- coreutils-5.2.1/debian/control
+++ coreutils-5.2.1/debian/control
@@ -3,7 +3,7 @@
 Section: base
 Priority: required
 Standards-Version: 3.6.0
-Build-Depends: gettext (>= 0.10.37), debhelper, dh-buildinfo, perl-base, texinfo (>= 4.2), groff, help2man, dbs, autoconf (>= 2.57), automake1.8, libattr1-dev | not+linux-gnu, libacl1-dev | not+linux-gnu, bzip2, bison
+Build-Depends: gettext (>= 0.10.37), debhelper, dh-buildinfo, perl-base, texinfo (>= 4.2), groff, dbs, autoconf (>= 2.57), automake1.8, libattr1-dev | not+linux-gnu, libacl1-dev | not+linux-gnu, bzip2, bison
 Build-Conflicts: automake1.4
 
 Package: coreutils