r49201 - in /desktop/unstable/mutter/debian: changelog control control.in gir1.2-mutter-3.0.install libmutter-dev.install libmutter0h.install mutter.install rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Thu Jun 30 07:27:23 UTC 2016 

Author: biebl
Date: Thu Jun 30 07:27:23 2016
New Revision: 49201

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

Modified:
    desktop/unstable/mutter/debian/changelog
    desktop/unstable/mutter/debian/control
    desktop/unstable/mutter/debian/control.in
    desktop/unstable/mutter/debian/gir1.2-mutter-3.0.install
    desktop/unstable/mutter/debian/libmutter-dev.install
    desktop/unstable/mutter/debian/libmutter0h.install
    desktop/unstable/mutter/debian/mutter.install
    desktop/unstable/mutter/debian/rules

Modified: desktop/unstable/mutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/changelog?rev=49201&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/changelog	[utf-8] (original)
+++ desktop/unstable/mutter/debian/changelog	[utf-8] Thu Jun 30 07:27:23 2016
@@ -2,6 +2,7 @@
 
   * New upstream release.
   * Drop all patches which are now applied upstream.
+  * Convert to multiarch.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 30 Jun 2016 00:36:26 +0200
 

Modified: desktop/unstable/mutter/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/control?rev=49201&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/control	[utf-8] (original)
+++ desktop/unstable/mutter/debian/control	[utf-8] Thu Jun 30 07:27:23 2016
@@ -83,6 +83,8 @@
 Package: libmutter0h
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          gsettings-desktop-schemas (>= 3.15.92),
@@ -110,6 +112,7 @@
 Package: mutter-common
 Section: misc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Description: shared files for the Mutter window manager
  Mutter is a small window manager, using GTK+ and Clutter to do
@@ -125,6 +128,7 @@
 Package: libmutter-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          libmutter0h (= ${binary:Version}),
          gir1.2-mutter-3.0 (= ${binary:Version}),
@@ -146,6 +150,7 @@
 Package: gir1.2-mutter-3.0
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends},

Modified: desktop/unstable/mutter/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/control.in?rev=49201&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/control.in	[utf-8] (original)
+++ desktop/unstable/mutter/debian/control.in	[utf-8] Thu Jun 30 07:27:23 2016
@@ -79,6 +79,8 @@
 Package: libmutter0h
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          gsettings-desktop-schemas (>= 3.15.92),
@@ -106,6 +108,7 @@
 Package: mutter-common
 Section: misc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Description: shared files for the Mutter window manager
  Mutter is a small window manager, using GTK+ and Clutter to do
@@ -121,6 +124,7 @@
 Package: libmutter-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          libmutter0h (= ${binary:Version}),
          gir1.2-mutter-3.0 (= ${binary:Version}),
@@ -142,6 +146,7 @@
 Package: gir1.2-mutter-3.0
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends},

Modified: desktop/unstable/mutter/debian/gir1.2-mutter-3.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/gir1.2-mutter-3.0.install?rev=49201&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/gir1.2-mutter-3.0.install	[utf-8] (original)
+++ desktop/unstable/mutter/debian/gir1.2-mutter-3.0.install	[utf-8] Thu Jun 30 07:27:23 2016
@@ -1 +1 @@
-usr/lib/mutter/Meta-*.typelib
+usr/lib/*/mutter/Meta-*.typelib

Modified: desktop/unstable/mutter/debian/libmutter-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/libmutter-dev.install?rev=49201&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/libmutter-dev.install	[utf-8] (original)
+++ desktop/unstable/mutter/debian/libmutter-dev.install	[utf-8] Thu Jun 30 07:27:23 2016
@@ -1,4 +1,4 @@
 usr/include
-usr/lib/lib*.so
-usr/lib/pkgconfig/*.pc
-usr/lib/mutter/Meta-*.gir
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*.pc
+usr/lib/*/mutter/Meta-*.gir

Modified: desktop/unstable/mutter/debian/libmutter0h.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/libmutter0h.install?rev=49201&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/libmutter0h.install	[utf-8] (original)
+++ desktop/unstable/mutter/debian/libmutter0h.install	[utf-8] Thu Jun 30 07:27:23 2016
@@ -1 +1 @@
-usr/lib/libmutter.so.*
+usr/lib/*/libmutter.so.*

Modified: desktop/unstable/mutter/debian/mutter.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/mutter.install?rev=49201&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/mutter.install	[utf-8] (original)
+++ desktop/unstable/mutter/debian/mutter.install	[utf-8] Thu Jun 30 07:27:23 2016
@@ -1,4 +1,4 @@
 usr/bin
 usr/lib/mutter/mutter-restart-helper
-usr/lib/mutter/plugins
+usr/lib/*/mutter/plugins
 usr/share/applications

Modified: desktop/unstable/mutter/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/rules?rev=49201&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/rules	[utf-8] (original)
+++ desktop/unstable/mutter/debian/rules	[utf-8] Thu Jun 30 07:27:23 2016
@@ -11,6 +11,7 @@
 DEB_DH_AUTORECONF_ARGS = --as-needed
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
+	--libdir="\$${prefix}/lib/$(DEB_HOST_MULTIARCH)" \
 	--enable-startup-notification=yes \
 	--enable-compile-warnings=yes

More information about the pkg-gnome-commits mailing list