[Pkg-telepathy-commits] [SCM] libnice packaging branch, debian, updated. debian/0.1.0-2-9-g13f7eba

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit a0dc86a5d23c618af252b7a2d9d6c750018180fb
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Sun Sep 11 23:02:51 2011 +0200

    Follow multi-arch specification

diff --git a/debian/changelog b/debian/changelog
index 19de1a0..48a4640 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ libnice (0.1.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * debian/control: Bump Standards-Version to 3.9.2 (no further changes)
+  * Follow multi-arch specification
 
- -- Laurent Bigonville <bigon at debian.org>  Sun, 11 Sep 2011 22:53:30 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Sun, 11 Sep 2011 23:02:36 +0200
 
 libnice (0.1.0-2) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 509619e..f3c92fd 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Uploaders: Dafydd Harries <daf at debian.org>,
            Sjoerd Simons <sjoerd at debian.org>,
            Laurent Bigonville <bigon at debian.org>,
            Jonny Lamb <jonny at debian.org>
-Build-Depends: cdbs,
-               debhelper (>= 7),
+Build-Depends: cdbs (>= 0.4.93~),
+               debhelper (>= 8.1.3~),
                libglib2.0-dev (>= 2.10),
                libgstreamer0.10-dev,
                libgstreamer-plugins-base0.10-dev,
@@ -22,6 +22,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/libnice.git
 Package: libnice10
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: ICE library (shared library)
  Nice is an implementation of the IETF's draft Interactive Connectivity
  Establishment standard (ICE).  ICE is useful for applications that want to
@@ -93,6 +95,7 @@ Section: debug
 Priority: extra
 Architecture: any
 Depends: ${misc:Depends}, libnice10 (= ${binary:Version})
+Multi-Arch: same
 Description: ICE library (debugging symbols)
  Nice is an implementation of the IETF's draft Interactive Connectivity
  Establishment standard (ICE).  ICE is useful for applications that want to
diff --git a/debian/gstreamer0.10-nice.install b/debian/gstreamer0.10-nice.install
index ffbf874..fd2398e 100644
--- a/debian/gstreamer0.10-nice.install
+++ b/debian/gstreamer0.10-nice.install
@@ -1 +1 @@
-debian/tmp//usr/lib/gstreamer-0.10/libgstnice.so
+usr/lib/*/gstreamer-0.10/libgstnice.so /usr/lib/gstreamer-0.10/
diff --git a/debian/libnice-dev.install b/debian/libnice-dev.install
index 8702885..bd63d34 100644
--- a/debian/libnice-dev.install
+++ b/debian/libnice-dev.install
@@ -1,5 +1,5 @@
-debian/tmp/usr/lib/libnice.so
-debian/tmp/usr/lib/libnice.a
-debian/tmp//usr/lib/pkgconfig/nice.pc
-debian/tmp/usr/include/stun
-debian/tmp/usr/include/nice
+usr/lib/*/libnice.so
+usr/lib/*/libnice.a
+usr/lib/*/pkgconfig/nice.pc
+usr/include/stun
+usr/include/nice
diff --git a/debian/libnice10.install b/debian/libnice10.install
index 9611ecc..feccfab 100644
--- a/debian/libnice10.install
+++ b/debian/libnice10.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libnice.so.*
+usr/lib/*/libnice.so.*
diff --git a/debian/rules b/debian/rules
index b60ea5a..0790d39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ endif
 
 DEB_DBG_PACKAGE_libnice10 := libnice-dbg
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-gupnp
+DEB_CONFIGURE_EXTRA_FLAGS := --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+	                     --enable-gupnp
 
 include $(CURDIR)/debian/update-patches.mk

-- 
libnice packaging