[libodfgen] 02/03: multiarchify

Rene Engelhard rene at moszumanska.debian.org
Tue Sep 13 02:54:46 UTC 2016


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

rene pushed a commit to branch master
in repository libodfgen.

commit 450c79f47fbb558fdf9a75e9d0e24c0eb2792549
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Sep 12 22:30:45 2016 +0200

    multiarchify
---
 debian/compat                  | 2 +-
 debian/control                 | 5 ++++-
 debian/libodfgen-0.1-1.install | 2 +-
 debian/libodfgen-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 3b26db4..3833280 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libodfgen
 Priority: optional
 Maintainer: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
 Uploaders: Rene Engelhard <rene at debian.org>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 10),
                dh-autoreconf,
                libboost-dev,
                librevenge-dev,
@@ -14,6 +14,7 @@ Homepage: http://freedesktop.org/wiki/Software/libodfgen
 Package: libodfgen-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: librevenge-dev,
          libodfgen-0.1-1 (= ${binary:Version}),
          ${misc:Depends}
@@ -25,6 +26,8 @@ Description: library to generate ODF documents -- development
 
 Package: libodfgen-0.1-1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: library to generate ODF documents
  Libodfgen is library providing ability to generate ODF documents from
diff --git a/debian/libodfgen-0.1-1.install b/debian/libodfgen-0.1-1.install
index d0dbfd1..3ddde58 100644
--- a/debian/libodfgen-0.1-1.install
+++ b/debian/libodfgen-0.1-1.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/libodfgen-dev.install b/debian/libodfgen-dev.install
index 5774e64..7df81cd 100644
--- a/debian/libodfgen-dev.install
+++ b/debian/libodfgen-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 0a56c12..ebd7b40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with-autoreconf
+	dh $@ --with autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-werror --libdir=/usr/lib \
-		--disable-silent-rules
+	dh_auto_configure -- --disable-werror

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libodfgen.git



More information about the Pkg-openoffice-commits mailing list