[libkate] 01/01: Add multiarch support. Patch from Francois Gouget.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository libkate.

commit 4ce4b754f7e7d7a003d3a0a0860fe2505cc1694b
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Wed Sep 23 08:45:07 2015 +0200

    Add multiarch support.  Patch from Francois Gouget.
    
    Closes: #777209
---
 debian/compat                 |  2 +-
 debian/control                | 10 +++++++++-
 debian/libkate-dev.install    |  6 +++---
 debian/libkate1.install       |  2 +-
 debian/liboggkate-dev.install |  6 +++---
 debian/liboggkate1.install    |  2 +-
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 213df8b..0c3537e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Maintainer: Debian Xiph.org Maintainers <pkg-xiph-maint at lists.alioth.debian.org>
 Uploaders:
  Petter Reinholdtsen <pere at debian.org>
  , Martin Steghöfer <martin at steghoefer.eu>
-Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, autotools-dev, python-all-dev, dh-python, liboggz-dev, pkg-config, libpng-dev, doxygen
+Build-Depends: dh-exec (>=0.3), debhelper (>= 9), dh-autoreconf, autotools-dev, python-all-dev, dh-python, liboggz-dev, pkg-config, libpng-dev, doxygen
 Standards-Version: 3.9.6
 Section: libs
 Homepage: http://code.google.com/p/libkate/
@@ -15,6 +15,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xiph/libkate.git
 Package: libkate-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libkate1 (= ${binary:Version}), ${misc:Depends}
 Description: Codec for karaoke and text encapsulation (dev)
  Kate is meant to be used for karaoke alongside audio/video streams (typically
@@ -26,6 +27,8 @@ Description: Codec for karaoke and text encapsulation (dev)
 
 Package: libkate1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Codec for karaoke and text encapsulation
  Kate is meant to be used for karaoke alongside audio/video streams (typically
@@ -37,6 +40,7 @@ Description: Codec for karaoke and text encapsulation
 Package: liboggkate-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: liboggkate1 (= ${binary:Version}), ${misc:Depends}
 Description: Codec for karaoke and text encapsulation for Ogg (dev)
  Kate is meant to be used for karaoke alongside audio/video streams (typically
@@ -48,6 +52,8 @@ Description: Codec for karaoke and text encapsulation for Ogg (dev)
 
 Package: liboggkate1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Codec for karaoke and text encapsulation for Ogg
  Kate is meant to be used for karaoke alongside audio/video streams (typically
@@ -59,6 +65,7 @@ Description: Codec for karaoke and text encapsulation for Ogg
 Package: libkate-tools
 Section: utils
 Architecture: any
+Multi-Arch: foreign
 XB-Python-Version: ${python:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-pythoncard, oggz-tools
 Provides: ${python:Provides}
@@ -74,6 +81,7 @@ Package: libkate1-dbg
 Section: debug
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Depends: libkate1 (= ${binary:Version}), ${misc:Depends}
 Description: Codec for karaoke and text encapsulation for Ogg (dbg)
  Kate is meant to be used for karaoke alongside audio/video streams (typically
diff --git a/debian/libkate-dev.install b/debian/libkate-dev.install
index 23bb595..0217ed4 100644
--- a/debian/libkate-dev.install
+++ b/debian/libkate-dev.install
@@ -1,4 +1,4 @@
 usr/include/kate/kate*
-usr/lib/libkate*.a
-usr/lib/libkate*.so
-usr/lib/pkgconfig/kate*
+usr/lib/*/libkate*.a
+usr/lib/*/libkate*.so
+usr/lib/*/pkgconfig/kate*
diff --git a/debian/libkate1.install b/debian/libkate1.install
index df0128a..4f63bad 100644
--- a/debian/libkate1.install
+++ b/debian/libkate1.install
@@ -1 +1 @@
-usr/lib/libkate*.so.*
+usr/lib/*/libkate*.so.*
diff --git a/debian/liboggkate-dev.install b/debian/liboggkate-dev.install
index 8bb4381..a9ef1b1 100644
--- a/debian/liboggkate-dev.install
+++ b/debian/liboggkate-dev.install
@@ -1,4 +1,4 @@
 usr/include/kate/oggkate*
-usr/lib/liboggkate*.a
-usr/lib/liboggkate*.so
-usr/lib/pkgconfig/oggkate*
+usr/lib/*/liboggkate*.a
+usr/lib/*/liboggkate*.so
+usr/lib/*/pkgconfig/oggkate*
diff --git a/debian/liboggkate1.install b/debian/liboggkate1.install
index 50298b8..35c5bf7 100644
--- a/debian/liboggkate1.install
+++ b/debian/liboggkate1.install
@@ -1 +1 @@
-usr/lib/liboggkate*.so.*
+usr/lib/*/liboggkate*.so.*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xiph/libkate.git