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

2012-04-26 Thread Miguel A . Colón Vélez 
Hello:

Here is an updated patch based on the original one posted by William A
Van Hevelingen.

Changes:
- add the missing Multi-Arch: same to liborc
- bump debhelper build-dependency to (= 9) to be able to make the dbg
package Multi-Arch: same
- drop dpkg-dev build-dep since debhelper 9 already depends on (=1.16.0)
- drop the changelog entry

This patch applies over the master branch in
git://anonscm.debian.org/pkg-gstreamer/orc.git by using git am.

Hope this helps,
Miguel


0001-Convert-to-Multi-Arch.patch
Description: Binary data

Bug#651008: liborc-0.4-0: Patch to add multiarch support. One line missed

2012-02-12 Thread gregory hainaut 
user multiarch-de...@lists.alioth.debian.org
usertag 651008 + multiarch
thanks

Hello,

I try the patch on my PC and found a small issue. It miss some bits in
the control files.
Multi-Arch: same must be added to package liborc-0.4-0.

If you can check that include files inside liborc-0.4-dev are identical
across architecture/kernel, then you can also declare liborc-0.4-dev as
Multi-Arch: same


Cheers,
Gregory



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

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)