Package: util-linux
Version: 2.12p-4
Severity: serious
Tags: patch
'util-linux' does not build correctly with the new dpkg because
DEB_HOST_GNU_SYSTEM returns 'linux-gnu' instead of 'linux' now.
The attached patch fixes debian/rules accordingly.
The patch also updates the Build-Depends to use libslang2-dev instead of
slang1-utf8-dev.
Additionally, the patch adds support for the ppc64 architecture in
debian/control and debian/rules.
Regards
Andreas Jochens
diff -urN ../tmp-orig/util-linux-2.12p/debian/control ./debian/control
--- ../tmp-orig/util-linux-2.12p/debian/control 2005-07-20 06:20:16.000000000
+0000
+++ ./debian/control 2005-07-20 06:18:08.000000000 +0000
@@ -1,7 +1,7 @@
Source: util-linux
Section: base
Priority: required
-Build-Depends: libncurses5-dev, slang1-utf8-dev (>=1.4.9), gettext,
zlib1g-dev, libblkid-dev, uuid-dev, dpatch
+Build-Depends: libncurses5-dev, libslang2-dev, gettext, zlib1g-dev,
libblkid-dev, uuid-dev, dpatch
Maintainer: LaMont Jones <[EMAIL PROTECTED]>
Standards-Version: 3.5.6.0
@@ -34,7 +34,7 @@
messages in other languages than English.
Package: mount
-Architecture: alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc sh s390
sparc sparc64
+Architecture: alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc ppc64 sh
s390 sparc sparc64
Essential: yes
Pre-Depends: ${mount:Depends}
Description: Tools for mounting and manipulating filesystems
@@ -54,7 +54,7 @@
Included are: logger, renice, replay, script, wall
Package: fdisk-udeb
-Architecture: alpha amd64 arm hppa i386 ia64 mips mipsel powerpc hurd-i386
sparc s390
+Architecture: alpha amd64 arm hppa i386 ia64 mips mipsel powerpc ppc64
hurd-i386 sparc s390
Priority: extra
Section: debian-installer
Depends: ${cfdisk-udeb:Depends}
diff -urN ../tmp-orig/util-linux-2.12p/debian/rules ./debian/rules
--- ../tmp-orig/util-linux-2.12p/debian/rules 2005-07-20 06:20:16.000000000
+0000
+++ ./debian/rules 2005-07-20 05:53:07.000000000 +0000
@@ -16,7 +16,7 @@
export arch = $(DEB_HOST_ARCH)
version := $(shell sed -e '1{;s|^util-linux (\(.*\))\ .*|\1|;q;}'
debian/changelog)
-fdisk_arch = $(findstring $(arch),alpha i386 powerpc arm mips mipsel hppa ia64
hurd-i386 amd64 s390)
+fdisk_arch = $(findstring $(arch),alpha i386 powerpc ppc64 arm mips mipsel
hppa ia64 hurd-i386 amd64 s390)
sparc = $(findstring $(arch),sparc)
nohwclock = $(findstring $(arch),s390)
@@ -27,13 +27,13 @@
ifeq ($(arch),$(sparc))
SUBDIRS += fdisk
endif
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
+ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
ifneq ($(arch),$(nohwclock))
SUBDIRS += hwclock
endif
endif
-ifneq ($(DEB_HOST_GNU_SYSTEM),linux)
+ifneq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
util-linux_Conflicts = getty
endif
@@ -67,7 +67,7 @@
getopt/getopt text-utils/{rev,line,pg}
SBINFILES = disk-utils/mkswap
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
+ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
ifneq ($(arch),$(nohwclock))
INITFILES = debian/hwclock.sh debian/hwclockfirst.sh
SBINFILES += hwclock/hwclock
@@ -80,7 +80,7 @@
UBINFILES2= misc-utils/chkdupexe # debian/fdformat # don't strip these
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
+ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
MOUNTBINFILES = mount/mount mount/umount
MOUNTSBINFILES = mount/swapon mount/losetup
endif
@@ -100,7 +100,7 @@
misc-utils/{chkdupexe.1,setterm.1,whereis.1,ddate.1} \
sys-utils/arch.1 getopt/getopt.1
MAN8FILES = sys-utils/{ipcrm.8,ipcs.8,setsid.8} disk-utils/mkswap.8
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
+ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
ifneq ($(arch),$(nohwclock))
MAN8FILES += hwclock/hwclock.8
endif
@@ -112,19 +112,19 @@
EXAMPLES = fdisk/sfdisk.examples getopt/getopt-{test,parse}.{ba,tc}sh
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
+ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
EXAMPLES += debian/fstab.example2
endif
INFOFILES = sys-utils/ipc.info
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
+ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
DOCFILES = login-utils/{README.getty,README.modems-with-agetty,README.poeigl}
ifneq ($(arch),$(nohwclock))
DOCFILES += debian/README.Debian.hwclock
endif
endif
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
+ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
MOUNTMAN5FILES = mount/fstab.5 mount/nfs.5
MOUNTMAN8FILES = mount/losetup.8 mount/swapoff.8 mount/umount.8 \
mount/mount.8 mount/swapon.8
@@ -139,7 +139,7 @@
SBINFILES := $(SBINFILES) fdisk/{cfdisk,fdisk,sfdisk}
MAN8FILES := $(MAN8FILES) fdisk/{cfdisk.8,fdisk.8,sfdisk.8}
DOCFILES := $(DOCFILES) fdisk/README.{c,}fdisk
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
+ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
USBINFILES:= $(USBINFILES) sys-utils/{tunelp,cytune}
MAN8FILES := $(MAN8FILES) sys-utils/{tunelp.8,cytune.8}
endif
@@ -191,7 +191,7 @@
install -m 644 $(DOCFILES) debian/tmp/usr/share/doc/$(PACKAGE)
endif
install -m 644 $(EXAMPLES) debian/tmp/usr/share/doc/$(PACKAGE)/examples
-ifeq ($(arch), powerpc)
+ifeq ($(arch),$(findstring $(arch),powerpc ppc64))
mv -f debian/tmp/sbin/fdisk debian/tmp/sbin/ddisk
mv -f debian/tmp/usr/share/man/man8/fdisk.8
debian/tmp/usr/share/man/man8/ddisk.8
endif
@@ -199,11 +199,11 @@
(cd debian/tmp/sbin ; mv mkswap mkswap.linux)
(cd debian/tmp/usr/share/man/man8 ; mv mkswap.8 mkswap.linux.8)
endif
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
+ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
(cd debian/tmp/sbin ; mv agetty getty)
(cd debian/tmp/usr/share/man/man8 ; mv agetty.8 getty.8)
ifneq ($(arch), $(nohwclock))
-ifneq ($(arch), powerpc)
+ifneq ($(arch),$(findstring $(arch),powerpc ppc64))
(cd debian/tmp/usr/share/man/man8 && ln -s hwclock.8.gz clock.8.gz)
endif
endif
@@ -220,7 +220,7 @@
install -m 644 debian/mime.$(PACKAGE)
debian/tmp/usr/lib/mime/packages/$(PACKAGE)
install -m 644 debian/copyright
debian/tmp/usr/share/doc/$(PACKAGE)/copyright
install debian/{preinst,postinst,prerm,postrm} debian/tmp/DEBIAN/
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
+ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
ifneq ($(arch),$(nohwclock))
install -m 644 debian/conffiles debian/tmp/DEBIAN/
endif
@@ -277,7 +277,7 @@
dpkg --build debian/tmp-fdisk-udeb ../fdisk-udeb_$(shell
dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(arch).udeb
endif
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
+ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
# Mount
install -d
debian/tmp-mount/{DEBIAN,bin,sbin,usr/share/{man/{man8,man5},doc/mount/examples}}
install -m 4755 -o root -s $(MOUNTBINFILES) debian/tmp-mount/bin/.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
