r50941 - in /desktop/unstable/libgnomekbd/debian: changelog control control.in gir1.2-gkbd-3.0.install libgnomekbd-dev.install libgnomekbd8.install rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Sep 20 22:36:46 2016
New Revision: 50941

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50941
Log:
Convert to multiarch. (Closes: #813011)

Modified:
    desktop/unstable/libgnomekbd/debian/changelog
    desktop/unstable/libgnomekbd/debian/control
    desktop/unstable/libgnomekbd/debian/control.in
    desktop/unstable/libgnomekbd/debian/gir1.2-gkbd-3.0.install
    desktop/unstable/libgnomekbd/debian/libgnomekbd-dev.install
    desktop/unstable/libgnomekbd/debian/libgnomekbd8.install
    desktop/unstable/libgnomekbd/debian/rules

Modified: desktop/unstable/libgnomekbd/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomekbd/debian/changelog?rev=50941&op=diff
==============================================================================
--- desktop/unstable/libgnomekbd/debian/changelog	[utf-8] (original)
+++ desktop/unstable/libgnomekbd/debian/changelog	[utf-8] Tue Sep 20 22:36:46 2016
@@ -14,6 +14,7 @@
     pkg-config instead. (Closes: #829895)
   * Convert from cdbs to dh.
   * Bump debhelper compat level to 10.
+  * Convert to multiarch. (Closes: #813011)
 
  -- Jeremy Bicha <jbicha at ubuntu.com>  Mon, 29 Jul 2013 20:02:22 -0400
 

Modified: desktop/unstable/libgnomekbd/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomekbd/debian/control?rev=50941&op=diff
==============================================================================
--- desktop/unstable/libgnomekbd/debian/control	[utf-8] (original)
+++ desktop/unstable/libgnomekbd/debian/control	[utf-8] Tue Sep 20 22:36:46 2016
@@ -24,6 +24,7 @@
 Package: libgnomekbd-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: gir1.2-gkbd-3.0 (= ${binary:Version}),
          libglib2.0-dev (>= 2.26),
          libgnomekbd8 (= ${binary:Version}),
@@ -43,6 +44,7 @@
 Package: libgnomekbd8
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: iso-codes,
          libgnomekbd-common (>= ${source:Version}),
          ${misc:Depends},
@@ -58,6 +60,7 @@
 Package: libgnomekbd-common
 Section: libs
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: gkbd-capplet (<= 2.91.2-1)
 Breaks: gkbd-capplet (<= 2.91.2-1)
@@ -81,6 +84,7 @@
 Package: gir1.2-gkbd-3.0
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Conflicts: gir1.2-gnomekbd-3.0
 Replaces: gir1.2-gnomekbd-3.0

Modified: desktop/unstable/libgnomekbd/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomekbd/debian/control.in?rev=50941&op=diff
==============================================================================
--- desktop/unstable/libgnomekbd/debian/control.in	[utf-8] (original)
+++ desktop/unstable/libgnomekbd/debian/control.in	[utf-8] Tue Sep 20 22:36:46 2016
@@ -20,6 +20,7 @@
 Package: libgnomekbd-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: gir1.2-gkbd-3.0 (= ${binary:Version}),
          libglib2.0-dev (>= 2.26),
          libgnomekbd8 (= ${binary:Version}),
@@ -39,6 +40,7 @@
 Package: libgnomekbd8
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: iso-codes,
          libgnomekbd-common (>= ${source:Version}),
          ${misc:Depends},
@@ -54,6 +56,7 @@
 Package: libgnomekbd-common
 Section: libs
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: gkbd-capplet (<= 2.91.2-1)
 Breaks: gkbd-capplet (<= 2.91.2-1)
@@ -77,6 +80,7 @@
 Package: gir1.2-gkbd-3.0
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Conflicts: gir1.2-gnomekbd-3.0
 Replaces: gir1.2-gnomekbd-3.0

Modified: desktop/unstable/libgnomekbd/debian/gir1.2-gkbd-3.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomekbd/debian/gir1.2-gkbd-3.0.install?rev=50941&op=diff
==============================================================================
--- desktop/unstable/libgnomekbd/debian/gir1.2-gkbd-3.0.install	[utf-8] (original)
+++ desktop/unstable/libgnomekbd/debian/gir1.2-gkbd-3.0.install	[utf-8] Tue Sep 20 22:36:46 2016
@@ -1 +1 @@
-usr/lib/girepository-1.0/
+usr/lib/*/girepository-1.0/

Modified: desktop/unstable/libgnomekbd/debian/libgnomekbd-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomekbd/debian/libgnomekbd-dev.install?rev=50941&op=diff
==============================================================================
--- desktop/unstable/libgnomekbd/debian/libgnomekbd-dev.install	[utf-8] (original)
+++ desktop/unstable/libgnomekbd/debian/libgnomekbd-dev.install	[utf-8] Tue Sep 20 22:36:46 2016
@@ -1,5 +1,5 @@
 usr/include
-usr/lib/*.a
-usr/lib/*.so
-usr/lib/pkgconfig
+usr/lib/*/*.a
+usr/lib/*/*.so
+usr/lib/*/pkgconfig
 usr/share/gir-1.0/

Modified: desktop/unstable/libgnomekbd/debian/libgnomekbd8.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomekbd/debian/libgnomekbd8.install?rev=50941&op=diff
==============================================================================
--- desktop/unstable/libgnomekbd/debian/libgnomekbd8.install	[utf-8] (original)
+++ desktop/unstable/libgnomekbd/debian/libgnomekbd8.install	[utf-8] Tue Sep 20 22:36:46 2016
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

Modified: desktop/unstable/libgnomekbd/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomekbd/debian/rules?rev=50941&op=diff
==============================================================================
--- desktop/unstable/libgnomekbd/debian/rules	[utf-8] (original)
+++ desktop/unstable/libgnomekbd/debian/rules	[utf-8] Tue Sep 20 22:36:46 2016
@@ -12,7 +12,6 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--libdir=\$${prefix}/lib \
 		--enable-introspection
 
 override_dh_install: