Hello,

find an updated patch attached.

Best regars
Frederik Schueler

-- 
ENOSIG
diff -u util-linux-2.12r/debian/rules util-linux-2.12r/debian/rules
--- util-linux-2.12r/debian/rules
+++ util-linux-2.12r/debian/rules
@@ -22,6 +22,7 @@
 version := $(shell sed -e '1{;s|^util-linux (\(.*\))\ .*|\1|;q;}' 
debian/changelog)
 
 fdisk_arch = $(findstring $(arch),alpha i386 powerpc ppc64 arm mips mipsel 
hppa ia64 hurd-i386 amd64 s390)
+rdev_arch = $(findstring $(arch),i386 amd64)
 sparc = $(findstring $(arch),sparc sparc64)
 nohwclock = $(findstring $(arch),s390)
 
@@ -155,7 +156,7 @@
 MAN8FILES := $(MAN8FILES) fdisk/fdisk.8
 DOCFILES  := $(DOCFILES) fdisk/README.fdisk
 endif
-ifeq ($(arch),i386)
+ifeq ($(arch),$(rdev_arch))
 USBINFILES:= $(USBINFILES) sys-utils/rdev
 MAN8FILES := $(MAN8FILES) sys-utils/{rdev.8,vidmode.8} \
                sys-utils/{ramsize.8,rootflags.8}
@@ -182,7 +183,7 @@
        install    $(UBINFILES2) debian/tmp/usr/bin
 ifneq ($(USBINFILES),)
        install -s $(USBINFILES) debian/tmp/usr/sbin
-ifeq ($(arch), i386)
+ifeq ($(arch),$(rdev_arch))
        ln -s rdev debian/tmp/usr/sbin/ramsize
        ln -s rdev debian/tmp/usr/sbin/vidmode
        ln -s rdev debian/tmp/usr/sbin/rootflags
diff -u util-linux-2.12r/debian/patches/00list 
util-linux-2.12r/debian/patches/00list
--- util-linux-2.12r/debian/patches/00list
+++ util-linux-2.12r/debian/patches/00list
@@ -16,0 +17 @@
+99-amd64-rdev.dpatch
diff -u util-linux-2.12r/debian/changelog util-linux-2.12r/debian/changelog
--- util-linux-2.12r/debian/changelog
+++ util-linux-2.12r/debian/changelog
@@ -1,3 +1,10 @@
+util-linux (2.12r-8.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * provide rdev executable and docs on amd64. Closes: #297789
+
+ -- Frederik Schüler <[EMAIL PROTECTED]>  Mon, 17 Apr 2006 14:55:17 +0200
+
 util-linux (2.12r-8) unstable; urgency=high
 
   * Drop NFS v4 patch, since it breaks mounting things exported by
only in patch2:
unchanged:
--- util-linux-2.12r.orig/debian/patches/99-amd64-rdev.dpatch
+++ util-linux-2.12r/debian/patches/99-amd64-rdev.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99-amd64-rdev.dpatch by Frederik Schüler <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: hacking "architecture detection" to get rdev on amd64 too.
+
[EMAIL PROTECTED]@
+--- util-linux/sys-utils/Makefile.old  2006-04-17 15:37:24.000000000 +0200
++++ util-linux/sys-utils/Makefile      2006-04-17 15:39:11.000000000 +0200
+@@ -37,7 +37,7 @@
+ endif
+ endif
+ 
+-ifeq "$(ARCH)" "intel"
++ifeq "$(ARCH)" "$(findstring $(ARCH),intel amd64)"
+ MAN8:=$(MAN8) rdev.8 ramsize.8 rootflags.8 vidmode.8
+ USRSBIN:=$(USRSBIN) rdev
+ endif

Attachment: signature.asc
Description: Digital signature

Reply via email to