r45359 - in /desktop/unstable/libgtksourceviewmm/debian: changelog control control.in libgtksourceviewmm-3.0-0.install libgtksourceviewmm-3.0-dev.install rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Jun 21 23:13:39 2015
New Revision: 45359

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45359
Log:
Convert to multiarch.

Modified:
    desktop/unstable/libgtksourceviewmm/debian/changelog
    desktop/unstable/libgtksourceviewmm/debian/control
    desktop/unstable/libgtksourceviewmm/debian/control.in
    desktop/unstable/libgtksourceviewmm/debian/libgtksourceviewmm-3.0-0.install
    desktop/unstable/libgtksourceviewmm/debian/libgtksourceviewmm-3.0-dev.install
    desktop/unstable/libgtksourceviewmm/debian/rules

Modified: desktop/unstable/libgtksourceviewmm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtksourceviewmm/debian/changelog?rev=45359&op=diff
==============================================================================
--- desktop/unstable/libgtksourceviewmm/debian/changelog	[utf-8] (original)
+++ desktop/unstable/libgtksourceviewmm/debian/changelog	[utf-8] Sun Jun 21 23:13:39 2015
@@ -8,6 +8,7 @@
     upstream behaviour.
   * Bump Standards-Version to 3.9.6.
   * Bump debhelper compatibility level to 9.
+  * Convert to multiarch.
 
  -- Michael Biebl <biebl at debian.org>  Mon, 22 Jun 2015 00:46:24 +0200
 

Modified: desktop/unstable/libgtksourceviewmm/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtksourceviewmm/debian/control?rev=45359&op=diff
==============================================================================
--- desktop/unstable/libgtksourceviewmm/debian/control	[utf-8] (original)
+++ desktop/unstable/libgtksourceviewmm/debian/control	[utf-8] Sun Jun 21 23:13:39 2015
@@ -10,7 +10,7 @@
 Homepage: http://www.gtkmm.org/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtksourceviewmm
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/libgtksourceviewmm
-Build-Depends: cdbs (>= 0.4.51),
+Build-Depends: cdbs (>= 0.4.93),
                debhelper (>= 9),
                doxygen,
                gnome-pkg-tools,
@@ -24,6 +24,8 @@
 Package: libgtksourceviewmm-3.0-0
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Description: C++ binding of GtkSourceView
@@ -39,6 +41,7 @@
 Package: libgtksourceviewmm-3.0-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libgtksourceviewmm-3.0-0 (= ${binary:Version}),
@@ -76,6 +79,7 @@
 Package: libgtksourceviewmm-3.0-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          doc-base,

Modified: desktop/unstable/libgtksourceviewmm/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtksourceviewmm/debian/control.in?rev=45359&op=diff
==============================================================================
--- desktop/unstable/libgtksourceviewmm/debian/control.in	[utf-8] (original)
+++ desktop/unstable/libgtksourceviewmm/debian/control.in	[utf-8] Sun Jun 21 23:13:39 2015
@@ -6,7 +6,7 @@
 Homepage: http://www.gtkmm.org/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtksourceviewmm
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/libgtksourceviewmm
-Build-Depends: cdbs (>= 0.4.51),
+Build-Depends: cdbs (>= 0.4.93),
                debhelper (>= 9),
                doxygen,
                gnome-pkg-tools,
@@ -20,6 +20,8 @@
 Package: libgtksourceviewmm-3.0-0
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Description: C++ binding of GtkSourceView
@@ -35,6 +37,7 @@
 Package: libgtksourceviewmm-3.0-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libgtksourceviewmm-3.0-0 (= ${binary:Version}),
@@ -55,6 +58,7 @@
 Section: debug
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libgtksourceviewmm-3.0-0 (= ${binary:Version})
@@ -72,6 +76,7 @@
 Package: libgtksourceviewmm-3.0-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          doc-base,

Modified: desktop/unstable/libgtksourceviewmm/debian/libgtksourceviewmm-3.0-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtksourceviewmm/debian/libgtksourceviewmm-3.0-0.install?rev=45359&op=diff
==============================================================================
--- desktop/unstable/libgtksourceviewmm/debian/libgtksourceviewmm-3.0-0.install	[utf-8] (original)
+++ desktop/unstable/libgtksourceviewmm/debian/libgtksourceviewmm-3.0-0.install	[utf-8] Sun Jun 21 23:13:39 2015
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*

Modified: desktop/unstable/libgtksourceviewmm/debian/libgtksourceviewmm-3.0-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtksourceviewmm/debian/libgtksourceviewmm-3.0-dev.install?rev=45359&op=diff
==============================================================================
--- desktop/unstable/libgtksourceviewmm/debian/libgtksourceviewmm-3.0-dev.install	[utf-8] (original)
+++ desktop/unstable/libgtksourceviewmm/debian/libgtksourceviewmm-3.0-dev.install	[utf-8] Sun Jun 21 23:13:39 2015
@@ -1,5 +1,5 @@
-usr/lib/*.so
-usr/lib/*.a
-usr/lib/pkgconfig
+usr/lib/*/*.so
+usr/lib/*/*.a
+usr/lib/*/pkgconfig
 usr/include
-usr/lib/gtksourceviewmm-3.0
+usr/lib/*/gtksourceviewmm-3.0

Modified: desktop/unstable/libgtksourceviewmm/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtksourceviewmm/debian/rules?rev=45359&op=diff
==============================================================================
--- desktop/unstable/libgtksourceviewmm/debian/rules	[utf-8] (original)
+++ desktop/unstable/libgtksourceviewmm/debian/rules	[utf-8] Sun Jun 21 23:13:39 2015
@@ -14,6 +14,7 @@
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-static
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-static \
+                             --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V"$(SHARED_PKG) (>= $(SHVER))"
 DEB_INSTALL_DOCS_ALL += -XMakefile -X.deps -X.libs -X.o