[hkl] 18/22: multi-arch

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch experimental
in repository hkl.

commit 26b6a84cbf6683e552e142336255d04012c04145
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Fri Jan 30 15:45:25 2015 +0100

    multi-arch
---
 debian/changelog              | 2 ++
 debian/compat                 | 2 +-
 debian/control                | 9 ++++++++-
 debian/gir1.2-hkl-5.0.install | 2 +-
 debian/libhkl-dev.install     | 4 ++--
 debian/libhkl5.install        | 2 +-
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e46e3a1..ad3054d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ hkl (4.99.99.1895-1~exp1) UNRELEASED; urgency=low
   * debian/copyright updated
   * debian/control
     - Bump Standards-Version to 3.9.6 (nothing to do)
+    - switch to compat level 9
+    - multi-arch
     - New binary packages, libhkl5, gir1.2-hkl-5.0
     - Deleted binary package, libhkl4
     - Build-Depends:
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 a3f2322..4b9f39c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: Picca Frédéric-Emmanuel <picca at debian.org>
 Section: science
 Priority: extra
-Build-Depends: debhelper (>= 8.0.0),
+Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                emacs24 | org-mode (>=8.0.7-2~),
                gobject-introspection,
@@ -40,9 +40,11 @@ Description: diffractometer computation control application
 
 Package: libhkl5
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Suggests: libhkl-doc
 Description: diffractometer computation control library
  The hkl library is a framework for diffraction computation and
@@ -56,12 +58,14 @@ Description: diffractometer computation control library
 
 Package: libhkl-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
          gir1.2-hkl-5.0 (= ${binary:Version}),
          install-info,
          libgsl0-dev,
          libhkl5 (= ${binary:Version})
+Pre-Depends: ${misc:Pre-Depends}
 Description: diffractometer computation control library - development files
  The hkl library is a framework for diffraction computation and
  diffractometer control, heavily used at the SOLEIL synchrotron. It
@@ -74,9 +78,11 @@ Description: diffractometer computation control library - development files
 
 Package: libhkl-dbg
 Architecture: any
+Multi-Arch: same
 Section: debug
 Depends: libhkl5 (= ${binary:Version}),
          ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Description: diffractometer computation control library - debug symbols
  The hkl library is a framework for diffraction computation and
  diffractometer control, heavily used at the SOLEIL synchrotron. It
@@ -103,6 +109,7 @@ Description: diffractometer computation control library - documentation
 
 Package: gir1.2-hkl-5.0
 Architecture: any
+Multi-Arch: same
 Section: introspection
 Depends: ${misc:Depends},
          ${gir:Depends},
diff --git a/debian/gir1.2-hkl-5.0.install b/debian/gir1.2-hkl-5.0.install
index 75f1a9b..49d71c9 100644
--- a/debian/gir1.2-hkl-5.0.install
+++ b/debian/gir1.2-hkl-5.0.install
@@ -1 +1 @@
-usr/lib/girepository-1.0
+usr/lib/*/girepository-1.0
diff --git a/debian/libhkl-dev.install b/debian/libhkl-dev.install
index 390750d..5ab491f 100644
--- a/debian/libhkl-dev.install
+++ b/debian/libhkl-dev.install
@@ -1,4 +1,4 @@
 usr/include
-usr/lib/pkgconfig/hkl.pc
-usr/lib/libhkl.so
+usr/lib/*/pkgconfig/hkl.pc
+usr/lib/*/libhkl.so
 usr/share/gir-1.0/
diff --git a/debian/libhkl5.install b/debian/libhkl5.install
index c2449f1..6e8fdaa 100644
--- a/debian/libhkl5.install
+++ b/debian/libhkl5.install
@@ -1 +1 @@
-usr/lib/libhkl.so.*
+usr/lib/*/libhkl.so.*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/hkl.git