Bug#638839: multiarchize hal: wrong patch..

2011-08-25 Thread Riku Voipio 
On Tue, Aug 23, 2011 at 06:47:46PM +0200, Michael Biebl wrote:
 thanks for the patch. I have to acknowledge that I no longer actively use hal
 and try to get rid of it for wheezy [1] (for Linux at least).
 So I'm wondering, if there is a benefit of converting hal to multiarch.

Good question. I picked up hal from the ia32libs package, as one of the goals of
multiarch is to get rid of ia32libs. If hal is vanishing anyways, then this 
patch can be ignored.

 Have you tested hal that it still works correctly?

nope :) Only that libraries are now installed to the right place and that 
dynamic
linker still picks them up as expected.

Riku





-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#638839: multiarchize hal: wrong patch..

2011-08-23 Thread Michael Biebl 
Hi Riku,

Am 22.08.2011 13:25, schrieb Riku Voipio:
 Uh sorry, attached wrong patch. This one should apply better to hal sources..

thanks for the patch. I have to acknowledge that I no longer actively use hal
and try to get rid of it for wheezy [1] (for Linux at least).
So I'm wondering, if there is a benefit of converting hal to multiarch.
Have you tested hal that it still works correctly?

Michael

[1] http://wiki.debian.org/HALRemoval

-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?



signature.asc
Description: OpenPGP digital signature

Bug#638839: multiarchize hal: wrong patch..

2011-08-22 Thread Riku Voipio 
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.0 +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.0 +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.0 +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.0 +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.0 +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.0 +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 .