[libetonyek] 02/03: multiarchify
Rene Engelhard
rene at moszumanska.debian.org
Tue Sep 13 02:54:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libetonyek.
commit 45def164a85b7e85b1a0485a19194cbb3a94a3ea
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Mon Sep 12 21:44:46 2016 +0200
multiarchify
---
debian/compat | 2 +-
debian/control | 5 ++++-
debian/libetonyek-0.1-1.install | 2 +-
debian/libetonyek-dev.install | 4 ++--
debian/rules | 5 ++---
5 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 88705c2..745bd0e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
Uploaders: Rene Engelhard <rene at debian.org>
Build-Depends: dh-autoreconf,
- debhelper (>= 9),
+ debhelper (>= 10),
gperf,
libboost-dev,
libboost-filesystem-dev,
@@ -22,6 +22,7 @@ Homepage: http://www.freedesktop.org/wiki/Software/libetonyek
Package: libetonyek-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: libetonyek-0.1-1 (= ${binary:Version}),
librevenge-dev,
${misc:Depends}
@@ -35,6 +36,8 @@ Description: library for reading and converting Apple Keynote presentations
Package: libetonyek-0.1-1
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: library for reading and converting Apple Keynote presentations
libetonyek is a library and a set of tools for reading and converting
diff --git a/debian/libetonyek-0.1-1.install b/debian/libetonyek-0.1-1.install
index d0dbfd1..3ddde58 100644
--- a/debian/libetonyek-0.1-1.install
+++ b/debian/libetonyek-0.1-1.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/libetonyek-dev.install b/debian/libetonyek-dev.install
index 5774e64..7df81cd 100644
--- a/debian/libetonyek-dev.install
+++ b/debian/libetonyek-dev.install
@@ -1,3 +1,3 @@
usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
diff --git a/debian/rules b/debian/rules
index 49c293c..6e47ba2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,14 +5,13 @@
include /usr/share/dpkg/architecture.mk
-CONFIGURE_FLAGS:= --disable-werror --libdir=/usr/lib \
- --disable-silent-rules --with-boost-libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+CONFIGURE_FLAGS:= --disable-werror --with-boost-libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
MDDS_VER:=$(shell pkg-config --exists mdds-1.2 && echo 1.2 || echo 0.x)
CONFIGURE_FLAGS += --with-mdds=$(MDDS_VER)
%:
- dh $@ --parallel --with=autoreconf
+ dh $@ --with=autoreconf
override_dh_auto_configure:
dh_auto_configure -- $(CONFIGURE_FLAGS)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libetonyek.git
More information about the Pkg-openoffice-commits
mailing list