Package: util-linux
Version: 2.19.1-5
Followup-For: Bug #631175
A rediffed patch for 2.19.1-5 is attached.
Andreas
diff -u util-linux-2.19.1/configure.ac util-linux-2.19.1/configure.ac
--- util-linux-2.19.1/configure.ac
+++ util-linux-2.19.1/configure.ac
@@ -60,9 +60,6 @@
esac ;;
esac
-libdirname=`basename "$libdir"`
-AC_SUBST([libdirname])
-
# The original default values of {bin,sbin,lib}dir
usrbin_execdir='${exec_prefix}/bin'
AC_SUBST([usrbin_execdir])
@@ -70,7 +67,7 @@
usrsbin_execdir='${exec_prefix}/sbin'
AC_SUBST([usrsbin_execdir])
-usrlib_execdir='${exec_prefix}/'$libdirname
+usrlib_execdir='${libexecdir}'
AC_SUBST([usrlib_execdir])
diff -u util-linux-2.19.1/debian/libmount-dev.files util-linux-2.19.1/debian/libmount-dev.files
--- util-linux-2.19.1/debian/libmount-dev.files
+++ util-linux-2.19.1/debian/libmount-dev.files
@@ -1,4 +1,4 @@
-usr/lib/libmount.so
-usr/lib/libmount.a
+usr/lib/*/libmount.so
+usr/lib/*/libmount.a
usr/include/libmount
-usr/lib/pkgconfig/mount.pc
+usr/lib/*/pkgconfig/mount.pc
diff -u util-linux-2.19.1/debian/uuid-dev.files util-linux-2.19.1/debian/uuid-dev.files
--- util-linux-2.19.1/debian/uuid-dev.files
+++ util-linux-2.19.1/debian/uuid-dev.files
@@ -1,5 +1,5 @@
-usr/lib/libuuid.so
-usr/lib/libuuid.a
+usr/lib/*/libuuid.so
+usr/lib/*/libuuid.a
usr/include/uuid
usr/share/man/man3/uuid*
-usr/lib/pkgconfig/uuid.pc
+usr/lib/*/pkgconfig/uuid.pc
diff -u util-linux-2.19.1/debian/libuuid1.files util-linux-2.19.1/debian/libuuid1.files
--- util-linux-2.19.1/debian/libuuid1.files
+++ util-linux-2.19.1/debian/libuuid1.files
@@ -1 +1 @@
-lib/libuuid*.so.*
+lib/*/libuuid*.so.*
diff -u util-linux-2.19.1/debian/control util-linux-2.19.1/debian/control
--- util-linux-2.19.1/debian/control
+++ util-linux-2.19.1/debian/control
@@ -1,5 +1,5 @@
Source: util-linux
-Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4), gettext, zlib1g-dev, dpkg-dev (>=1.13.12), libselinux1-dev [linux-any], debhelper (>=5), lsb-release, pkg-config, po-debconf
+Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4), gettext, zlib1g-dev, dpkg-dev (>=1.16.0), libselinux1-dev [linux-any], debhelper (>=5), lsb-release, pkg-config, po-debconf
Section: base
Priority: required
Uploaders: Scott James Remnant <sc...@ubuntu.com>, Adam Conrad <adcon...@0c3.net>
@@ -20,6 +20,7 @@
Replaces: fstrim, schedutils, miscutils, setterm, fdisk, linux32, sparc-utils, e2fsprogs, ${util-linux:Conflicts}
Conflicts: fstrim, schedutils, setterm, fdisk, kbd (<< 1.05-3), console-tools (<< 1:0.2.3-21), linux32, ${util-linux:Conflicts}
Provides: schedutils, linux32
+Multi-Arch: foreign
Description: Miscellaneous system utilities
This package contains a number of important utilities, most of which
are oriented towards maintenance of your system. Some of the more
@@ -45,6 +46,7 @@
Section: admin
Pre-Depends: ${shlibs:Depends}
Suggests: nfs-common (>=1:1.1.0-13)
+Multi-Arch: foreign
Description: Tools for mounting and manipulating filesystems
This package provides the mount(8), umount(8), swapon(8),
swapoff(8), and losetup(8) commands.
@@ -55,6 +57,7 @@
Section: utils
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: bsdmainutils
+Multi-Arch: foreign
Description: Basic utilities from 4.4BSD-Lite
This package contains the bare minimum number of BSD utilities needed
to boot a Debian system: logger, renice, script, scriptreplay, and wall.
@@ -83,6 +86,8 @@
Priority: required
Depends: ${shlibs:Depends}, ${misc:Depends}
Architecture: any
+Multi-Arch: same
+Pre-Depends: multiarch-support
Description: block device id library
The blkid library which allows system programs like fsck and
mount to quickly and easily find block devices by filesystem UUID and
@@ -96,6 +101,8 @@
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends}
Architecture: any
+Multi-Arch: same
+Pre-Depends: multiarch-support
Description: block device id library
The blkid library which allows system programs like fsck and
mount to quickly and easily find block devices by filesystem UUID and
@@ -154,6 +161,8 @@
Recommends: uuid-runtime
Replaces: e2fsprogs (<< 1.34-1)
Architecture: any
+Multi-Arch: same
+Pre-Depends: multiarch-support
Description: Universally Unique ID library
The libuuid library generates and parses 128-bit universally unique
ids (UUIDs). A UUID is an identifier that is unique across both
@@ -170,6 +179,7 @@
Depends: passwd, libuuid1 (>> 1.40.3-1), ${shlibs:Depends}, ${misc:Depends}
Replaces: e2fsprogs (<= 1.40.3-1ubuntu1)
Architecture: any
+Multi-Arch: foreign
Description: runtime components for the Universally Unique ID library
The libuuid library generates and parses 128-bit universally unique
ids (UUIDs). A UUID is an identifier that is unique across both
diff -u util-linux-2.19.1/debian/libblkid1.files util-linux-2.19.1/debian/libblkid1.files
--- util-linux-2.19.1/debian/libblkid1.files
+++ util-linux-2.19.1/debian/libblkid1.files
@@ -1 +1 @@
-lib/libblkid*.so.*
+lib/*/libblkid*.so.*
diff -u util-linux-2.19.1/debian/rules util-linux-2.19.1/debian/rules
--- util-linux-2.19.1/debian/rules
+++ util-linux-2.19.1/debian/rules
@@ -9,6 +9,7 @@
DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) --cache-file=$(DEB_HOST_GNU_TYPE).cache
else
@@ -33,6 +34,7 @@
Upstream := $(shell sed 's/^.*(\(.*\)-.*).*/\1/; q' debian/changelog)
CONFOPTS= --enable-raw --enable-rdev --enable-partx --with-slang
+CONFOPTS += --libdir=/lib/$(DEB_HOST_MULTIARCH) --libexecdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
ifeq ($(DEB_HOST_ARCH_OS),linux)
CONFOPTS += --with-selinux --enable-libmount-mount
endif
@@ -101,9 +103,9 @@
rm -f debian/bsdutils/usr/bin/ul debian/bsdutils/usr/share/man/man1/ul*.1
rm -f debian/bsdutils/usr/bin/cal debian/bsdutils/usr/share/man/man1/cal.1
# remove *.la files and empty directories which do not belong into util-linux
- rm -f debian/util-linux/usr/lib/*.la
+ rm -f debian/util-linux/usr/lib/*/*.la
rm -rf debian/util-linux/usr/include
- rm -rf debian/util-linux/usr/lib/pkgconfig
+ rm -rf debian/util-linux/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
# perl gets to do rename, not us.
mv debian/util-linux/usr/bin/rename debian/util-linux/usr/bin/rename.ul
mv debian/util-linux/usr/share/man/man1/rename.1 debian/util-linux/usr/share/man/man1/rename.ul.1
@@ -130,19 +132,19 @@
fi
ifeq ($(DEB_HOST_ARCH_OS),linux)
# copy mount library and symlink into udeb
- ln debian/libmount1/lib/libmount.so.1.* debian/libmount1-udeb/lib/
- ln debian/libmount1/lib/libmount.so.1 debian/libmount1-udeb/lib/
+ ln debian/libmount1/lib/*/libmount.so.1.* debian/libmount1-udeb/lib/
+ ln debian/libmount1/lib/*/libmount.so.1 debian/libmount1-udeb/lib/
endif
# copy blkid library and symlink into udeb
- ln debian/libblkid1/lib/libblkid.so.1.* debian/libblkid1-udeb/lib/
- ln debian/libblkid1/lib/libblkid.so.1 debian/libblkid1-udeb/lib/
+ ln debian/libblkid1/lib/*/libblkid.so.1.* debian/libblkid1-udeb/lib/
+ ln debian/libblkid1/lib/*/libblkid.so.1 debian/libblkid1-udeb/lib/
ln debian/util-linux/sbin/blkid debian/util-linux-udeb/sbin/
# overwrite copyright
install -m 644 debian/libblkid.copyright debian/libblkid1/usr/share/doc/libblkid1/copyright
install -m 644 debian/libblkid.copyright debian/libblkid-dev/usr/share/doc/libblkid-dev/copyright
# copy uuid library and symlink into udeb
- ln debian/libuuid1/lib/libuuid.so.1.* debian/libuuid1-udeb/lib/
- ln debian/libuuid1/lib/libuuid.so.1 debian/libuuid1-udeb/lib/
+ ln debian/libuuid1/lib/*/libuuid.so.1.* debian/libuuid1-udeb/lib/
+ ln debian/libuuid1/lib/*/libuuid.so.1 debian/libuuid1-udeb/lib/
# overwrite copyright
install -m 644 debian/libuuid.copyright debian/libuuid1/usr/share/doc/libuuid1/copyright
install -m 644 debian/libuuid.copyright debian/uuid-dev/usr/share/doc/uuid-dev/copyright
diff -u util-linux-2.19.1/debian/libblkid-dev.files util-linux-2.19.1/debian/libblkid-dev.files
--- util-linux-2.19.1/debian/libblkid-dev.files
+++ util-linux-2.19.1/debian/libblkid-dev.files
@@ -1,5 +1,5 @@
-usr/lib/libblkid.so
-usr/lib/libblkid.a
+usr/lib/*/libblkid.so
+usr/lib/*/libblkid.a
usr/include/blkid
usr/share/man/man3/libblkid.3
-usr/lib/pkgconfig/blkid.pc
+usr/lib/*/pkgconfig/blkid.pc
diff -u util-linux-2.19.1/debian/libmount1.files util-linux-2.19.1/debian/libmount1.files
--- util-linux-2.19.1/debian/libmount1.files
+++ util-linux-2.19.1/debian/libmount1.files
@@ -1 +1 @@
-lib/libmount*.so.*
+lib/*/libmount*.so.*
diff -u util-linux-2.19.1/debian/changelog util-linux-2.19.1/debian/changelog
--- util-linux-2.19.1/debian/changelog
+++ util-linux-2.19.1/debian/changelog
@@ -1,3 +1,10 @@
+util-linux (2.19.1-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build for multiarch. (Closes: #631175)
+
+ -- Andreas Beckmann <deb...@abeckmann.de> Mon, 05 Sep 2011 13:54:59 +0200
+
util-linux (2.19.1-5) unstable; urgency=low
* Conflict/Replace fstrim to provide smooth upgrades (closes: #627579)
only in patch2:
unchanged:
--- util-linux-2.19.1.orig/shlibs/mount/mount.pc.in
+++ util-linux-2.19.1/shlibs/mount/mount.pc.in
@@ -1,5 +1,6 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
+libexecdir=@libexecdir@
libdir=@usrlib_execdir@
includedir=@includedir@
only in patch2:
unchanged:
--- util-linux-2.19.1.orig/shlibs/blkid/blkid.pc.in
+++ util-linux-2.19.1/shlibs/blkid/blkid.pc.in
@@ -1,5 +1,6 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
+libexecdir=@libexecdir@
libdir=@usrlib_execdir@
includedir=@includedir@
only in patch2:
unchanged:
--- util-linux-2.19.1.orig/shlibs/uuid/uuid.pc.in
+++ util-linux-2.19.1/shlibs/uuid/uuid.pc.in
@@ -1,5 +1,6 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
+libexecdir=@libexecdir@
libdir=@usrlib_execdir@
includedir=@includedir@
