[libgeotiff-dfsg] 06/07: Update control and install files for Multi-Arch.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository libgeotiff-dfsg.

commit 10d116f1879a1c7c6f7ef988c062efc5d8454f3b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Oct 24 17:37:27 2014 +0200

    Update control and install files for Multi-Arch.
---
 debian/changelog              | 1 +
 debian/control                | 4 ++++
 debian/libgeotiff-dev.install | 4 ++--
 debian/libgeotiff2.install    | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5fa5fcf..8080437 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ libgeotiff-dfsg (1.4.0-4) UNRELEASED; urgency=medium
   * Add symbols file for libgeotiff.
   * Change priority from extra to optional.
   * Use minimal dh rules.
+  * Update control and install files for Multi-Arch.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 24 Oct 2014 15:02:06 +0200
 
diff --git a/debian/control b/debian/control
index 481616c..d177d9d 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Homepage: http://geotiff.osgeo.org/
 
 Package: libgeotiff-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: libgeotiff2 (= ${binary:Version}),
          libtiff-dev,
@@ -32,8 +33,10 @@ Description: GeoTIFF (geografic enabled TIFF) library -- development files
  on the GeoTIFF library.
 
 Package: libgeotiff2
+Multi-Arch: same
 Architecture: any
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Suggests: geotiff-bin,
@@ -48,6 +51,7 @@ Description: GeoTIFF (geografic enabled TIFF) library -- run-time files
 
 Package: geotiff-bin
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Suggests: gdal-bin,
diff --git a/debian/libgeotiff-dev.install b/debian/libgeotiff-dev.install
index 4a5294f..58ec931 100644
--- a/debian/libgeotiff-dev.install
+++ b/debian/libgeotiff-dev.install
@@ -1,4 +1,4 @@
 usr/include/*.h	usr/include/geotiff
 usr/include/*.inc usr/include/geotiff
-usr/lib/lib*.a
-usr/lib/lib*.so
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
diff --git a/debian/libgeotiff2.install b/debian/libgeotiff2.install
index d0dbfd1..3ddde58 100644
--- a/debian/libgeotiff2.install
+++ b/debian/libgeotiff2.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libgeotiff-dfsg.git