r31369 - in /desktop/unstable/gtk+2.0/debian: changelog control control.in libgtk2.0-0.install.in libgtk2.0-common.install libgtk2.0-common.install.in

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Nov 13 16:58:27 2011
New Revision: 31369

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31369
Log:
* Move /etc/gtk-2.0 to libgtk2.0-common.
* Add appropriate Breaks/Replaces to handle it.

Added:
    desktop/unstable/gtk+2.0/debian/libgtk2.0-common.install.in
      - copied, changed from r31297, desktop/unstable/gtk+2.0/debian/libgtk2.0-common.install
Removed:
    desktop/unstable/gtk+2.0/debian/libgtk2.0-common.install
Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/control
    desktop/unstable/gtk+2.0/debian/control.in
    desktop/unstable/gtk+2.0/debian/libgtk2.0-0.install.in

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=31369&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/changelog [utf-8] Sun Nov 13 16:58:27 2011
@@ -1,3 +1,10 @@
+gtk+2.0 (2.24.8-2) UNRELEASED; urgency=low
+
+  * Move /etc/gtk-2.0 to libgtk2.0-common.
+  * Add appropriate Breaks/Replaces to handle it.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 13 Nov 2011 17:37:06 +0100
+
 gtk+2.0 (2.24.8-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/unstable/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control?rev=31369&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/control [utf-8] Sun Nov 13 16:58:27 2011
@@ -97,6 +97,8 @@
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: libgtk2.0-0
+Replaces: libgtk2.0-0 (<< 2.24.8-2)
+Breaks: libgtk2.0-0 (<< 2.24.8-2)
 Multi-Arch: foreign
 Description: common files for the GTK+ graphical user interface library
  GTK+ is a multi-platform toolkit for creating graphical user

Modified: desktop/unstable/gtk+2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control.in?rev=31369&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control.in [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/control.in [utf-8] Sun Nov 13 16:58:27 2011
@@ -97,6 +97,8 @@
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: @SHARED_PKG@
+Replaces: @SHARED_PKG@ (<< 2.24.8-2)
+Breaks: @SHARED_PKG@ (<< 2.24.8-2)
 Multi-Arch: foreign
 Description: common files for the GTK+ graphical user interface library
  GTK+ is a multi-platform toolkit for creating graphical user

Modified: desktop/unstable/gtk+2.0/debian/libgtk2.0-0.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-0.install.in?rev=31369&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-0.install.in [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-0.install.in [utf-8] Sun Nov 13 16:58:27 2011
@@ -1,5 +1,4 @@
 # from the shared flavor
-debian/install/shared/etc/gtk- at APIVER@/im-multipress.conf etc/gtk- at APIVER@
 debian/install/shared/usr/bin/gtk-query-immodules-2.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

Copied: desktop/unstable/gtk+2.0/debian/libgtk2.0-common.install.in (from r31297, desktop/unstable/gtk+2.0/debian/libgtk2.0-common.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-common.install.in?rev=31369&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-common.install [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-common.install.in [utf-8] Sun Nov 13 16:58:27 2011
@@ -1,3 +1,4 @@
 # from the shared flavor
+debian/install/shared/etc/gtk- at APIVER@/im-multipress.conf etc/gtk- at APIVER@
 debian/install/shared/usr/share/locale usr/share
 debian/install/shared/usr/share/themes usr/share