r45339 - in /packages/experimental/libgdata/debian: changelog control control.in gir1.2-gdata-0.0.install libgdata-dev.install libgdata22.install rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Sun Jun 21 18:46:15 UTC 2015 

Author: biebl
Date: Sun Jun 21 18:46:15 2015
New Revision: 45339

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

Modified:
    packages/experimental/libgdata/debian/changelog
    packages/experimental/libgdata/debian/control
    packages/experimental/libgdata/debian/control.in
    packages/experimental/libgdata/debian/gir1.2-gdata-0.0.install
    packages/experimental/libgdata/debian/libgdata-dev.install
    packages/experimental/libgdata/debian/libgdata22.install
    packages/experimental/libgdata/debian/rules

Modified: packages/experimental/libgdata/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libgdata/debian/changelog?rev=45339&op=diff
==============================================================================
--- packages/experimental/libgdata/debian/changelog	[utf-8] (original)
+++ packages/experimental/libgdata/debian/changelog	[utf-8] Sun Jun 21 18:46:15 2015
@@ -9,6 +9,7 @@
   * New upstream release. (Closes: #789134)
   * Bump soname from 19 → 22.
   * Update symbols file.
+  * Convert to multiarch.
 
  -- Andreas Henriksson <andreas at fatal.se>  Tue, 19 May 2015 17:38:56 +0200
 

Modified: packages/experimental/libgdata/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libgdata/debian/control?rev=45339&op=diff
==============================================================================
--- packages/experimental/libgdata/debian/control	[utf-8] (original)
+++ packages/experimental/libgdata/debian/control	[utf-8] Sun Jun 21 18:46:15 2015
@@ -6,9 +6,9 @@
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: cdbs (>= 0.4.41),
-               debhelper (>= 8),
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Iain Lane <laney at debian.org>
+Build-Depends: cdbs (>= 0.4.93),
+               debhelper (>= 9),
                dh-autoreconf,
                gnome-common (>= 3.6.0),
                gnome-pkg-tools (>= 0.11),
@@ -33,9 +33,11 @@
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/libgdata
 XS-Testsuite: autopkgtest
 
-Package: libgdata19
+Package: libgdata22
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgdata-common
@@ -49,6 +51,7 @@
 Package: libgdata-common
 Section: libs
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Description: Library for accessing GData webservices - common data files
  libgdata is a GLib-based library for accessing online service APIs using
@@ -60,7 +63,8 @@
 Package: libgdata-dev
 Section: libdevel
 Architecture: any
-Depends: libgdata19 (= ${binary:Version}),
+Multi-Arch: same
+Depends: libgdata22 (= ${binary:Version}),
          gir1.2-gdata-0.0 (= ${binary:Version}),
          ${misc:Depends},
          libgcr-3-dev,
@@ -95,6 +99,7 @@
 Package: gir1.2-gdata-0.0
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}

Modified: packages/experimental/libgdata/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libgdata/debian/control.in?rev=45339&op=diff
==============================================================================
--- packages/experimental/libgdata/debian/control.in	[utf-8] (original)
+++ packages/experimental/libgdata/debian/control.in	[utf-8] Sun Jun 21 18:46:15 2015
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs (>= 0.4.41),
-               debhelper (>= 8),
+Build-Depends: cdbs (>= 0.4.93),
+               debhelper (>= 9),
                dh-autoreconf,
                gnome-common (>= 3.6.0),
                gnome-pkg-tools (>= 0.11),
@@ -32,6 +32,8 @@
 Package: libgdata22
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgdata-common
@@ -45,6 +47,7 @@
 Package: libgdata-common
 Section: libs
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Description: Library for accessing GData webservices - common data files
  libgdata is a GLib-based library for accessing online service APIs using
@@ -56,6 +59,7 @@
 Package: libgdata-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libgdata22 (= ${binary:Version}),
          gir1.2-gdata-0.0 (= ${binary:Version}),
          ${misc:Depends},
@@ -91,6 +95,7 @@
 Package: gir1.2-gdata-0.0
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}

Modified: packages/experimental/libgdata/debian/gir1.2-gdata-0.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libgdata/debian/gir1.2-gdata-0.0.install?rev=45339&op=diff
==============================================================================
--- packages/experimental/libgdata/debian/gir1.2-gdata-0.0.install	[utf-8] (original)
+++ packages/experimental/libgdata/debian/gir1.2-gdata-0.0.install	[utf-8] Sun Jun 21 18:46:15 2015
@@ -1 +1 @@
-usr/lib/girepository-1.0/*.typelib
+usr/lib/*/girepository-1.0/*.typelib

Modified: packages/experimental/libgdata/debian/libgdata-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libgdata/debian/libgdata-dev.install?rev=45339&op=diff
==============================================================================
--- packages/experimental/libgdata/debian/libgdata-dev.install	[utf-8] (original)
+++ packages/experimental/libgdata/debian/libgdata-dev.install	[utf-8] Sun Jun 21 18:46:15 2015
@@ -1,7 +1,7 @@
 usr/include/libgdata/gdata/*
-usr/lib/libgdata.a
-usr/lib/libgdata.so
-usr/lib/pkgconfig/libgdata*
+usr/lib/*/libgdata.a
+usr/lib/*/libgdata.so
+usr/lib/*/pkgconfig/libgdata*
 usr/share/gir-1.0/*.gir
 usr/share/vala/vapi/*.vapi
 usr/share/vala/vapi/*.deps

Modified: packages/experimental/libgdata/debian/libgdata22.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libgdata/debian/libgdata22.install?rev=45339&op=diff
==============================================================================
--- packages/experimental/libgdata/debian/libgdata22.install	[utf-8] (original)
+++ packages/experimental/libgdata/debian/libgdata22.install	[utf-8] Sun Jun 21 18:46:15 2015
@@ -1 +1 @@
-usr/lib/libgdata.so.*
+usr/lib/*/libgdata.so.*

Modified: packages/experimental/libgdata/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libgdata/debian/rules?rev=45339&op=diff
==============================================================================
--- packages/experimental/libgdata/debian/rules	[utf-8] (original)
+++ packages/experimental/libgdata/debian/rules	[utf-8] Sun Jun 21 18:46:15 2015
@@ -12,6 +12,8 @@
 
 DEB_DH_AUTORECONF_ARGS = --as-needed
 
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
 libgdata := $(shell sed -nr 's/^Package:[[:space:]]*(libgdata[0-9]+)[[:space:]]*$$/\1/p' debian/control)

More information about the pkg-gnome-commits mailing list