v2.12r-15

diff --git a/debian/changelog b/debian/changelog
index 6c42a3c54c40c6b754c815e3d6f145deb98ba835..22467d39df4f9b0005c1b4b4a68a81a647c7fbcb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+util-linux (2.12r-15) unstable; urgency=low
+
+  * New amd64 rdev patch.  Closes: #396842
+
+ -- LaMont Jones <lamont@debian.org>  Fri,  3 Nov 2006 20:44:05 -0700
+
 util-linux (2.12r-14) unstable; urgency=low
 
   * Make that 11 for hwclock.sh, since we need / to be writable for the

diff --git a/debian/patches/10amd64-rdev.dpatch b/debian/patches/10amd64-rdev.dpatch
index 96ec7dd0bb0313248be2e9c960f7a2e669f831ab..6d2cbe10f310dbe9ccb8d087a9aaa5d0658710b2 100644 (file)
--- a/debian/patches/10amd64-rdev.dpatch
+++ b/debian/patches/10amd64-rdev.dpatch
@@ -5,14 +5,15 @@
 ## DP: hacking "architecture detection" to get rdev on amd64 too.
 
 @DPATCH@
---- util-linux/MCONFIG.old     2005-03-02 23:14:51.424457925 +0100
-+++ util-linux/MCONFIG 2005-03-02 23:22:06.749245047 +0100
-@@ -17,7 +17,7 @@
- # Select for CPU i386 if the binaries must be able to run on an intel 386
- # (by default i486 code is generated, see below)
- CPU=$(shell uname -m)
--ARCH=$(shell echo $(CPU) | sed 's/i.86/intel/;s/arm.*/arm/')
-+ARCH=$(shell echo $(CPU) | sed 's/i.86/intel/;s/arm.*/arm/;s/x86_64/intel/')
+diff -urN ../tmp-orig/util-linux-2.12r/sys-utils/Makefile ./sys-utils/Makefile
+--- ../tmp-orig/util-linux-2.12r/sys-utils/Makefile    2004-11-15 17:47:47.000000000 +0000
++++ ./sys-utils/Makefile       2006-11-03 09:05:30.000000000 +0000
+@@ -37,7 +37,7 @@
+ endif
+ endif
  
- # If HAVE_PAM is set to "yes", then login, chfn, chsh, and newgrp
- # will use PAM for authentication. Additionally, passwd will not be
+-ifeq "$(ARCH)" "intel"
++ifneq (,findstring("$(ARCH)",intel x86_64))
+ MAN8:=$(MAN8) rdev.8 ramsize.8 rootflags.8 vidmode.8
+ USRSBIN:=$(USRSBIN) rdev
+ endif