r35946 - in /desktop/experimental/mutter/debian: changelog control control.in libmutter0.install libmutter0a.install rules

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sun Oct 14 17:12:37 2012
New Revision: 35946

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35946
Log:
debian/control.in: Rename libmutter0 to libmutter0a as the libmutter ABI
broke

Added:
    desktop/experimental/mutter/debian/libmutter0a.install
      - copied unchanged from r35930, desktop/experimental/mutter/debian/libmutter0.install
Removed:
    desktop/experimental/mutter/debian/libmutter0.install
Modified:
    desktop/experimental/mutter/debian/changelog
    desktop/experimental/mutter/debian/control
    desktop/experimental/mutter/debian/control.in
    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=35946&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/changelog [utf-8] (original)
+++ desktop/experimental/mutter/debian/changelog [utf-8] Sun Oct 14 17:12:37 2012
@@ -5,10 +5,10 @@
     - Drop unnecessary gnome-doc-utils install
   * d/p/00_meta_window_move_frame-fix-crash-when-frame-is-NULL.patch:
     Dropped: fixed upstream
-  * debian/control.in: libmutter0 breaks gnome-shell (<< 3.6.0) as it broke
-    ABI... Final solution pending
-
- -- Sjoerd Simons <sjoerd at debian.org>  Thu, 11 Oct 2012 22:56:08 +0200
+  * debian/control.in: Rename libmutter0 to libmutter0a as the libmutter ABI
+    broke
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 14 Oct 2012 19:10:10 +0200
 
 mutter (3.4.1-5) unstable; urgency=low
 

Modified: desktop/experimental/mutter/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/control?rev=35946&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/control [utf-8] (original)
+++ desktop/experimental/mutter/debian/control [utf-8] Sun Oct 14 17:12:37 2012
@@ -72,7 +72,7 @@
 Section: debug
 Priority: extra
 Depends: mutter (= ${binary:Version}),
-         libmutter0 (= ${binary:Version}),
+         libmutter0a (= ${binary:Version}),
          ${misc:Depends}
 Description: Debugging symbols for the Mutter window manager
  Mutter is a small window manager, using GTK+ and Clutter to do
@@ -85,14 +85,14 @@
  .
  This package contains detached debugging symbols.
 
-Package: libmutter0
+Package: libmutter0a
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gsettings-desktop-schemas (>= 3.3.2),
+         gsettings-desktop-schemas (>= 3.6.0),
          mutter-common (= ${source:Version})
-Breaks: gnome-shell (<< 3.6.0)
+Conflicts: libmutter0
 Description: window manager library from the Mutter window manager
  Mutter is a small window manager, using GTK+ and Clutter to do
  everything.
@@ -125,7 +125,7 @@
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
-         libmutter0 (= ${binary:Version}),
+         libmutter0a (= ${binary:Version}),
          gir1.2-mutter-3.0 (= ${binary:Version}),
          gsettings-desktop-schemas-dev (>= 3.3.2),
          libclutter-1.0-dev (>= 1.9.10),

Modified: desktop/experimental/mutter/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/control.in?rev=35946&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/control.in [utf-8] (original)
+++ desktop/experimental/mutter/debian/control.in [utf-8] Sun Oct 14 17:12:37 2012
@@ -67,7 +67,7 @@
 Section: debug
 Priority: extra
 Depends: mutter (= ${binary:Version}),
-         libmutter0 (= ${binary:Version}),
+         libmutter0a (= ${binary:Version}),
          ${misc:Depends}
 Description: Debugging symbols for the Mutter window manager
  Mutter is a small window manager, using GTK+ and Clutter to do
@@ -80,14 +80,14 @@
  .
  This package contains detached debugging symbols.
 
-Package: libmutter0
+Package: libmutter0a
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gsettings-desktop-schemas (>= 3.3.2),
+         gsettings-desktop-schemas (>= 3.6.0),
          mutter-common (= ${source:Version})
-Breaks: gnome-shell (<< 3.6.0)
+Conflicts: libmutter0
 Description: window manager library from the Mutter window manager
  Mutter is a small window manager, using GTK+ and Clutter to do
  everything.
@@ -120,7 +120,7 @@
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
-         libmutter0 (= ${binary:Version}),
+         libmutter0a (= ${binary:Version}),
          gir1.2-mutter-3.0 (= ${binary:Version}),
          gsettings-desktop-schemas-dev (>= 3.3.2),
          libclutter-1.0-dev (>= 1.9.10),

Modified: desktop/experimental/mutter/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/rules?rev=35946&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/rules [utf-8] (original)
+++ desktop/experimental/mutter/debian/rules [utf-8] Sun Oct 14 17:12:37 2012
@@ -11,7 +11,7 @@
 DEB_CONFIGURE_EXTRA_FLAGS += \
 	--enable-startup-notification=yes \
 	--enable-compile-warnings=yes
-DEB_DH_MAKESHLIBS_ARGS_libmutter0 += -V'libmutter0 (>= $(DEB_GNOME_VERSION)), libmutter0 (<< $(DEB_GNOME_NEXTVERSION))' -- -c4
+DEB_DH_MAKESHLIBS_ARGS_libmutter0 += -V'libmutter0a (>= $(DEB_GNOME_VERSION)), libmutter0a (<< $(DEB_GNOME_NEXTVERSION))' -- -c4
 DEB_INSTALL_DOCS_mutter += doc/theme-format.txt
 DEB_DH_GIREPOSITORY_ARGS_ALL := /usr/lib/mutter