[SCM] C++ bindings for GtkDatabox branch, debian, updated. upstream/0.9.2-9-gbd44650

Daniele E. Domenichelli daniele.domenichelli at iit.it
Wed Aug 1 08:42:34 UTC 2012


The following commit has been merged in the debian branch:
commit bd44650158766521b4823615199307ea6fca3b29
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
Date:   Wed Aug 1 08:49:57 2012 +0200

    Multiarch transition

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 3ff6c4f..196b520 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: gtkdataboxmm
 Priority: optional
 Maintainer: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
 Homepage: https://sourceforge.net/projects/gtkdataboxmm/
-Build-Depends: cdbs, debhelper (>= 5), dh-autoreconf, mm-common,
+Build-Depends: cdbs (>= 0.4.93~), debhelper (>= 8.1.3), dh-autoreconf, mm-common,
  libgtkdatabox-0.9.1-1-dev (>= 0.9.1),
  libgtkmm-2.4-dev (>= 2.24.0), libglibmm-2.4-dev (>= 2.16.0),
  doxygen, gnome-pkg-tools
@@ -14,6 +14,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/gtkdata
 Package: libgtkdataboxmm-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libgtkdataboxmm-0.9-0 (= ${binary:Version}),
  libgtkdatabox-0.9.1-1-dev (>= 0.9.1),
@@ -30,6 +31,7 @@ Description: C++ bindings for GtkDatabox - development files
 Package: libgtkdataboxmm-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends},
  lynx | www-browser, doc-base
 Description: C++ bindings for GtkDatabox - documentation and examples
@@ -43,6 +45,8 @@ Description: C++ bindings for GtkDatabox - documentation and examples
 
 Package: libgtkdataboxmm-0.9-0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: C++ bindings for GtkDatabox - shared library
  GtkDatabox is a widget for live display of large amounts of fluctuating
diff --git a/debian/libgtkdataboxmm-0.9-0.install b/debian/libgtkdataboxmm-0.9-0.install
index c45ebcf..cdae829 100644
--- a/debian/libgtkdataboxmm-0.9-0.install
+++ b/debian/libgtkdataboxmm-0.9-0.install
@@ -1 +1 @@
-debian/tmp/usr/lib/lib*.so.*
+debian/tmp/usr/lib/*/lib*.so.*
diff --git a/debian/libgtkdataboxmm-0.9.install b/debian/libgtkdataboxmm-0.9.install
index c45ebcf..cdae829 100644
--- a/debian/libgtkdataboxmm-0.9.install
+++ b/debian/libgtkdataboxmm-0.9.install
@@ -1 +1 @@
-debian/tmp/usr/lib/lib*.so.*
+debian/tmp/usr/lib/*/lib*.so.*
diff --git a/debian/libgtkdataboxmm-dev.install b/debian/libgtkdataboxmm-dev.install
index fb27edb..6077649 100644
--- a/debian/libgtkdataboxmm-dev.install
+++ b/debian/libgtkdataboxmm-dev.install
@@ -1,3 +1,3 @@
 debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.so
-debian/tmp/usr/lib/pkgconfig/*
+debian/tmp/usr/lib/*/lib*.so
+debian/tmp/usr/lib/*/pkgconfig/*
diff --git a/debian/rules b/debian/rules
index 13bbf0e..5ac7d70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,5 +15,9 @@ DEB_INSTALL_EXAMPLES_libgtkdataboxmm-doc += -XMakefile -X.deps -X.libs -X.o
 
 DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V"$(SHARED_PKG) (>= $(SHVER))"
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+
 build/libgtkdataboxmm-doc::
 	$(MAKE) -C $(CURDIR)/doc all

-- 
C++ bindings for GtkDatabox



More information about the debian-science-commits mailing list