[Python-apps-commits] r5743 - in packages/mercurial/trunk/debian (changelog control)

[vdanjean at users.alioth.debian.org]

    Date: Sunday, July 4, 2010 @ 07:58:01
  Author: vdanjean
Revision: 5743

Fix Breaks/Conflicts/Replaces

and update changelog accordingly

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

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2010-07-04 07:34:25 UTC (rev 5742)
+++ packages/mercurial/trunk/debian/changelog	2010-07-04 07:58:01 UTC (rev 5743)
@@ -1,5 +1,6 @@
 mercurial (1.6-1) unstable; urgency=low
 
+  [ Javi Merino ]
   * New upstream release (1.6). Many bug fixes and improvements. Among
       them:
     - push: break infinite http recursion bug with Python 2.6.5
@@ -9,8 +10,15 @@
       #581122 is included upstream.
   * Updated Standards-Version to 3.9 (no change needed)
 
- -- Javi Merino <cibervicho at gmail.com>  Fri, 02 Jul 2010 19:45:53 +0200
+  [ Vincent Danjean ]
+  * debian/control:
+    + Use Breaks instead of Conflicts
+    + Use a fixed version in Replaces
+      I put 1.4 but it has been a long time since nothing has been moved
+      from mercurial to mercurial-common
 
+ -- Vincent Danjean <vdanjean at debian.org>  Sun, 04 Jul 2010 09:55:28 +0200
+
 mercurial (1.5.4-2) unstable; urgency=low
 
   * Fix regression in python 2.6.5 (Closes: #586907)

Modified: packages/mercurial/trunk/debian/control
===================================================================
--- packages/mercurial/trunk/debian/control	2010-07-04 07:34:25 UTC (rev 5742)
+++ packages/mercurial/trunk/debian/control	2010-07-04 07:58:01 UTC (rev 5743)
@@ -22,8 +22,8 @@
  python-mysqldb, 
  python-pygments,
  python-openssl
-Conflicts: mercurial (<< ${binary:Version})
-Replaces: mercurial (<< ${binary:Version})
+Breaks: mercurial (<< ${binary:Version})
+Replaces: mercurial (<< 1.4)
 Description: scalable distributed version control system (common files)
  Mercurial is a fast, lightweight Source Control Management system designed
  for efficient handling of very large distributed projects.