[Pkg-gstreamer-commits] [SCM] UNNAMED PROJECT branch, master, updated. debian/0.10.1-2-7-g9c96dba

Sat May 5 19:20:45 UTC 2012

The following commit has been merged in the master branch:
commit 9c96dba2e0db57e923f14f9e3f37fb5ff1d55092
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Sat May 5 22:21:04 2012 +0300

    Convert to multiarch.
    
    * Convert to multiarch.
      - Bump debhelper dependency to version 9.
      - Bump debian/compat to 9.
      - Adjust packaging to install libraries and plugins
        to the mutliarch location.

diff --git a/debian/changelog b/debian/changelog
index d7ded2f..fbd42f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,11 @@ qt-gstreamer (0.10.2-1) unstable; urgency=low
     - cmake >= 2.8.6
     - qt >= 4.7
     - gstreamer >= 0.10.33
+  * Convert to multiarch.
+    - Bump debhelper dependency to version 9.
+    - Bump debian/compat to 9.
+    - Adjust packaging to install libraries and plugins
+      to the mutliarch location.
 
  -- George Kiagiadakis <kiagiadakis.george at gmail.com>  Sat, 05 May 2012 13:34:04 +0300
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 87c0e41..bf6d1a2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Maintainers of GStreamer packages <pkg-gstreamer-maintainers at lists.alioth.debian.org>
 Uploaders: George Kiagiadakis <kiagiadakis.george at gmail.com>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
                cmake (>= 2.8.6),
                libqt4-dev (>= 4:4.7),
                libboost-dev (>= 1.39),
@@ -16,6 +16,8 @@ Homepage: http://gstreamer.freedesktop.org
 
 Package: libqtglib-2.0-0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libstdc++6 (>= 4.5.0~)
@@ -32,6 +34,8 @@ Description: C++ bindings library for GLib and GObject with a Qt-style API
 
 Package: libqtgstreamer-0.10-0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: C++ bindings library for GStreamer with a Qt-style API
@@ -43,6 +47,8 @@ Description: C++ bindings library for GStreamer with a Qt-style API
 
 Package: libqtgstreamerui-0.10-0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Suggests: qtgstreamer-plugins
@@ -54,6 +60,8 @@ Description: The QtGStreamerUi library
 
 Package: libqtgstreamerutils-0.10-0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: The QtGStreamerUtils library
@@ -64,6 +72,8 @@ Description: The QtGStreamerUtils library
 
 Package: qtgstreamer-plugins
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 XB-GStreamer-Version: ${gstreamer:Version}
diff --git a/debian/libqtglib-2.0-0.install b/debian/libqtglib-2.0-0.install
index f82fcef..98d8a13 100644
--- a/debian/libqtglib-2.0-0.install
+++ b/debian/libqtglib-2.0-0.install
@@ -1 +1 @@
-usr/lib/libQtGLib-2.0.so.0*
+usr/lib/*/libQtGLib-2.0.so.0*
diff --git a/debian/libqtgstreamer-0.10-0.install b/debian/libqtgstreamer-0.10-0.install
index 2b0e6cf..3fa771c 100644
--- a/debian/libqtgstreamer-0.10-0.install
+++ b/debian/libqtgstreamer-0.10-0.install
@@ -1 +1 @@
-usr/lib/libQtGStreamer-0.10.so.0*
+usr/lib/*/libQtGStreamer-0.10.so.0*
diff --git a/debian/libqtgstreamer-dev.install b/debian/libqtgstreamer-dev.install
index d95266d..d31ab9c 100644
--- a/debian/libqtgstreamer-dev.install
+++ b/debian/libqtgstreamer-dev.install
@@ -1,4 +1,4 @@
 usr/include/QtGStreamer/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-usr/lib/QtGStreamer/*
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
+usr/lib/*/QtGStreamer/*
diff --git a/debian/libqtgstreamerui-0.10-0.install b/debian/libqtgstreamerui-0.10-0.install
index c1c8f55..eb4aef4 100644
--- a/debian/libqtgstreamerui-0.10-0.install
+++ b/debian/libqtgstreamerui-0.10-0.install
@@ -1 +1 @@
-usr/lib/libQtGStreamerUi-0.10.so.0*
+usr/lib/*/libQtGStreamerUi-0.10.so.0*
diff --git a/debian/libqtgstreamerutils-0.10-0.install b/debian/libqtgstreamerutils-0.10-0.install
index 79c4437..d375555 100644
--- a/debian/libqtgstreamerutils-0.10-0.install
+++ b/debian/libqtgstreamerutils-0.10-0.install
@@ -1 +1 @@
-usr/lib/libQtGStreamerUtils-0.10.so.0*
+usr/lib/*/libQtGStreamerUtils-0.10.so.0*
diff --git a/debian/qtgstreamer-plugins.install b/debian/qtgstreamer-plugins.install
index 0a1aeb1..a4ff4d1 100644
--- a/debian/qtgstreamer-plugins.install
+++ b/debian/qtgstreamer-plugins.install
@@ -1 +1 @@
-usr/lib/gstreamer-0.10/*
+usr/lib/*/gstreamer-0.10/*
diff --git a/debian/rules b/debian/rules
index 38abe0e..ea9ca34 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,14 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/architecture.mk
+
 override_dh_auto_configure:
 	dh_auto_configure -- -DQTGSTREAMER_STATIC=OFF \
 	                     -DQTGSTREAMER_TESTS=OFF \
 	                     -DQTGSTREAMER_EXAMPLES=OFF \
 	                     -DGST_PACKAGE_NAME="QtGStreamer (Debian)" \
-	                     -DGST_PACKAGE_ORIGIN="http://packages.qa.debian.org/qt-gstreamer"
+	                     -DGST_PACKAGE_ORIGIN="http://packages.qa.debian.org/qt-gstreamer" \
+			     -DLIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_build:
 	dh_auto_build --parallel -- all doc
@@ -17,7 +20,7 @@ override_dh_auto_install:
 override_dh_gencontrol:
 	mkdir -p debian/fake-home
 	HOME=debian/fake-home \
-	LD_LIBRARY_PATH=debian/qtgstreamer-plugins/usr/lib:$(LD_LIBRARY_PATH) \
+	LD_LIBRARY_PATH=debian/qtgstreamer-plugins/usr/lib/$(DEB_HOST_MULTIARCH):$(LD_LIBRARY_PATH) \
 	    dh_gstscancodecs
 	rm -rf debian/fake-home
 	dh_gencontrol

-- 
UNNAMED PROJECT

