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

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Oct 11 14:04:11 2011
New Revision: 30173

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30173
Log:
Remove old Conflicts and Replaces.

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=30173&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog [utf-8] (original)
+++ desktop/experimental/nautilus/debian/changelog [utf-8] Tue Oct 11 14:04:11 2011
@@ -8,6 +8,7 @@
     - Bump Standards-Version to 3.9.2. No further changes.
     - Bump Build-Depends on cdbs to (>= 0.4.90) to ensure dh_girepository is
       called.
+    - Remove old Conflicts and Replaces.
   * debian/rules:
     - Remove clean-la.mk since we don't install any .la files.
     - Drop call to dh_girepository

Modified: desktop/experimental/nautilus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/control?rev=30173&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/control [utf-8] (original)
+++ desktop/experimental/nautilus/debian/control [utf-8] Tue Oct 11 14:04:11 2011
@@ -67,15 +67,12 @@
           totem | mp3-decoder,
           xdg-user-dirs,
           tracker
-Conflicts: libnautilus2-2,
-           libnautilus2-dev
 Breaks: gnome-volume-manager (<< 2.24),
         rhythmbox (<< 0.12),
         gnome-session (<< 2.28),
         nautilus-sendto-empathy (<< 3.0),
         gnome-bluetooth (<< 3.0)
-Replaces: libnautilus2-2,
-          nautilus-sendto
+Replaces: nautilus-sendto
 Description: file manager and graphical shell for GNOME
  Nautilus is the official file manager for the GNOME desktop. It allows
  to browse directories, preview files and launch applications associated
@@ -103,7 +100,7 @@
  .
  This development package contains unstripped binaries compiled with
  debugging symbols needed by gdb.
- 
+
 Package: libnautilus-extension1a
 Architecture: any
 Section: libs
@@ -127,8 +124,6 @@
          libgtk-3-dev (>= 3.0.0),
          ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libnautilus2-dev
-Replaces: libnautilus2-dev
 Description: libraries for nautilus components - development version
  Nautilus is the official file manager and graphical shell for the
  GNOME desktop.
@@ -154,7 +149,6 @@
 Package: nautilus-data
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: nautilus (<< 2.14.1-3)
 Recommends: nautilus
 Description: data files for nautilus
  Nautilus is the official file manager and graphical shell for the

Modified: desktop/experimental/nautilus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/control.in?rev=30173&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/control.in [utf-8] (original)
+++ desktop/experimental/nautilus/debian/control.in [utf-8] Tue Oct 11 14:04:11 2011
@@ -62,15 +62,12 @@
           totem | mp3-decoder,
           xdg-user-dirs,
           tracker
-Conflicts: libnautilus2-2,
-           libnautilus2-dev
 Breaks: gnome-volume-manager (<< 2.24),
         rhythmbox (<< 0.12),
         gnome-session (<< 2.28),
         nautilus-sendto-empathy (<< 3.0),
         gnome-bluetooth (<< 3.0)
-Replaces: libnautilus2-2,
-          nautilus-sendto
+Replaces: nautilus-sendto
 Description: file manager and graphical shell for GNOME
  Nautilus is the official file manager for the GNOME desktop. It allows
  to browse directories, preview files and launch applications associated
@@ -98,7 +95,7 @@
  .
  This development package contains unstripped binaries compiled with
  debugging symbols needed by gdb.
- 
+
 Package: libnautilus-extension1a
 Architecture: any
 Section: libs
@@ -122,8 +119,6 @@
          libgtk-3-dev (>= 3.0.0),
          ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libnautilus2-dev
-Replaces: libnautilus2-dev
 Description: libraries for nautilus components - development version
  Nautilus is the official file manager and graphical shell for the
  GNOME desktop.
@@ -149,7 +144,6 @@
 Package: nautilus-data
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: nautilus (<< 2.14.1-3)
 Recommends: nautilus
 Description: data files for nautilus
  Nautilus is the official file manager and graphical shell for the