r44412 - in /packages/unstable/libxml++2.6/debian: changelog compat control control.in libxml++2.6-2.install libxml++2.6-dev.install rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Mon May 18 22:44:48 UTC 2015 

Author: biebl
Date: Mon May 18 22:44:48 2015
New Revision: 44412

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

Modified:
    packages/unstable/libxml++2.6/debian/changelog
    packages/unstable/libxml++2.6/debian/compat
    packages/unstable/libxml++2.6/debian/control
    packages/unstable/libxml++2.6/debian/control.in
    packages/unstable/libxml++2.6/debian/libxml++2.6-2.install
    packages/unstable/libxml++2.6/debian/libxml++2.6-dev.install
    packages/unstable/libxml++2.6/debian/rules

Modified: packages/unstable/libxml++2.6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libxml%2B%2B2.6/debian/changelog?rev=44412&op=diff
==============================================================================
--- packages/unstable/libxml++2.6/debian/changelog	[utf-8] (original)
+++ packages/unstable/libxml++2.6/debian/changelog	[utf-8] Mon May 18 22:44:48 2015
@@ -4,6 +4,7 @@
   * Use default automake version.
   * Bump shlibs version to 2.38.0.
   * Bump Build-Depends on mm-common to (>= 0.9.7) as per configure.ac.
+  * Convert to multiarch.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 19 May 2015 00:18:09 +0200
 

Modified: packages/unstable/libxml++2.6/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libxml%2B%2B2.6/debian/compat?rev=44412&op=diff
==============================================================================
--- packages/unstable/libxml++2.6/debian/compat	[utf-8] (original)
+++ packages/unstable/libxml++2.6/debian/compat	[utf-8] Mon May 18 22:44:48 2015
@@ -1 +1 @@
-8
+9

Modified: packages/unstable/libxml++2.6/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libxml%2B%2B2.6/debian/control?rev=44412&op=diff
==============================================================================
--- packages/unstable/libxml++2.6/debian/control	[utf-8] (original)
+++ packages/unstable/libxml++2.6/debian/control	[utf-8] Mon May 18 22:44:48 2015
@@ -10,8 +10,8 @@
 Homepage: http://libxmlplusplus.sourceforge.net/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/libxml++2.6
 Vcs-Svn: svn://svn.debian.org/pkg-gnome/packages/unstable/libxml++2.6
-Build-Depends: cdbs (>= 0.4.51),
-               debhelper (>= 8),
+Build-Depends: cdbs (>= 0.4.93~),
+               debhelper (>= 9),
                dh-autoreconf,
                automake,
                autotools-dev,
@@ -25,6 +25,7 @@
 Package: libxml++2.6-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libxml++2.6-2 (= ${binary:Version}),
@@ -43,6 +44,8 @@
 Package: libxml++2.6-2
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Replaces: libxml++2.6c2a
@@ -59,6 +62,7 @@
 Section: debug
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libxml++2.6-2 (= ${binary:Version})
@@ -73,6 +77,7 @@
 Package: libxml++2.6-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          doc-base,

Modified: packages/unstable/libxml++2.6/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libxml%2B%2B2.6/debian/control.in?rev=44412&op=diff
==============================================================================
--- packages/unstable/libxml++2.6/debian/control.in	[utf-8] (original)
+++ packages/unstable/libxml++2.6/debian/control.in	[utf-8] Mon May 18 22:44:48 2015
@@ -6,8 +6,8 @@
 Homepage: http://libxmlplusplus.sourceforge.net/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/libxml++2.6
 Vcs-Svn: svn://svn.debian.org/pkg-gnome/packages/unstable/libxml++2.6
-Build-Depends: cdbs (>= 0.4.51),
-               debhelper (>= 8),
+Build-Depends: cdbs (>= 0.4.93~),
+               debhelper (>= 9),
                dh-autoreconf,
                automake,
                autotools-dev,
@@ -21,6 +21,7 @@
 Package: libxml++2.6-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libxml++2.6-2 (= ${binary:Version}),
@@ -39,6 +40,8 @@
 Package: libxml++2.6-2
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Replaces: libxml++2.6c2a
@@ -55,6 +58,7 @@
 Section: debug
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libxml++2.6-2 (= ${binary:Version})
@@ -69,6 +73,7 @@
 Package: libxml++2.6-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          doc-base,

Modified: packages/unstable/libxml++2.6/debian/libxml++2.6-2.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libxml%2B%2B2.6/debian/libxml%2B%2B2.6-2.install?rev=44412&op=diff
==============================================================================
--- packages/unstable/libxml++2.6/debian/libxml++2.6-2.install	[utf-8] (original)
+++ packages/unstable/libxml++2.6/debian/libxml++2.6-2.install	[utf-8] Mon May 18 22:44:48 2015
@@ -1 +1 @@
-usr/lib/libxml++-2.6.so.*
+usr/lib/*/libxml++-2.6.so.*

Modified: packages/unstable/libxml++2.6/debian/libxml++2.6-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libxml%2B%2B2.6/debian/libxml%2B%2B2.6-dev.install?rev=44412&op=diff
==============================================================================
--- packages/unstable/libxml++2.6/debian/libxml++2.6-dev.install	[utf-8] (original)
+++ packages/unstable/libxml++2.6/debian/libxml++2.6-dev.install	[utf-8] Mon May 18 22:44:48 2015
@@ -1,5 +1,5 @@
 usr/include
-usr/lib/libxml++-2.6
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig
+usr/lib/*/libxml++-2.6
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig

Modified: packages/unstable/libxml++2.6/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libxml%2B%2B2.6/debian/rules?rev=44412&op=diff
==============================================================================
--- packages/unstable/libxml++2.6/debian/rules	[utf-8] (original)
+++ packages/unstable/libxml++2.6/debian/rules	[utf-8] Mon May 18 22:44:48 2015
@@ -19,7 +19,8 @@
 
 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_MAKE_CHECK_TARGET := check
 DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V"$(SHARED_PKG) (>= $(SHVER))"
 DEB_INSTALL_EXAMPLES_$(DOC_PKG) += -XMakefile -X.deps -X.libs -X.o

More information about the pkg-gnome-commits mailing list