r44483 - in /desktop/unstable/libgweather/debian: changelog control control.in libgweather-3-6.install libgweather-3-dev.install rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Tue May 19 22:59:24 UTC 2015 

Author: biebl
Date: Tue May 19 22:59:23 2015
New Revision: 44483

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

Modified:
    desktop/unstable/libgweather/debian/changelog
    desktop/unstable/libgweather/debian/control
    desktop/unstable/libgweather/debian/control.in
    desktop/unstable/libgweather/debian/libgweather-3-6.install
    desktop/unstable/libgweather/debian/libgweather-3-dev.install
    desktop/unstable/libgweather/debian/rules

Modified: desktop/unstable/libgweather/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/changelog?rev=44483&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/changelog	[utf-8] (original)
+++ desktop/unstable/libgweather/debian/changelog	[utf-8] Tue May 19 22:59:23 2015
@@ -3,6 +3,7 @@
   * New upstream release.
   * Drop clean-la.mk include, we no longer ship any libtool .la files.
   * Add new gweather_location_new_detached symbol to symbols file.
+  * Convert to multiarch.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 20 May 2015 00:48:25 +0200
 

Modified: desktop/unstable/libgweather/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/control?rev=44483&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/control	[utf-8] (original)
+++ desktop/unstable/libgweather/debian/control	[utf-8] Tue May 19 22:59:23 2015
@@ -7,9 +7,9 @@
 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>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
                autotools-dev,
-               cdbs (>= 0.4.73),
+               cdbs (>= 0.4.93),
                gnome-common,
                gnome-pkg-tools,
                libxml2-dev (>= 2.6.0),
@@ -35,6 +35,7 @@
 Package: libgweather-3-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libgweather-3-6 (= ${binary:Version}),
          gir1.2-gweather-3.0 (= ${binary:Version}),
          libxml2-dev (>= 2.6.0),
@@ -50,6 +51,8 @@
 
 Package: libgweather-3-6
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgweather-common (>= 3.5.0)
@@ -61,6 +64,7 @@
 
 Package: libgweather-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Conflicts: libgweather1 (<< 2.22.2-2)
@@ -73,6 +77,7 @@
 Package: gir1.2-gweather-3.0
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}

Modified: desktop/unstable/libgweather/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/control.in?rev=44483&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/control.in	[utf-8] (original)
+++ desktop/unstable/libgweather/debian/control.in	[utf-8] Tue May 19 22:59:23 2015
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
                autotools-dev,
-               cdbs (>= 0.4.73),
+               cdbs (>= 0.4.93),
                gnome-common,
                gnome-pkg-tools,
                libxml2-dev (>= 2.6.0),
@@ -31,6 +31,7 @@
 Package: libgweather-3-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libgweather-3-6 (= ${binary:Version}),
          gir1.2-gweather-3.0 (= ${binary:Version}),
          libxml2-dev (>= 2.6.0),
@@ -46,6 +47,8 @@
 
 Package: libgweather-3-6
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgweather-common (>= 3.5.0)
@@ -57,6 +60,7 @@
 
 Package: libgweather-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Conflicts: libgweather1 (<< 2.22.2-2)
@@ -69,6 +73,7 @@
 Package: gir1.2-gweather-3.0
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}

Modified: desktop/unstable/libgweather/debian/libgweather-3-6.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/libgweather-3-6.install?rev=44483&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/libgweather-3-6.install	[utf-8] (original)
+++ desktop/unstable/libgweather/debian/libgweather-3-6.install	[utf-8] Tue May 19 22:59:23 2015
@@ -1 +1 @@
-usr/lib/libgweather-3.so.*
+usr/lib/*/libgweather-3.so.*

Modified: desktop/unstable/libgweather/debian/libgweather-3-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/libgweather-3-dev.install?rev=44483&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/libgweather-3-dev.install	[utf-8] (original)
+++ desktop/unstable/libgweather/debian/libgweather-3-dev.install	[utf-8] Tue May 19 22:59:23 2015
@@ -1,7 +1,7 @@
 usr/include/libgweather-3.0/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
 usr/share/gtk-doc
 usr/share/gir-1.0/GWeather-3.0.gir
 usr/share/vala/vapi/gweather-3.0.*

Modified: desktop/unstable/libgweather/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/rules?rev=44483&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/rules	[utf-8] (original)
+++ desktop/unstable/libgweather/debian/rules	[utf-8] Tue May 19 22:59:23 2015
@@ -10,6 +10,7 @@
 
 LDFLAGS += -Wl,-O1 -Wl,--as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-locations-compression \
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+                             --enable-locations-compression \
                              --enable-static \
                              --enable-gtk-doc

More information about the pkg-gnome-commits mailing list