[libvisio] 02/06: multiarchify

Rene Engelhard rene at moszumanska.debian.org
Tue Sep 13 02:53:37 UTC 2016


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

rene pushed a commit to branch master
in repository libvisio.

commit 872e04e0afd7b5d8e96fbe5d83ca46216920807b
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Sep 12 20:19:15 2016 +0200

    multiarchify
---
 debian/control                | 3 +++
 debian/libvisio-0.1-1.install | 2 +-
 debian/libvisio-dev.install   | 4 ++--
 debian/rules                  | 3 +--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index af6e9da..7da8fad 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Homepage: http://freedesktop.org/wiki/Software/libvisio
 Package: libvisio-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libvisio-0.1-1 (= ${binary:Version}),
          librevenge-dev,
          ${misc:Depends}
@@ -43,6 +44,8 @@ Description: library for parsing the visio file structure -- documentatio
 
 Package: libvisio-0.1-1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libvisio-tools (<< 0.0.15~)
 Description: library for parsing the visio file structure
diff --git a/debian/libvisio-0.1-1.install b/debian/libvisio-0.1-1.install
index d0dbfd1..3ddde58 100644
--- a/debian/libvisio-0.1-1.install
+++ b/debian/libvisio-0.1-1.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/libvisio-dev.install b/debian/libvisio-dev.install
index 5774e64..7df81cd 100644
--- a/debian/libvisio-dev.install
+++ b/debian/libvisio-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 c43bc11..99e9b23 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,8 +7,7 @@
 	dh $@ --with autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-werror --libdir=/usr/lib --docdir=/usr/share/doc/libvisio-doc \
-		--disable-silent-rules
+	dh_auto_configure -- --docdir=/usr/share/doc/libvisio-doc
 
 override_dh_auto_test:
 	export TZ=CET; dh_auto_test

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



More information about the Pkg-openoffice-commits mailing list