r26005 - in /desktop/experimental/nautilus/debian: changelog control control.in

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sat Dec 18 19:04:23 2010
New Revision: 26005

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26005
Log:
debian/control.in: Add Conflicts/Replaces to gir1.0-nautilus-3.0

Modified:
    desktop/experimental/nautilus/debian/changelog
    desktop/experimental/nautilus/debian/control
    desktop/experimental/nautilus/debian/control.in

Modified: desktop/experimental/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/changelog?rev=26005&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog [utf-8] (original)
+++ desktop/experimental/nautilus/debian/changelog [utf-8] Sat Dec 18 19:04:23 2010
@@ -3,8 +3,9 @@
   * New upstream release
   * debian/patches/20-rename-extensions-directory.patch
     + Removed, fixed upstream
-
- -- Sjoerd Simons <sjoerd at debian.org>  Sat, 18 Dec 2010 18:42:30 +0000
+  * debian/control.in: Add Conflicts/Replaces to gir1.0-nautilus-3.0
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 18 Dec 2010 19:03:14 +0000
 
 nautilus (2.91.3-2) experimental; urgency=low
 

Modified: desktop/experimental/nautilus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/control?rev=26005&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/control [utf-8] (original)
+++ desktop/experimental/nautilus/debian/control [utf-8] Sat Dec 18 19:04:23 2010
@@ -152,6 +152,8 @@
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
+Conflicts: gir1.0-nautilus-3.0
+Replaces: gir1.0-nautilus-3.0
 Description: libraries for nautilus components - gir bindings
  Nautilus is the official file manager and graphical shell for the
  GNOME desktop.

Modified: desktop/experimental/nautilus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/control.in?rev=26005&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/control.in [utf-8] (original)
+++ desktop/experimental/nautilus/debian/control.in [utf-8] Sat Dec 18 19:04:23 2010
@@ -147,6 +147,8 @@
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
+Conflicts: gir1.0-nautilus-3.0
+Replaces: gir1.0-nautilus-3.0
 Description: libraries for nautilus components - gir bindings
  Nautilus is the official file manager and graphical shell for the
  GNOME desktop.