[SCM] mjpegtools/master: install libraries from multi-arch'ed directories

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8101aec11ad75f0107453bd9e181597b09217b15
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Sep 2 15:37:56 2012 +0200

    install libraries from multi-arch'ed directories

diff --git a/debian/control b/debian/control
index 6f1d393..51fc9fd 100644
--- a/debian/control
+++ b/debian/control
@@ -93,6 +93,8 @@ Description: MJPEG capture/editing/replay and MPEG encoding toolset (development
 Package: liblavfile-2.0-0
 Section: libs
 Architecture: any
+Pre-Depends:
+ multiarch-support
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -106,6 +108,8 @@ Description: MJPEG capture/editing/replay and MPEG encoding toolset (library)
 Package: liblavjpeg-2.0-0
 Section: libs
 Architecture: any
+Pre-Depends:
+ multiarch-support
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -119,6 +123,8 @@ Description: MJPEG capture/editing/replay and MPEG encoding toolset (library)
 Package: liblavplay-2.0-0
 Section: libs
 Architecture: any
+Pre-Depends:
+ multiarch-support
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -132,6 +138,8 @@ Description: MJPEG capture/editing/replay and MPEG encoding toolset (library)
 Package: libmjpegutils-2.0-0
 Section: libs
 Architecture: any
+Pre-Depends:
+ multiarch-support
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -145,6 +153,8 @@ Description: MJPEG capture/editing/replay and MPEG encoding toolset (library)
 Package: libmpeg2encpp-2.0-0
 Section: libs
 Architecture: any
+Pre-Depends:
+ multiarch-support
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -158,6 +168,8 @@ Description: MJPEG capture/editing/replay and MPEG encoding toolset (library)
 Package: libmplex2-2.0-0
 Section: libs
 Architecture: any
+Pre-Depends:
+ multiarch-support
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
diff --git a/debian/liblavfile-2.0-0.install b/debian/liblavfile-2.0-0.install
index cbf2564..2e2ccb0 100644
--- a/debian/liblavfile-2.0-0.install
+++ b/debian/liblavfile-2.0-0.install
@@ -1 +1 @@
-/usr/lib/liblavfile*.so.*
+/usr/lib/*/liblavfile*.so.*
diff --git a/debian/liblavjpeg-2.0-0.install b/debian/liblavjpeg-2.0-0.install
index d5b6818..140a0ca 100644
--- a/debian/liblavjpeg-2.0-0.install
+++ b/debian/liblavjpeg-2.0-0.install
@@ -1 +1 @@
-/usr/lib/liblavjpeg*.so.*
+/usr/lib/*/liblavjpeg*.so.*
diff --git a/debian/liblavplay-2.0-0.install b/debian/liblavplay-2.0-0.install
index 139ab63..22ca856 100644
--- a/debian/liblavplay-2.0-0.install
+++ b/debian/liblavplay-2.0-0.install
@@ -1 +1 @@
-/usr/lib/liblavplay*.so.*
+/usr/lib/*/liblavplay*.so.*
diff --git a/debian/libmjpegtools-dev.install b/debian/libmjpegtools-dev.install
index 8428772..1e11df4 100644
--- a/debian/libmjpegtools-dev.install
+++ b/debian/libmjpegtools-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/libmjpegutils-2.0-0.install b/debian/libmjpegutils-2.0-0.install
index 29e6c4e..be2c0e5 100644
--- a/debian/libmjpegutils-2.0-0.install
+++ b/debian/libmjpegutils-2.0-0.install
@@ -1 +1 @@
-/usr/lib/libmjpegutils*.so.*
+/usr/lib/*/libmjpegutils*.so.*
diff --git a/debian/libmpeg2encpp-2.0-0.install b/debian/libmpeg2encpp-2.0-0.install
index 081b292..3954333 100644
--- a/debian/libmpeg2encpp-2.0-0.install
+++ b/debian/libmpeg2encpp-2.0-0.install
@@ -1 +1 @@
-/usr/lib/libmpeg2encpp*.so.*
+/usr/lib/*/libmpeg2encpp*.so.*
diff --git a/debian/libmplex2-2.0-0.install b/debian/libmplex2-2.0-0.install
index 630dcf6..96298b5 100644
--- a/debian/libmplex2-2.0-0.install
+++ b/debian/libmplex2-2.0-0.install
@@ -1 +1 @@
-/usr/lib/libmplex2*.so.*
+/usr/lib/*/libmplex2*.so.*

-- 
mjpegtools packaging