r13670 - in /desktop/unstable/metacity/debian: changelog control control.in

[lool at users.alioth.debian.org]

Author: lool
Date: Wed Nov 28 18:01:13 2007
New Revision: 13670

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13670
Log:
* Let metacity-common replace metacity instead of conflicting to ease
  upgrades.

Modified:
    desktop/unstable/metacity/debian/changelog
    desktop/unstable/metacity/debian/control
    desktop/unstable/metacity/debian/control.in

Modified: desktop/unstable/metacity/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/changelog?rev=13670&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/changelog (original)
+++ desktop/unstable/metacity/debian/changelog Wed Nov 28 18:01:13 2007
@@ -1,3 +1,10 @@
+metacity (1:2.20.1-2) UNRELEASED; urgency=low
+
+  * Let metacity-common replace metacity instead of conflicting to ease
+    upgrades.
+
+ -- Loic Minier <lool at dooz.org>  Wed, 28 Nov 2007 19:00:45 +0100
+
 metacity (1:2.20.1-1) unstable; urgency=low
 
   [ Josselin Mouette ]

Modified: desktop/unstable/metacity/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/control?rev=13670&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/control (original)
+++ desktop/unstable/metacity/debian/control Wed Nov 28 18:01:13 2007
@@ -65,7 +65,7 @@
 Section: misc
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: metacity (<< 1:2.12.3-1)
+Replaces: metacity (<< 1:2.12.3-1)
 Description: Shared files of lightweight GTK2 based Window Manager
  Metacity is a small window manager, using gtk2 to do everything.
  .

Modified: desktop/unstable/metacity/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/control.in?rev=13670&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/control.in (original)
+++ desktop/unstable/metacity/debian/control.in Wed Nov 28 18:01:13 2007
@@ -65,7 +65,7 @@
 Section: misc
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: metacity (<< 1:2.12.3-1)
+Replaces: metacity (<< 1:2.12.3-1)
 Description: Shared files of lightweight GTK2 based Window Manager
  Metacity is a small window manager, using gtk2 to do everything.
  .