Uh sorry, attached wrong patch. This one should apply better to hal sources..

Riku
diff -urN old/hal-0.5.14//debian/control hal-0.5.14//debian/control
--- old/hal-0.5.14//debian/control	2011-04-19 00:41:12.000000000 +0300
+++ hal-0.5.14//debian/control	2011-08-22 12:11:41.872285001 +0300
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Utopia Maintenance Team <pkg-utopia-maintain...@lists.alioth.debian.org>
 Uploaders: Sjoerd Simons <sjo...@debian.org>, Sebastian Dröge <sl...@debian.org>, Michael Biebl <bi...@debian.org>
-Build-Depends: debhelper (>= 8),
- cdbs,
+Build-Depends: debhelper (>= 8.1.3),
+ cdbs (>= 0.4.93),
  autotools-dev,
  libdbus-glib-1-dev (>= 0.61),
  libglib2.0-dev,
@@ -41,6 +41,7 @@
  hal-info (>= 20070402),
  mount (>= 2.13) [linux-any],
  freebsd-utils [kfreebsd-any]
+Multi-Arch: foreign
 Recommends: eject,
  pm-utils [linux-any],
  consolekit (>= 0.3)
@@ -73,6 +74,8 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Hardware Abstraction Layer - shared library
  HAL provides an abstract view on hardware.
  .
@@ -88,6 +91,8 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Hardware Abstraction Layer - shared library for storage devices
  HAL provides an abstract view on hardware.
  .
@@ -103,6 +108,7 @@
 Section: libdevel
 Architecture: any
 Depends: libhal1 (= ${binary:Version}), ${misc:Depends}, libdbus-1-dev (>= 0.60)
+Multi-Arch: same
 Suggests: hal-doc
 Description: Hardware Abstraction Layer - development files
  HAL provides an abstract view on hardware.
@@ -117,6 +123,7 @@
 
 Package: libhal-storage-dev
 Section: libdevel
+Multi-Arch: same
 Architecture: any
 Depends: libhal-storage1 (= ${binary:Version}), ${misc:Depends}, libdbus-1-dev (>= 0.60), libhal-dev
 Suggests: hal-doc
diff -urN old/hal-0.5.14//debian/libhal1.install hal-0.5.14//debian/libhal1.install
--- old/hal-0.5.14//debian/libhal1.install	2008-09-03 15:22:05.000000000 +0300
+++ hal-0.5.14//debian/libhal1.install	2011-08-22 12:06:52.262285001 +0300
@@ -1 +1 @@
-debian/tmp/usr/lib/libhal.so.*
+debian/tmp/usr/lib/*/libhal.so.*
diff -urN old/hal-0.5.14//debian/libhal-dev.install hal-0.5.14//debian/libhal-dev.install
--- old/hal-0.5.14//debian/libhal-dev.install	2008-09-03 15:22:05.000000000 +0300
+++ hal-0.5.14//debian/libhal-dev.install	2011-08-22 12:59:29.482285001 +0300
@@ -1,4 +1,4 @@
 debian/tmp/usr/include/hal/libhal.h
-debian/tmp/usr/lib/pkgconfig/hal.pc
-debian/tmp/usr/lib/libhal.so
-debian/tmp/usr/lib/libhal.a
+debian/tmp/usr/lib/*/pkgconfig/hal.pc
+debian/tmp/usr/lib/*/libhal.so
+debian/tmp/usr/lib/*/libhal.a
diff -urN old/hal-0.5.14//debian/libhal-storage1.install hal-0.5.14//debian/libhal-storage1.install
--- old/hal-0.5.14//debian/libhal-storage1.install	2008-09-03 15:22:05.000000000 +0300
+++ hal-0.5.14//debian/libhal-storage1.install	2011-08-22 12:59:30.962285001 +0300
@@ -1 +1 @@
-debian/tmp/usr/lib/libhal-storage.so.*
+debian/tmp/usr/lib/*/libhal-storage.so.*
diff -urN old/hal-0.5.14//debian/libhal-storage-dev.install hal-0.5.14//debian/libhal-storage-dev.install
--- old/hal-0.5.14//debian/libhal-storage-dev.install	2008-09-03 15:22:05.000000000 +0300
+++ hal-0.5.14//debian/libhal-storage-dev.install	2011-08-22 12:59:53.622285001 +0300
@@ -1,4 +1,4 @@
 debian/tmp/usr/include/hal/libhal-storage.h
-debian/tmp/usr/lib/pkgconfig/hal-storage.pc
-debian/tmp/usr/lib/libhal-storage.so
-debian/tmp/usr/lib/libhal-storage.a
+debian/tmp/usr/lib/*/pkgconfig/hal-storage.pc
+debian/tmp/usr/lib/*/libhal-storage.so
+debian/tmp/usr/lib/*/libhal-storage.a
diff -urN old/hal-0.5.14//debian/rules hal-0.5.14//debian/rules
--- old/hal-0.5.14//debian/rules	2011-04-10 08:08:50.000000000 +0300
+++ hal-0.5.14//debian/rules	2011-08-22 12:23:01.002285001 +0300
@@ -21,7 +21,9 @@
                              --enable-docbook-docs \
                              --without-keymaps \
                              --docdir=/usr/share/doc/hal-doc \
-                             --with-udev-prefix=/lib
+                             --with-udev-prefix=/lib \
+                             --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+                             --libexecdir=\$${prefix}/lib/hal
 
 DEB_DH_INSTALLINIT_ARGS := -- start 24 2 3 4 5 . stop 16 1 .
 

Reply via email to