r55037 - in /desktop/experimental/mutter/debian: changelog control.in gir1.2-mutter-1.install gir1.2-mutter-2.install libmutter-1-0.install libmutter-1-dev.install libmutter-2-0.install libmutter-2-dev.install patches/bump-api.patch patches/series rules

jbicha at users.alioth.debian.org jbicha at users.alioth.debian.org
Thu Feb 22 13:49:30 UTC 2018 

Author: jbicha
Date: Thu Feb 22 13:49:30 2018
New Revision: 55037

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=55037
Log:
Update package names for soname bump

Added:
    desktop/experimental/mutter/debian/gir1.2-mutter-2.install
      - copied unchanged from r55036, desktop/experimental/mutter/debian/gir1.2-mutter-1.install
    desktop/experimental/mutter/debian/libmutter-2-0.install
      - copied, changed from r55036, desktop/experimental/mutter/debian/libmutter-1-0.install
    desktop/experimental/mutter/debian/libmutter-2-dev.install
      - copied unchanged from r55036, desktop/experimental/mutter/debian/libmutter-1-dev.install
    desktop/experimental/mutter/debian/patches/bump-api.patch
Removed:
    desktop/experimental/mutter/debian/gir1.2-mutter-1.install
    desktop/experimental/mutter/debian/libmutter-1-0.install
    desktop/experimental/mutter/debian/libmutter-1-dev.install
Modified:
    desktop/experimental/mutter/debian/changelog
    desktop/experimental/mutter/debian/control.in
    desktop/experimental/mutter/debian/patches/series
    desktop/experimental/mutter/debian/rules

Modified: desktop/experimental/mutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/changelog?rev=55037&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/changelog	[utf-8] (original)
+++ desktop/experimental/mutter/debian/changelog	[utf-8] Thu Feb 22 13:49:30 2018
@@ -2,6 +2,8 @@
 
   * New upstream development release
   * Bump minimum libgbm-dev to 17.1 and libdrm-dev to 2.4.83
+  * Cherry-pick bump-api.patch
+  * Update package names for soname bump
 
  -- Jeremy Bicha <jbicha at debian.org>  Thu, 22 Feb 2018 08:25:14 -0500
 

Modified: desktop/experimental/mutter/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/control.in?rev=55037&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/control.in	[utf-8] (original)
+++ desktop/experimental/mutter/debian/control.in	[utf-8] Thu Feb 22 13:49:30 2018
@@ -78,7 +78,7 @@
  .
  This package contains the core binaries.
 
-Package: libmutter-1-0
+Package: libmutter-2-0
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -116,13 +116,13 @@
  .
  This package contains the shared files.
 
-Package: libmutter-1-dev
+Package: libmutter-2-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
-         libmutter-1-0 (= ${binary:Version}),
-         gir1.2-mutter-1 (= ${binary:Version}),
+         libmutter-2-0 (= ${binary:Version}),
+         gir1.2-mutter-2 (= ${binary:Version}),
          gsettings-desktop-schemas-dev,
          libgtk-3-dev,
          libcairo2-dev,
@@ -145,7 +145,7 @@
          libxfixes-dev,
          libxrandr-dev,
          libx11-dev
-Conflicts: libmutter-0-dev
+Conflicts: libmutter-0-dev, libmutter-1-dev
 Description: Development files for the Mutter window manager
  Mutter is a small window manager, using GTK+ and Clutter to do
  everything.
@@ -157,14 +157,14 @@
  .
  This package contains the development files.
 
-Package: gir1.2-mutter-1
+Package: gir1.2-mutter-2
 Section: introspection
 Architecture: any
 Multi-Arch: same
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends},
-         libmutter-1-0 (= ${binary:Version})
+         libmutter-2-0 (= ${binary:Version})
 Breaks: gnome-shell (<< 3.13.92~)
 Description: GObject introspection data for Mutter
  Mutter is a small window manager, using GTK+ and Clutter to do

Copied: desktop/experimental/mutter/debian/libmutter-2-0.install (from r55036, desktop/experimental/mutter/debian/libmutter-1-0.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/libmutter-2-0.install?rev=55037&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/libmutter-1-0.install	[utf-8] (original)
+++ desktop/experimental/mutter/debian/libmutter-2-0.install	[utf-8] Thu Feb 22 13:49:30 2018
@@ -1,2 +1,2 @@
-usr/lib/*/libmutter-1.so.*
+usr/lib/*/libmutter-2.so.*
 usr/lib/*/mutter/*.so

Added: desktop/experimental/mutter/debian/patches/bump-api.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/bump-api.patch?rev=55037&op=file
==============================================================================
--- desktop/experimental/mutter/debian/patches/bump-api.patch	(added)
+++ desktop/experimental/mutter/debian/patches/bump-api.patch	[utf-8] Thu Feb 22 13:49:30 2018
@@ -0,0 +1,27 @@
+From 962712ddc2dbfc72c7d84d444569832cf7e12b0d Mon Sep 17 00:00:00 2001
+From: Jonas Ådahl <jadahl at gmail.com>
+Date: Wed, 21 Feb 2018 23:39:13 +0800
+Subject: [PATCH] configure.ac: Bump API version number
+
+Better late then never.
+
+Closes: https://gitlab.gnome.org/GNOME/mutter/issues/6
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index fb6202a..721a62f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,7 +9,7 @@ m4_define([mutter_version],
+ 
+ m4_define([mutter_plugin_api_version], [3])
+ 
+-m4_define([libmutter_api_version], [1])
++m4_define([libmutter_api_version], [2])
+ 
+ AC_INIT([mutter], [mutter_version],
+         [http://bugzilla.gnome.org/enter_bug.cgi?product=mutter])
+
+

Modified: desktop/experimental/mutter/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/series?rev=55037&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/mutter/debian/patches/series	[utf-8] Thu Feb 22 13:49:30 2018
@@ -1,3 +1,4 @@
 bgo768531_workaround-startup-notifications.patch
 skip-failing-tests.patch
 skip-failing-tests-325.patch
+bump-api.patch

Modified: desktop/experimental/mutter/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/rules?rev=55037&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/rules	[utf-8] (original)
+++ desktop/experimental/mutter/debian/rules	[utf-8] Thu Feb 22 13:49:30 2018
@@ -49,7 +49,7 @@
 	dh_girepository /usr/lib/$(DEB_HOST_MULTIARCH)/mutter
 
 override_dh_makeshlibs:
-	dh_makeshlibs -V'libmutter-1-0 (>= 3.25.90)'
+	dh_makeshlibs -V'libmutter-2-0 (>= 3.27.91)'
 
 override_dh_strip:
 	dh_strip --dbgsym-migration='mutter-dbg (<< 3.18.3-2~)'

More information about the pkg-gnome-commits mailing list