summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Shadura <bugzilla@tut.by>2012-03-30 13:29:28 +0200
committerAndrew Shadura <bugzilla@tut.by>2012-03-30 13:29:28 +0200
commit3c31516683d5993640072f4fe89aafbb6634f120 (patch)
tree6d0ce3257fc5fa21a13b36947b0dd1eef6593a56
parentdd58176cee45067cb8b1612d00bf7292f4fefcb4 (diff)
multiarchify
-rw-r--r--debian/changelog6
-rw-r--r--debian/compat2
-rw-r--r--debian/control6
-rw-r--r--debian/libmowgli-dev.install5
-rw-r--r--debian/libmowgli2.install2
5 files changed, 15 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 5c7d41b..7a0f04e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,12 @@ libmowgli (1.0.0-1) unstable; urgency=low
* Update home page
* Remove duplicate section fields in debian/control
* Update Vcs-* fields
+ * Add multiarch support:
+ - raise dh compat level to 9
+ - raise debhelper build-dependency to 8.1.3~
+ - add Pre-Depends to the binary package
+ - change install files to use multiarch paths
+ - use Multi-Arch: same for binary packages
-- Andrew O. Shadura <bugzilla@tut.by> Fri, 30 Mar 2012 13:09:04 +0200
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 0b533f9..fafa5dd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: libmowgli
Priority: optional
Maintainer: Andrew O. Shadura <bugzilla@tut.by>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev (>= 20100122.1), autoconf, libmowgli-dev (>= 0.7.0), pkg-config
+Build-Depends: debhelper (>= 8.1.3~), autotools-dev (>= 20100122.1), autoconf, libmowgli-dev (>= 0.7.0), pkg-config
Standards-Version: 3.9.3
Homepage: http://www.atheme.org/projects/mowgli
Vcs-Hg: http://anonscm.debian.org/hg/collab-maint/libmowgli
@@ -12,6 +12,7 @@ Package: libmowgli-dev
Section: libdevel
Architecture: any
Depends: libmowgli2 (= ${binary:Version}), ${misc:Depends}
+Multi-Arch: same
Description: high performance development framework for C (development)
Mowgli is a development framework for C (like GLib), which provides high
performance and highly flexible algorithms. It can be used as a supplement
@@ -26,6 +27,8 @@ Description: high performance development framework for C (development)
Package: libmowgli2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: high performance development framework for C
This package contains the shared library needed to run programs that use the
mowgli library.
@@ -35,6 +38,7 @@ Priority: extra
Section: debug
Architecture: any
Depends: libmowgli2 (= ${binary:Version}), ${misc:Depends}
+Multi-Arch: same
Description: high performance development framework for C (debug)
This package contains the debug symbols needed to create meaningful backtraces
for applications that use the mowgli library.
diff --git a/debian/libmowgli-dev.install b/debian/libmowgli-dev.install
index ebcc6e7..7df81cd 100644
--- a/debian/libmowgli-dev.install
+++ b/debian/libmowgli-dev.install
@@ -1,4 +1,3 @@
usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
diff --git a/debian/libmowgli2.install b/debian/libmowgli2.install
index d0dbfd1..3ddde58 100644
--- a/debian/libmowgli2.install
+++ b/debian/libmowgli2.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*