Bug#651247: liborc-0.4-0: Patch to provide multiarch support

2011-12-06 Thread William A Van Hevelingen
Package: liborc-0.4-0
Version: 1:0.4.14-1ubuntu1
Severity: normal


Hi,

The attached patch makes liborc-0.4-0 compatible with multiarch, as described at
http://wiki.debian.org/Multiarch/Implementation.

Thanks
--
William Van Hevelingen
blkp...@cat.pdx.edu
github.com/~blkperl


-- System Information:
Debian Release: wheezy/sid
  APT prefers oneiric-updates
  APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 
'oneiric'), (100, 'oneiric-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-12-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages liborc-0.4-0 depends on:
ii  libc6 2.13-20ubuntu5 Embedded GNU C Library: Shared lib

liborc-0.4-0 recommends no packages.

liborc-0.4-0 suggests no packages.

-- no debconf information
diff -Nru orc-0.4.16/debian/changelog orc-0.4.16/debian/changelog
--- orc-0.4.16/debian/changelog	2011-10-10 08:54:55.0 +
+++ orc-0.4.16/debian/changelog	2011-12-04 20:29:47.0 +
@@ -1,3 +1,9 @@
+orc (1:0.4.16-1ubuntu1) oneiric; urgency=low
+
+  * Build for multiarch 
+
+ -- Build User buil...@ip-10-176-166-169.us-west-1.compute.internal  Sun, 04 Dec 2011 20:29:20 +
+
 orc (1:0.4.16-1) unstable; urgency=low
 
   * New upstream bugfix release:
diff -Nru orc-0.4.16/debian/compat orc-0.4.16/debian/compat
--- orc-0.4.16/debian/compat	2011-09-26 09:17:41.0 +
+++ orc-0.4.16/debian/compat	2011-12-04 20:35:23.0 +
@@ -1 +1 @@
-7
+9
diff -Nru orc-0.4.16/debian/control orc-0.4.16/debian/control
--- orc-0.4.16/debian/control	2011-10-10 08:46:58.0 +
+++ orc-0.4.16/debian/control	2011-12-04 20:35:08.0 +
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Maintainers of GStreamer packages pkg-gstreamer-maintain...@lists.alioth.debian.org
 Uploaders: Sebastian Dröge sl...@debian.org, Sjoerd Simons sjo...@debian.org
-Build-Depends: cdbs,
-   debhelper (= 7),
+Build-Depends: cdbs (= 0.4.93~),
+   debhelper (= 8.1.3~),
dpkg-dev (= 1.14.13),
autotools-dev,
gtk-doc-tools
@@ -14,6 +14,7 @@
 Package: liborc-0.4-0
 Section: libs
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}  
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Description: Library of Optimized Inner Loops Runtime Compiler
diff -Nru orc-0.4.16/debian/liborc-0.4-0.install orc-0.4.16/debian/liborc-0.4-0.install
--- orc-0.4.16/debian/liborc-0.4-0.install	2011-09-26 09:17:41.0 +
+++ orc-0.4.16/debian/liborc-0.4-0.install	2011-12-04 20:39:10.0 +
@@ -1 +1 @@
-debian/tmp/usr/lib/liborc*-0.4.so.*
+debian/tmp/usr/lib/*/liborc*-0.4.so.*
diff -Nru orc-0.4.16/debian/liborc-0.4-dev.install orc-0.4.16/debian/liborc-0.4-dev.install
--- orc-0.4.16/debian/liborc-0.4-dev.install	2011-09-26 09:17:41.0 +
+++ orc-0.4.16/debian/liborc-0.4-dev.install	2011-12-04 20:38:43.0 +
@@ -1,6 +1,6 @@
-debian/tmp/usr/lib/liborc*-0.4.so
-debian/tmp/usr/lib/liborc*-0.4.a
+debian/tmp/usr/lib/*/liborc*-0.4.so
+debian/tmp/usr/lib/*/liborc*-0.4.a
 debian/tmp/usr/include/orc-0.4
-debian/tmp/usr/lib/pkgconfig/orc-0.4.pc
+debian/tmp/usr/lib/*/pkgconfig/orc-0.4.pc
 debian/tmp/usr/bin/orcc
 debian/tmp/usr/bin/orc-bugreport
