[liblangtag] 01/07: multiarchify

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


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

rene pushed a commit to branch master
in repository liblangtag.

commit ffd7947da296cbd716751c6b910f2c6c24e8f74f
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Sep 6 20:49:17 2016 +0200

    multiarchify
---
 debian/control                     | 7 +++++++
 debian/gir1.2-langtag-0.5.install  | 2 +-
 debian/liblangtag-dev.install      | 6 +++---
 debian/liblangtag-gobject0.install | 2 +-
 debian/liblangtag1.install         | 2 +-
 debian/rules                       | 1 -
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 7762419..864c858 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Homepage: http://tagoh.bitbucket.org/liblangtag/
 Package: liblangtag-dev
 Section: libdevel
 Architecture: any
+Multi-arch: same
 Depends: liblangtag1 (= ${binary:Version}), liblangtag-gobject0 (= ${binary:Version}), libglib2.0-dev, gir1.2-langtag-0.5 (= ${binary:Version}), ${misc:Depends}
 Suggests: liblangtag-doc
 Description: library to access tags for identifying languages -- development
@@ -25,6 +26,8 @@ Description: library to access tags for identifying languages -- development
 Package: liblangtag1
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, liblangtag-common (= ${source:Version})
 Description: library to access tags for identifying languages
  liblangtag is an interface library to access/deal with tags for
@@ -33,6 +36,8 @@ Description: library to access tags for identifying languages
 Package: liblangtag-gobject0
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, liblangtag-common (= ${source:Version})
 Replaces: liblangtag0 (<< 0.4.0)
 Description: library to access tags for identifying languages
@@ -42,6 +47,7 @@ Description: library to access tags for identifying languages
 Package: gir1.2-langtag-0.5
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${gir:Depends}, ${misc:Depends}
 Description: library to access tags for identifying languages - introspection
  liblangtag is an interface library to access/deal with tags for
@@ -51,6 +57,7 @@ Description: library to access tags for identifying languages - introspection
 
 Package: liblangtag-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Description: library to access tags for identifying languages -- data
  liblangtag is an interface library to access/deal with tags for
diff --git a/debian/gir1.2-langtag-0.5.install b/debian/gir1.2-langtag-0.5.install
index 41978ff..ccdda39 100644
--- a/debian/gir1.2-langtag-0.5.install
+++ b/debian/gir1.2-langtag-0.5.install
@@ -1 +1 @@
-usr/lib/girepository-1.0/*
+usr/lib/*/girepository-1.0/*
diff --git a/debian/liblangtag-dev.install b/debian/liblangtag-dev.install
index 24fb041..e67660d 100644
--- a/debian/liblangtag-dev.install
+++ b/debian/liblangtag-dev.install
@@ -1,5 +1,5 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
 usr/share/gir-1.0/LangTag-0.5.gir
diff --git a/debian/liblangtag-gobject0.install b/debian/liblangtag-gobject0.install
index 4afe330..f9cfeae 100644
--- a/debian/liblangtag-gobject0.install
+++ b/debian/liblangtag-gobject0.install
@@ -1 +1 @@
-usr/lib/liblangtag-gobject.so.*
+usr/lib/*/liblangtag-gobject.so.*
diff --git a/debian/liblangtag1.install b/debian/liblangtag1.install
index ba52b94..8eca2a9 100644
--- a/debian/liblangtag1.install
+++ b/debian/liblangtag1.install
@@ -1 +1 @@
-usr/lib/liblangtag.so.*
+usr/lib/*/liblangtag.so.*
diff --git a/debian/rules b/debian/rules
index 2f048ca..0967a92 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,6 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 else
   ENABLE_TESTS=n
 endif
-CONFIGURE_FLAGS += --libdir=/usr/lib
 ifeq "$(ENABLE_TESTS)" "n"
 	CONFIGURE_FLAGS += --disable-test
 endif

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



More information about the Pkg-openoffice-commits mailing list