[SCM] ogmrip/master: Fix multi-arch build.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Nov 19 02:18:10 UTC 2012


The following commit has been merged in the master branch:
commit 4e77987f147f8b33fd1a9e9eca12b23b1ed31db1
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Nov 19 02:16:38 2012 +0000

    Fix multi-arch build.

diff --git a/debian/control b/debian/control
index 9c3972b..1159f71 100644
--- a/debian/control
+++ b/debian/control
@@ -89,8 +89,11 @@ Description: Application for ripping and encoding DVD - Documentation files
  This package contains the documentation files.
 
 Package: libogmrip1
-Architecture: any
 Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -113,6 +116,7 @@ Description: Application for ripping and encoding DVD - libraries files
 Package: libogmrip-dev
 Architecture: any
 Section: libdevel
+Multi-Arch: same
 Depends:
  intltool,
  libdvdread-dev,
diff --git a/debian/libogmrip-dev.install b/debian/libogmrip-dev.install
index 82c0631..7272386 100644
--- a/debian/libogmrip-dev.install
+++ b/debian/libogmrip-dev.install
@@ -1,4 +1,4 @@
 usr/include
-usr/lib/*.a
-usr/lib/*.so
-usr/lib/pkgconfig
+usr/lib/*/*.a
+usr/lib/*/*.so
+usr/lib/*/pkgconfig
diff --git a/debian/libogmrip1.install b/debian/libogmrip1.install
index b2e10f4..3de3b10 100644
--- a/debian/libogmrip1.install
+++ b/debian/libogmrip1.install
@@ -1 +1 @@
-usr/lib/*.so.1*
+usr/lib/*/*.so.*

-- 
ogmrip packaging



More information about the pkg-multimedia-commits mailing list