[Python-apps-commits] r8346 - in packages/rabbitvcs/trunk/debian (changelog control)

[adejong at users.alioth.debian.org]

    Date: Sunday, March 18, 2012 @ 21:26:34
  Author: adejong
Revision: 8346

  * Have rabbitvcs-nautilus Conflicts/Replaces rabbitvcs-nautilus3 to
    ensure smooth upgrades for people running upstream provided packages.

Modified:
  packages/rabbitvcs/trunk/debian/changelog
  packages/rabbitvcs/trunk/debian/control

Modified: packages/rabbitvcs/trunk/debian/changelog
===================================================================
--- packages/rabbitvcs/trunk/debian/changelog	2012-03-18 14:05:17 UTC (rev 8345)
+++ packages/rabbitvcs/trunk/debian/changelog	2012-03-18 21:26:34 UTC (rev 8346)
@@ -11,6 +11,8 @@
     (LP: #748304).
   * Drop dependency on glade (not used in 0.15).
   * Add missing dependency on python-simplejson (LP: #769742)
+  * Have rabbitvcs-nautilus Conflicts/Replaces rabbitvcs-nautilus3 to
+    ensure smooth upgrades for people running upstream provided packages.
   * Update debian/copyright and switch to latest machine-readable format.
   * Move packaging to Python Applications Packaging Team repository,
     updating maintainer and Vcs-* fields.
@@ -22,7 +24,7 @@
   [ Sameer Rahmani ]
   * watch file fixed.
 
- -- Arthur de Jong <adejong at debian.org>  Sun, 18 Mar 2012 15:04:44 +0100
+ -- Arthur de Jong <adejong at debian.org>  Sun, 18 Mar 2012 22:24:56 +0100
 
 rabbitvcs (0.13.1-2) unstable; urgency=low
 

Modified: packages/rabbitvcs/trunk/debian/control
===================================================================
--- packages/rabbitvcs/trunk/debian/control	2012-03-18 14:05:17 UTC (rev 8345)
+++ packages/rabbitvcs/trunk/debian/control	2012-03-18 21:26:34 UTC (rev 8346)
@@ -56,6 +56,8 @@
  and Git. This is the extension for gedit text editor.
 
 Package: rabbitvcs-nautilus
+Conflicts: rabbitvcs-nautilus3
+Replaces: rabbitvcs-nautilus3
 Architecture: all
 Depends: ${misc:Depends},
          nautilus (>= 3~),