[SCM] ois/master: Introduce Multi-Arch.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Fri Apr 6 08:07:56 UTC 2012


The following commit has been merged in the master branch:
commit 0cf404909eae6759d39082e605b69846b6aa13a0
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Apr 6 09:51:44 2012 +0200

    Introduce Multi-Arch.

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 45e5882..001ba1e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: extra
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Philippe Coval <rzr at gna.org>,
  Federico Di Gregorio <fog at debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 9),
  automake (>= 1.9),
  dh-autoreconf,
  autoconf,
@@ -20,6 +20,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ois.git
 Package: libois-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libois-1.3.0 (= ${binary:Version}),
  ${misc:Depends}
 Description: Object Oriented Input System library (C++ development headers)
@@ -31,6 +32,8 @@ Description: Object Oriented Input System library (C++ development headers)
 
 Package: libois-1.3.0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Breaks: libois
diff --git a/debian/libois-1.3.0.install b/debian/libois-1.3.0.install
index 319e893..033c066 100644
--- a/debian/libois-1.3.0.install
+++ b/debian/libois-1.3.0.install
@@ -1 +1 @@
-usr/lib/libOIS-*.so
+usr/lib/*/libOIS-*.so
diff --git a/debian/libois-dev.install b/debian/libois-dev.install
index 6e9848a..d8355c9 100644
--- a/debian/libois-dev.install
+++ b/debian/libois-dev.install
@@ -1,4 +1,4 @@
 usr/include/*
-usr/lib/libOIS*.a
-usr/lib/libOIS.so
-usr/lib/pkgconfig/*
+usr/lib/*/libOIS*.a
+usr/lib/*/libOIS.so
+usr/lib/*/pkgconfig/*

-- 
ois packaging



More information about the pkg-multimedia-commits mailing list