tags 663040 patch
thanks
Attached it the NMU diff for sysfsutils/2.1.0+repack-1.2. I uploaded it
to DELAYED/3.
Bastian
--
Actual war is a very messy business. Very, very messy business.
-- Kirk, "A Taste of Armageddon", stardate 3193.0
diff -Nru sysfsutils-2.1.0+repack/debian/changelog
sysfsutils-2.1.0+repack/debian/changelog
--- sysfsutils-2.1.0+repack/debian/changelog 2012-06-01 07:34:06.000000000
+0000
+++ sysfsutils-2.1.0+repack/debian/changelog 2012-06-16 17:18:47.000000000
+0000
@@ -1,3 +1,14 @@
+sysfsutils (2.1.0+repack-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Support multi-arch: (closes: #663040)
+ - Mark libsysfs2 as same.
+ - Mark sysfsutils as foreign.
+ - Adjust debhelper and cdbs build-dependencies.
+ - Fixup -dev installation.
+
+ -- Bastian Blank <[email protected]> Sat, 16 Jun 2012 17:18:46 +0000
+
sysfsutils (2.1.0+repack-1.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru sysfsutils-2.1.0+repack/debian/control
sysfsutils-2.1.0+repack/debian/control
--- sysfsutils-2.1.0+repack/debian/control 2012-06-01 07:33:48.000000000
+0000
+++ sysfsutils-2.1.0+repack/debian/control 2012-06-16 17:08:45.000000000
+0000
@@ -2,7 +2,7 @@
Section: libs
Priority: extra
Maintainer: Martin Pitt <[email protected]>
-Build-Depends: cdbs, debhelper (>= 7), chrpath, autotools-dev
+Build-Depends: debhelper (>= 8.1.3), cdbs (>= 0.4.93~), chrpath, autotools-dev
Standards-Version: 3.9.3
Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/sysfsutils/debian
@@ -10,6 +10,7 @@
Section: libdevel
Priority: optional
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends}, libsysfs2 (= ${binary:Version})
Description: interface library to sysfs - development files
Sysfs is a virtual file system in Linux kernel 2.5+ that provides a
@@ -23,7 +24,9 @@
Package: libsysfs2
Architecture: any
+Multi-Arch: same
Priority: important
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: interface library to sysfs
Sysfs is a virtual file system in Linux kernel 2.5+ that provides a
@@ -38,6 +41,7 @@
Package: sysfsutils
Section: utils
Architecture: any
+Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: sysfs query tool and boot-time setup
Sysfs is a virtual file system in Linux kernel 2.5+ that provides a
diff -Nru sysfsutils-2.1.0+repack/debian/libsysfs-dev.install
sysfsutils-2.1.0+repack/debian/libsysfs-dev.install
--- sysfsutils-2.1.0+repack/debian/libsysfs-dev.install 2012-05-31
14:44:04.000000000 +0000
+++ sysfsutils-2.1.0+repack/debian/libsysfs-dev.install 2012-06-16
17:07:11.000000000 +0000
@@ -1,4 +1,3 @@
-lib/libsysfs.a usr/lib
usr/include
docs/libsysfs.txt usr/share/doc/libsysfs-dev/
debian/local/libsysfs.pc usr/lib/pkgconfig
diff -Nru sysfsutils-2.1.0+repack/debian/libsysfs-dev.links
sysfsutils-2.1.0+repack/debian/libsysfs-dev.links
--- sysfsutils-2.1.0+repack/debian/libsysfs-dev.links 2012-05-31
14:44:04.000000000 +0000
+++ sysfsutils-2.1.0+repack/debian/libsysfs-dev.links 1970-01-01
00:00:00.000000000 +0000
@@ -1 +0,0 @@
-/lib/libsysfs.so.2 /usr/lib/libsysfs.so
diff -Nru sysfsutils-2.1.0+repack/debian/libsysfs2.install
sysfsutils-2.1.0+repack/debian/libsysfs2.install
--- sysfsutils-2.1.0+repack/debian/libsysfs2.install 2012-05-31
14:44:04.000000000 +0000
+++ sysfsutils-2.1.0+repack/debian/libsysfs2.install 2012-06-16
16:54:09.000000000 +0000
@@ -1,2 +1,2 @@
-lib/libsysfs.so.*
+lib/*/libsysfs.so.*
diff -Nru sysfsutils-2.1.0+repack/debian/rules
sysfsutils-2.1.0+repack/debian/rules
--- sysfsutils-2.1.0+repack/debian/rules 2012-05-31 14:44:04.000000000
+0000
+++ sysfsutils-2.1.0+repack/debian/rules 2012-06-16 17:09:56.000000000
+0000
@@ -3,13 +3,17 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --libdir=/lib
+DEB_CONFIGURE_EXTRA_FLAGS := --libdir=/lib/$(DEB_HOST_MULTIARCH)
DEB_DH_MAKESHLIBS_ARGS_libsysfs2 := --add-udeb="libsysfs2-udeb"
DEB_DH_INSTALLINIT_ARGS := -- start 20 2 3 4 5 .
+install/libsysfs-dev::
+ mkdir -p debian/$(cdbs_curpkg)/usr/lib/$(DEB_HOST_MULTIARCH)
+ ln -s /lib/$(DEB_HOST_MULTIARCH)/libsysfs.so.2
debian/$(cdbs_curpkg)/usr/lib/$(DEB_HOST_MULTIARCH)/libsysfs.so
+ cp debian/tmp/lib/*/libsysfs.a
debian/$(cdbs_curpkg)/usr/lib/$(DEB_HOST_MULTIARCH)
+
install/libsysfs2-udeb::
- cp -L debian/tmp/lib/libsysfs.so.? debian/$(cdbs_curpkg)/lib
- chmod 644 $(DEB_DESTDIR)/lib/*.so
+ cp -L debian/tmp/lib/*/libsysfs.so.2 debian/$(cdbs_curpkg)/lib
binary-fixup/sysfsutils::
chrpath -d debian/$(cdbs_curpkg)/usr/bin/*
