r31809 - in /desktop/unstable/gtk+3.0/debian: changelog control control.in libgtk-3-0.install.in libgtk-3-bin.links.in libgtk-3-common.install libgtk-3-common.install.in

joss at users.alioth.debian.org joss at users.alioth.debian.org
Wed Nov 23 18:07:25 UTC 2011


Author: joss
Date: Wed Nov 23 18:07:24 2011
New Revision: 31809

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31809
Log:
* Break murrine-themes (same reason as gnome-themes-standard).
* Move /etc/gtk-3.0 to libgtk-3-common.
* Add appropriate Breaks/Replaces to handle it.
* Remove gtk-query-immodules-3.0 from libgtk-3-bin since it is 
  clearly not Multi-Arch compatible. It should not be needed anyway, 
  everything is handled by triggers from the private directory.
* Remove incorrect M-A: same statement for the debug package.

Added:
    desktop/unstable/gtk+3.0/debian/libgtk-3-common.install.in
      - copied, changed from r31798, desktop/unstable/gtk+3.0/debian/libgtk-3-common.install
Removed:
    desktop/unstable/gtk+3.0/debian/libgtk-3-common.install
Modified:
    desktop/unstable/gtk+3.0/debian/changelog
    desktop/unstable/gtk+3.0/debian/control
    desktop/unstable/gtk+3.0/debian/control.in
    desktop/unstable/gtk+3.0/debian/libgtk-3-0.install.in
    desktop/unstable/gtk+3.0/debian/libgtk-3-bin.links.in

Modified: desktop/unstable/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/changelog?rev=31809&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog [utf-8] Wed Nov 23 18:07:24 2011
@@ -1,5 +1,6 @@
 gtk+3.0 (3.2.2-3) UNRELEASED; urgency=low
 
+  [ Martin Pitt ]
   * Add 000git_gtk_tree_view_get_tooltip_context_annotation.patch: Fix
     gtk_tree_view_get_tooltip_context() transfer annotation, causing crashes
     when using this method from Python.
@@ -31,6 +32,15 @@
       pre-multiarch module directory when searching for modules. This
       maintains compatibility with packages installing modules to
       the old directories.
+
+  [ Josselin Mouette ]
+  * Break murrine-themes (same reason as gnome-themes-standard).
+  * Move /etc/gtk-3.0 to libgtk-3-common.
+  * Add appropriate Breaks/Replaces to handle it.
+  * Remove gtk-query-immodules-3.0 from libgtk-3-bin since it is 
+    clearly not Multi-Arch compatible. It should not be needed anyway, 
+    everything is handled by triggers from the private directory.
+  * Remove incorrect M-A: same statement for the debug package.
 
  -- Martin Pitt <mpitt at debian.org>  Tue, 22 Nov 2011 09:34:45 +0100
 

Modified: desktop/unstable/gtk+3.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/control?rev=31809&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/control [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/control [utf-8] Wed Nov 23 18:07:24 2011
@@ -63,7 +63,8 @@
           gvfs
 Conflicts: libgtk3.0-0
 Replaces: libgtk3.0-0
-Breaks: gnome-themes-standard (<< 3.2)
+Breaks: gnome-themes-standard (<< 3.2),
+        murrine-themes (<= 0.98.2)
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Description: GTK+ graphical user interface library
@@ -101,7 +102,9 @@
 Depends: ${misc:Depends}
 Recommends: libgtk-3-0
 Conflicts: libgtk3.0-common
-Replaces: libgtk3.0-common
+Breaks: libgtk-3-0 (<< 3.2.2-3)
+Replaces: libgtk3.0-common,
+          libgtk-3-0 (<< 3.2.2-3)
 Multi-Arch: foreign
 Description: common files for the GTK+ graphical user interface library
  GTK+ is a multi-platform toolkit for creating graphical user
@@ -176,7 +179,6 @@
          ${misc:Depends}
 Conflicts: libgtk3.0-0-dbg
 Replaces: libgtk3.0-0-dbg
-Multi-Arch: same
 Description: GTK+ libraries and debugging symbols
  GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, GTK+ is suitable

Modified: desktop/unstable/gtk+3.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/control.in?rev=31809&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/control.in [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/control.in [utf-8] Wed Nov 23 18:07:24 2011
@@ -63,7 +63,8 @@
           gvfs
 Conflicts: libgtk3.0-0
 Replaces: libgtk3.0-0
-Breaks: gnome-themes-standard (<< 3.2)
+Breaks: gnome-themes-standard (<< 3.2),
+        murrine-themes (<= 0.98.2)
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Description: GTK+ graphical user interface library
@@ -101,7 +102,9 @@
 Depends: ${misc:Depends}
 Recommends: @SHARED_PKG@
 Conflicts: libgtk3.0-common
-Replaces: libgtk3.0-common
+Breaks: @SHARED_PKG@ (<< 3.2.2-3)
+Replaces: libgtk3.0-common,
+          @SHARED_PKG@ (<< 3.2.2-3)
 Multi-Arch: foreign
 Description: common files for the GTK+ graphical user interface library
  GTK+ is a multi-platform toolkit for creating graphical user
@@ -176,7 +179,6 @@
          ${misc:Depends}
 Conflicts: libgtk3.0-0-dbg
 Replaces: libgtk3.0-0-dbg
-Multi-Arch: same
 Description: GTK+ libraries and debugging symbols
  GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, GTK+ is suitable

Modified: desktop/unstable/gtk+3.0/debian/libgtk-3-0.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/libgtk-3-0.install.in?rev=31809&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/libgtk-3-0.install.in [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/libgtk-3-0.install.in [utf-8] Wed Nov 23 18:07:24 2011
@@ -1,5 +1,4 @@
 # from the shared flavor
-debian/install/shared/@CONFDIR@/im-multipress.conf @CONFDIR@
 debian/install/shared/usr/bin/gtk-query-immodules-3.0 @LIBDIR@/@SHARED_PKG@
 debian/install/shared/usr/bin/gtk-update-icon-cache @LIBDIR@/@SHARED_PKG@
 debian/install/shared/@MODULES_BASE_PATH@/immodules/*.so @MODULES_BASE_PATH@/immodules

Modified: desktop/unstable/gtk+3.0/debian/libgtk-3-bin.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/libgtk-3-bin.links.in?rev=31809&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/libgtk-3-bin.links.in [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/libgtk-3-bin.links.in [utf-8] Wed Nov 23 18:07:24 2011
@@ -1,4 +1,3 @@
- at LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 usr/bin/gtk-query-immodules-3.0
 @LIBDIR@/@SHARED_PKG@/gtk-update-icon-cache-3.0 usr/bin/gtk-update-icon-cache-3.0
 usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@BIN_PKG@/NEWS.gz
 usr/share/doc/@COMMON_PKG@/README usr/share/doc/@BIN_PKG@/README

Copied: desktop/unstable/gtk+3.0/debian/libgtk-3-common.install.in (from r31798, desktop/unstable/gtk+3.0/debian/libgtk-3-common.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/libgtk-3-common.install.in?rev=31809&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/libgtk-3-common.install [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/libgtk-3-common.install.in [utf-8] Wed Nov 23 18:07:24 2011
@@ -1,4 +1,5 @@
 # from the shared flavor
+debian/install/shared/@CONFDIR@/im-multipress.conf @CONFDIR@
 debian/install/shared/usr/share/locale usr/share
 debian/install/shared/usr/share/themes usr/share
 debian/install/shared/usr/share/glib-2.0 usr/share




More information about the pkg-gnome-commits mailing list