diff -Nru orc-0.4.16/debian/rules orc-0.4.16/debian/rules
--- orc-0.4.16/debian/rules	2011-10-10 08:53:57.0 +
+++ orc-0.4.16/debian/rules	2011-12-04 20:36:30.0 +
@@ -5,8 +5,7 @@
 include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_DH_STRIP_ARGS := --dbg-package=liborc-0.4-0-dbg
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-static
-
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-static --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 APIVER := 0.4
 SHLIBVER := 1:0.4.16
 liborc := $(shell sed -nr 's/^Package:[[:space:]]*(liborc-$(APIVER)-[0-9]+)[[:space:]]*$$/\1/p' debian/control)


Bug#651249: libcaca0: Patch to support multiarch

2011-12-06 Thread William A Van Hevelingen
Package: libcaca0
Version: 0.99.beta17-2ubuntu1
Severity: normal


Hi,

The attached patch makes libcaca0 compatible with multiarch, as described at
http://wiki.debian.org/Multiarch/Implementation.

Thanks
--
William Van Hevelingen
blkp...@cat.pdx.edu
github.com/~blkperl

-- System Information:
Debian Release: wheezy/sid
  APT prefers oneiric-updates
  APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 
'oneiric'), (100, 'oneiric-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-12-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages libcaca0 depends on:
ii  libc62.13-20ubuntu5  Embedded GNU C Library: Shared lib
ii  libncursesw5 5.9-1ubuntu5shared libraries for terminal hand
ii  libslang22.2.4-2ubuntu1  S-Lang programming library - runti
ii  libstdc++6   4.6.1-9ubuntu3  GNU Standard C++ Library v3
ii  zlib1g   1:1.2.3.4.dfsg-3ubuntu3 compression library - runtime

libcaca0 recommends no packages.

libcaca0 suggests no packages.

-- no debconf information
diff -Nru libcaca-0.99.beta17/debian/changelog libcaca-0.99.beta17/debian/changelog
--- libcaca-0.99.beta17/debian/changelog	2011-09-22 15:10:59.0 +
+++ libcaca-0.99.beta17/debian/changelog	2011-12-04 21:56:05.0 +
@@ -1,3 +1,10 @@
+libcaca (0.99.beta17-2.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Adding support for multiarch 
+
+ -- Build User buil...@ip-10-176-166-169.us-west-1.compute.internal  Sun, 04 Dec 2011 21:55:54 +
+
 libcaca (0.99.beta17-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru libcaca-0.99.beta17/debian/control libcaca-0.99.beta17/debian/control
--- libcaca-0.99.beta17/debian/control	2011-09-22 15:10:34.0 +
+++ libcaca-0.99.beta17/debian/control	2011-12-04 21:58:46.0 +
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Sam Hocevar s...@debian.org
-Build-Depends: debhelper (= 8.0), pkg-config, libncursesw5-dev, libslang2-dev, libx11-dev, libimlib2-dev, freeglut3-dev, texlive-fonts-recommended, doxygen-latex, ruby1.8-dev
+Build-Depends: debhelper (= 8.1.3~), pkg-config, libncursesw5-dev, libslang2-dev, libx11-dev, libimlib2-dev, freeglut3-dev, texlive-fonts-recommended, doxygen-latex, ruby1.8-dev
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/sam-hocevar/pkg-misc/unstable/libcaca
 Vcs-Browser: http://svn.debian.org/wsvn/sam-hocevar/pkg-misc/unstable/libcaca/
@@ -11,6 +11,7 @@
 Package: libcaca-dev
 Section: libdevel
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: libcaca0 (= ${binary:Version}), ${misc:Depends}, libncurses5-dev, libslang2-dev
 Description: development files for libcaca
  libcaca is the Colour AsCii Art library. It provides high level functions
diff -Nru libcaca-0.99.beta17/debian/libcaca0.install libcaca-0.99.beta17/debian/libcaca0.install
--- libcaca-0.99.beta17/debian/libcaca0.install	2011-06-19 17:03:03.0 +
+++ libcaca-0.99.beta17/debian/libcaca0.install	2011-12-04 22:03:53.0 +
@@ -1,2 +1,2 @@
-usr/lib/lib*.so.*
-usr/lib/caca/*.so*
+usr/lib/*/lib*.so.*
+usr/lib/*/caca/*.so*
diff -Nru libcaca-0.99.beta17/debian/libcaca-dev.install libcaca-0.99.beta17/debian/libcaca-dev.install
--- libcaca-0.99.beta17/debian/libcaca-dev.install	2008-10-05 15:57:13.0 +
+++ libcaca-0.99.beta17/debian/libcaca-dev.install	2011-12-04 22:04:09.0 +
@@ -1,8 +1,8 @@
 usr/include/*.h
 usr/bin/caca-config
-usr/lib/lib*.so
-usr/lib/lib*.a
-usr/lib/pkgconfig/*.pc
+usr/lib/*/lib*.so
+usr/lib/*/lib*.a
+usr/lib/*/pkgconfig/*.pc
 usr/share/man/man3/*.3caca
 usr/share/man/man1/caca-config.1
 usr/share/doc/libcaca-dev
diff -Nru libcaca-0.99.beta17/debian/rules libcaca-0.99.beta17/debian/rules
--- libcaca-0.99.beta17/debian/rules	2011-06-19 17:10:07.0 +
+++ libcaca-0.99.beta17/debian/rules	2011-12-04 22:02:54.0 +
@@ -3,6 +3,7 @@
 #export DH_VERBOSE=1
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # FOR AUTOCONF 2.52 AND NEWER ONLY
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -15,6 +16,7 @@
 confflags += --enable-ncurses --enable-slang --enable-x11 --enable-gl \
 	 --enable-imlib2 --enable-plugins --enable-cxx --enable-doc
 confflags += --disable-csharp --disable-java --disable-ruby
+confflags += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 configure: configure-stamp
 configure-stamp:
@@ -85,7 +87,7 @@
 	dh_makeshlibs -p libcaca0 -V 'libcaca0 (= 0.99.beta17-1)'
 	dh_installdeb
 #	dh_perl
-	dh_shlibdeps -L libcaca0 -l debian/libcaca0/usr/lib -X /usr/lib/caca/
+	dh_shlibdeps -L libcaca0 -l debian/libcaca0/usr/lib/$(DEB_HOST_MULTIARCH)/ -X /usr/lib/$(DEB_HOST_MULTIARCH)/caca

Bug#651008: liborc-0.4-0: Patch to add multiarch support

2011-12-04 Thread William A Van Hevelingen
Package: liborc-0.4-0
Version: 1:0.4.11-2
Severity: normal


Hi,

The attached patch makes liborc-0.4-0 compatible with multiarch, as described at
http://wiki.debian.org/Multiarch/Implementation.

Thanks
--
William Van Hevelingen
blkp...@cat.pdx.edu
github.com/~blkperl

-- System Information:
Debian Release: squeeze/sid
  APT prefers natty-updates
  APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 'natty'), 
(100, 'natty-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.38-11-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages liborc-0.4-0 depends on:
ii  libc6 2.13-0ubuntu13 Embedded GNU C Library: Shared lib

liborc-0.4-0 recommends no packages.

liborc-0.4-0 suggests no packages.

-- no debconf information
diff -Nru orc-0.4.16/debian/changelog orc-0.4.16/debian/changelog
--- orc-0.4.16/debian/changelog	2011-10-10 08:54:55.0 +
+++ orc-0.4.16/debian/changelog	2011-12-04 20:29:47.0 +
@@ -1,3 +1,9 @@
+orc (1:0.4.16-1ubuntu1) oneiric; urgency=low
+
+  * Build for multiarch 
+
+ -- Build User buil...@ip-10-176-166-169.us-west-1.compute.internal  Sun, 04 Dec 2011 20:29:20 +
+
 orc (1:0.4.16-1) unstable; urgency=low
 
   * New upstream bugfix release:
diff -Nru orc-0.4.16/debian/compat orc-0.4.16/debian/compat
--- orc-0.4.16/debian/compat	2011-09-26 09:17:41.0 +
+++ orc-0.4.16/debian/compat	2011-12-04 20:35:23.0 +
@@ -1 +1 @@
-7
+9
diff -Nru orc-0.4.16/debian/control orc-0.4.16/debian/control
--- orc-0.4.16/debian/control	2011-10-10 08:46:58.0 +
+++ orc-0.4.16/debian/control	2011-12-04 20:35:08.0 +
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Maintainers of GStreamer packages pkg-gstreamer-maintain...@lists.alioth.debian.org
 Uploaders: Sebastian Dröge sl...@debian.org, Sjoerd Simons sjo...@debian.org
-Build-Depends: cdbs,
-   debhelper (= 7),
+Build-Depends: cdbs (= 0.4.93~),
+   debhelper (= 8.1.3~),
dpkg-dev (= 1.14.13),
autotools-dev,
gtk-doc-tools
@@ -14,6 +14,7 @@
 Package: liborc-0.4-0
 Section: libs
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}  
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Description: Library of Optimized Inner Loops Runtime Compiler
diff -Nru orc-0.4.16/debian/liborc-0.4-0.install orc-0.4.16/debian/liborc-0.4-0.install
--- orc-0.4.16/debian/liborc-0.4-0.install	2011-09-26 09:17:41.0 +
+++ orc-0.4.16/debian/liborc-0.4-0.install	2011-12-04 20:39:10.0 +
@@ -1 +1 @@
-debian/tmp/usr/lib/liborc*-0.4.so.*
+debian/tmp/usr/lib/*/liborc*-0.4.so.*
diff -Nru orc-0.4.16/debian/liborc-0.4-dev.install orc-0.4.16/debian/liborc-0.4-dev.install
--- orc-0.4.16/debian/liborc-0.4-dev.install	2011-09-26 09:17:41.0 +
+++ orc-0.4.16/debian/liborc-0.4-dev.install	2011-12-04 20:38:43.0 +
@@ -1,6 +1,6 @@
-debian/tmp/usr/lib/liborc*-0.4.so
-debian/tmp/usr/lib/liborc*-0.4.a
+debian/tmp/usr/lib/*/liborc*-0.4.so
+debian/tmp/usr/lib/*/liborc*-0.4.a
 debian/tmp/usr/include/orc-0.4
-debian/tmp/usr/lib/pkgconfig/orc-0.4.pc
+debian/tmp/usr/lib/*/pkgconfig/orc-0.4.pc
 debian/tmp/usr/bin/orcc
 debian/tmp/usr/bin/orc-bugreport
diff -Nru orc-0.4.16/debian/rules orc-0.4.16/debian/rules
--- orc-0.4.16/debian/rules	2011-10-10 08:53:57.0 +
+++ orc-0.4.16/debian/rules	2011-12-04 20:36:30.0 +
@@ -5,8 +5,7 @@
 include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_DH_STRIP_ARGS := --dbg-package=liborc-0.4-0-dbg
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-static
-
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-static --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 APIVER := 0.4
 SHLIBVER := 1:0.4.16
 liborc := $(shell sed -nr 's/^Package:[[:space:]]*(liborc-$(APIVER)-[0-9]+)[[:space:]]*$$/\1/p' debian/control)


Bug#651009: libcaca0: Patch for multiarch support

2011-12-04 Thread William A Van Hevelingen
Package: libcaca0
Version: 0.99.beta17-1
Severity: normal

Hi,

The attached patch makes libcaca0 compatible with multiarch, as described at 
http://wiki.debian.org/Multiarch/Implementation.

Thanks
--
William Van Hevelingen
blkp...@cat.pdx.edu
github.com/~blkperl

-- System Information:
Debian Release: squeeze/sid
  APT prefers natty-updates
  APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 'natty'), 
(100, 'natty-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.38-11-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages libcaca0 depends on:
ii  libc62.13-0ubuntu13  Embedded GNU C Library: Shared lib
ii  libgcc1  1:4.5.2-8ubuntu4GCC support library
ii  libncursesw5 5.7+20101128-1  shared libraries for terminal hand
ii  libslang22.2.2-4ubuntu2  The S-Lang programming library - r
ii  libstdc++6   4.5.2-8ubuntu4  The GNU Standard C++ Library v3
ii  zlib1g   1:1.2.3.4.dfsg-3ubuntu3 compression library - runtime

libcaca0 recommends no packages.

libcaca0 suggests no packages.

-- no debconf information
diff -Nru libcaca-0.99.beta17/debian/changelog libcaca-0.99.beta17/debian/changelog
--- libcaca-0.99.beta17/debian/changelog	2011-09-22 15:10:59.0 +
+++ libcaca-0.99.beta17/debian/changelog	2011-12-04 21:56:05.0 +
@@ -1,3 +1,10 @@
+libcaca (0.99.beta17-2.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Adding support for multiarch 
+
+ -- Build User buil...@ip-10-176-166-169.us-west-1.compute.internal  Sun, 04 Dec 2011 21:55:54 +
+
 libcaca (0.99.beta17-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru libcaca-0.99.beta17/debian/control libcaca-0.99.beta17/debian/control
--- libcaca-0.99.beta17/debian/control	2011-09-22 15:10:34.0 +
+++ libcaca-0.99.beta17/debian/control	2011-12-04 21:58:46.0 +
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Sam Hocevar s...@debian.org
-Build-Depends: debhelper (= 8.0), pkg-config, libncursesw5-dev, libslang2-dev, libx11-dev, libimlib2-dev, freeglut3-dev, texlive-fonts-recommended, doxygen-latex, ruby1.8-dev
+Build-Depends: debhelper (= 8.1.3~), pkg-config, libncursesw5-dev, libslang2-dev, libx11-dev, libimlib2-dev, freeglut3-dev, texlive-fonts-recommended, doxygen-latex, ruby1.8-dev
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/sam-hocevar/pkg-misc/unstable/libcaca
 Vcs-Browser: http://svn.debian.org/wsvn/sam-hocevar/pkg-misc/unstable/libcaca/
@@ -11,6 +11,7 @@
 Package: libcaca-dev
 Section: libdevel
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: libcaca0 (= ${binary:Version}), ${misc:Depends}, libncurses5-dev, libslang2-dev
 Description: development files for libcaca
  libcaca is the Colour AsCii Art library. It provides high level functions
diff -Nru libcaca-0.99.beta17/debian/libcaca0.install libcaca-0.99.beta17/debian/libcaca0.install
--- libcaca-0.99.beta17/debian/libcaca0.install	2011-06-19 17:03:03.0 +
+++ libcaca-0.99.beta17/debian/libcaca0.install	2011-12-04 22:03:53.0 +
@@ -1,2 +1,2 @@
-usr/lib/lib*.so.*
-usr/lib/caca/*.so*
+usr/lib/*/lib*.so.*
+usr/lib/*/caca/*.so*
diff -Nru libcaca-0.99.beta17/debian/libcaca-dev.install libcaca-0.99.beta17/debian/libcaca-dev.install
--- libcaca-0.99.beta17/debian/libcaca-dev.install	2008-10-05 15:57:13.0 +
+++ libcaca-0.99.beta17/debian/libcaca-dev.install	2011-12-04 22:04:09.0 +
@@ -1,8 +1,8 @@
 usr/include/*.h
 usr/bin/caca-config
-usr/lib/lib*.so
-usr/lib/lib*.a
-usr/lib/pkgconfig/*.pc
+usr/lib/*/lib*.so
+usr/lib/*/lib*.a
+usr/lib/*/pkgconfig/*.pc
 usr/share/man/man3/*.3caca
 usr/share/man/man1/caca-config.1
 usr/share/doc/libcaca-dev
diff -Nru libcaca-0.99.beta17/debian/rules libcaca-0.99.beta17/debian/rules
--- libcaca-0.99.beta17/debian/rules	2011-06-19 17:10:07.0 +
+++ libcaca-0.99.beta17/debian/rules	2011-12-04 22:02:54.0 +
@@ -3,6 +3,7 @@
 #export DH_VERBOSE=1
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # FOR AUTOCONF 2.52 AND NEWER ONLY
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -15,6 +16,7 @@
 confflags += --enable-ncurses --enable-slang --enable-x11 --enable-gl \
 	 --enable-imlib2 --enable-plugins --enable-cxx --enable-doc
 confflags += --disable-csharp --disable-java --disable-ruby
+confflags += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 configure: configure-stamp
 configure-stamp:
@@ -85,7 +87,7 @@
 	dh_makeshlibs -p libcaca0 -V 'libcaca0 (= 0.99.beta17-1)'
 	dh_installdeb
 #	dh_perl
-	dh_shlibdeps -L libcaca0 -l debian/libcaca0/usr/lib -X /usr/lib/caca/
+	dh_shlibdeps -L libcaca0 -l debian/libcaca0/usr/lib

Bug#651010: libavc1394-0: Patch for multiarch support

2011-12-04 Thread William A Van Hevelingen
Package: libavc1394-0
Version: 0.5.3-1build4
Severity: normal

Hi,

The attached patch makes libavc1394-0 compatible with multiarch, as described at
http://wiki.debian.org/Multiarch/Implementation.

Thanks
--
William Van Hevelingen
blkp...@cat.pdx.edu
github.com/~blkperl

-- System Information:
Debian Release: squeeze/sid
  APT prefers natty-updates
  APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 'natty'), 
(100, 'natty-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.38-11-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages libavc1394-0 depends on:
ii  libc6 2.13-0ubuntu13 Embedded GNU C Library: Shared lib
ii  libraw1394-11 2.0.6-1library for direct access to IEEE 

libavc1394-0 recommends no packages.

libavc1394-0 suggests no packages.

-- no debconf information
diff -u libavc1394-0.5.3/debian/changelog libavc1394-0.5.3/debian/changelog
--- libavc1394-0.5.3/debian/changelog
+++ libavc1394-0.5.3/debian/changelog
@@ -1,3 +1,10 @@
+libavc1394 (0.5.3-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Adding support for multiarch 
+
+ -- Build User buil...@ip-10-176-166-169.us-west-1.compute.internal  Sun, 04 Dec 2011 21:21:50 +
+
 libavc1394 (0.5.3-1) unstable; urgency=low
 
   * New upstream version.
diff -u libavc1394-0.5.3/debian/control libavc1394-0.5.3/debian/control
--- libavc1394-0.5.3/debian/control
+++ libavc1394-0.5.3/debian/control
@@ -2,12 +2,13 @@
 Section: libs
 Priority: extra
 Maintainer: Daniel Kobras kob...@debian.org
-Build-Depends: debhelper ( 4.0.0), libraw1394-dev (= 0.10.1), pkg-config, autotools-dev, dpatch
+Build-Depends: debhelper (= 8.1.3~), libraw1394-dev (= 0.10.1), pkg-config, autotools-dev, dpatch
 Standards-Version: 3.7.2
 
 Package: libavc1394-dev
 Section: libdevel
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: libavc1394-0 (= ${Source-Version}), libc6-dev
 Suggests: pkg-config
 Conflicts: libavc1394-0 (= 0.3.1-3)
diff -u libavc1394-0.5.3/debian/libavc1394-0.files libavc1394-0.5.3/debian/libavc1394-0.files
--- libavc1394-0.5.3/debian/libavc1394-0.files
+++ libavc1394-0.5.3/debian/libavc1394-0.files
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff -u libavc1394-0.5.3/debian/rules libavc1394-0.5.3/debian/rules
--- libavc1394-0.5.3/debian/rules
+++ libavc1394-0.5.3/debian/rules
@@ -7,6 +7,7 @@
 
 # This is the debhelper compatability version to use.
 export DH_COMPAT=4
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 include /usr/share/dpatch/dpatch.make
 
@@ -32,7 +33,7 @@
 	ln -sf /usr/share/misc/config.sub .
 	ln -sf /usr/share/misc/config.guess .
 
-	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 	touch configure-stamp