Am 26.02.2013 16:14, schrieb Rene Engelhard:
diff --git a/debian/rules b/debian/rules
index 36e973a..3e3c313 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
%:
dh $@ --builddirectory=build
I am not going to do that, we can use /usr/share/dpkg/architecture.mk
for that (and build-depend on dpkg-dev (>= 1.16.1) which is more clean.
Didn't even know about that one.
I attached an updated patch with this change, I also removed the
Multiarch: foreign tag from the -doc package, which it doesn't need.
Regards,
Daniel Schaal
>From 17631b0d71b44573ef86dc3af28aa5d8ec3783b3 Mon Sep 17 00:00:00 2001
From: Daniel Schaal <farb...@web.de>
Date: Tue, 26 Feb 2013 12:15:53 +0100
Subject: [PATCH] Convert to multiarch
* Bump debhelper compat to 9
* Add dh-exec build-dependency and use it for libgraphite2-3.links
* Add multiarch flags to control
* adapt install files
* change ICU_LIBRARY_PATH to multiarch path, depend on multiarch libicu-dev
* build-depend on dpkg-dev (>= 1.16.1) for architecture.mk
* remove uneccessary dirs files
---
debian/compat | 2 +-
debian/control | 4 +++-
debian/libgraphite2-3.install | 2 +-
debian/libgraphite2-3.links | 3 ++-
debian/libgraphite2-3dirs | 1 -
debian/libgraphite2-dev.dirs | 4 ----
debian/libgraphite2-dev.install | 6 +++---
debian/rules | 4 +++-
8 files changed, 13 insertions(+), 13 deletions(-)
mode change 100644 => 100755 debian/libgraphite2-3.links
delete mode 100644 debian/libgraphite2-3dirs
delete mode 100644 debian/libgraphite2-dev.dirs
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 211ba60..e12c019 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
Section: libs
Maintainer: Debian LibreOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <r...@debian.org>, Daniel Glassey <w...@debian.org>
-Build-Depends: debhelper (>= 8.0), cmake, libfreetype6-dev, libgraphite-dev, libicu-dev
+Build-Depends: debhelper (>= 9), dh-exec (>= 0.3), dpkg-dev (>= 1.16.1), cmake, libfreetype6-dev, libgraphite-dev, libicu-dev (>= 4.8.1.1-6)
# perl: libmodule-build-perl
Build-Depends-Indep: asciidoc, dblatex, doxygen, docbook-xsl, latex-xcolor, libxml2-utils
Standards-Version: 3.9.1
@@ -11,10 +11,12 @@ Standards-Version: 3.9.1
Package: libgraphite2-3
Section: libs
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: libgraphite2-2.0.0
Replaces: libgraphite2-2.0.0
Breaks: libgraphite2-2.0.0 (<< 1.2.0)
+Multi-Arch: same
Description: Font rendering engine for Complex Scripts -- library
Graphite is a system that can be used to create and use "smart fonts" capable
of displaying writing systems with various complex behaviors, such as:
diff --git a/debian/libgraphite2-3.install b/debian/libgraphite2-3.install
index c45ebcf..3ddde58 100644
--- a/debian/libgraphite2-3.install
+++ b/debian/libgraphite2-3.install
@@ -1 +1 @@
-debian/tmp/usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/libgraphite2-3.links b/debian/libgraphite2-3.links
old mode 100644
new mode 100755
index d59ce53..e6784d8
--- a/debian/libgraphite2-3.links
+++ b/debian/libgraphite2-3.links
@@ -1 +1,2 @@
-usr/lib/libgraphite2.so.3 usr/lib/libgraphite2.so.2.0.0
+#! /usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}/libgraphite2.so.3 usr/lib/${DEB_HOST_MULTIARCH}/libgraphite2.so.2.0.0
diff --git a/debian/libgraphite2-3dirs b/debian/libgraphite2-3dirs
deleted file mode 100644
index 0bf940b..0000000
--- a/debian/libgraphite2-3dirs
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib
diff --git a/debian/libgraphite2-dev.dirs b/debian/libgraphite2-dev.dirs
deleted file mode 100644
index afd8b80..0000000
--- a/debian/libgraphite2-dev.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/lib
-/usr/lib/pkgconfig
-/usr/include/graphite2
-/usr/bin
diff --git a/debian/libgraphite2-dev.install b/debian/libgraphite2-dev.install
index f9516b5..d413661 100644
--- a/debian/libgraphite2-dev.install
+++ b/debian/libgraphite2-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/include
-debian/tmp/usr/lib/lib*.so
-debian/tmp/usr/lib/pkgconfig
+usr/include
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig
diff --git a/debian/rules b/debian/rules
index 36e973a..803f705 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+include /usr/share/dpkg/architecture.mk
+
%:
dh $@ --builddirectory=build
@@ -43,7 +45,7 @@ override_dh_auto_clean:
dh_auto_clean
override_dh_auto_configure:
- dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=Release -DGRAPHITE2_NTRACING:bool=1 -DGRAPHITE2_COMPARE_RENDERER=ON -DICU_LIBRARY_PATH=/usr/lib
+ dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=Release -DGRAPHITE2_NTRACING:bool=1 -DGRAPHITE2_COMPARE_RENDERER=ON -DICU_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH) -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH)
override_dh_gencontrol:
dh_gencontrol -Nlibtext-graphite2-perl -O--builddirectory=build
--
1.8.2.rc0
