[Python-apps-commits] r2242 - in packages/mercurial/trunk/debian (3 files)

[vt-guest at users.alioth.debian.org]

    Date: Tuesday, January 20, 2009 @ 05:52:32
  Author: vt-guest
Revision: 2242

mercurial: update merge tools

  * debian/patches/deb_specific__mergetools, debian/control:
    remove merge from mergetools.rc and rcs from Recommends
  * debian/control: change merge tool Recommends to Suggests,
    add xxdiff merge tool to Suggests

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

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2009-01-19 19:20:59 UTC (rev 2241)
+++ packages/mercurial/trunk/debian/changelog	2009-01-20 05:52:32 UTC (rev 2242)
@@ -1,13 +1,20 @@
 mercurial (1.1.2-3) UNRELEASED; urgency=low
 
+  [ Vincent Danjean ]
   * swich to debhelper 7.
     Debhelper 5.0.37.2 is not enought: 6.0.7 at least is required for
     dh_lintian to be called.
   TO REMOVE BEFORE UPLOAD: no need to upload for now. The only effect is
   a lintian warning not overwritten in the backported package.
 
- -- Vincent Danjean <vdanjean at debian.org>  Mon, 19 Jan 2009 08:49:39 +0100
+  [ Vernon Tang ]
+  * debian/patches/deb_specific__mergetools, debian/control:
+    remove merge from mergetools.rc and rcs from Recommends
+  * debian/control: change merge tool Recommends to Suggests,
+    add xxdiff merge tool to Suggests
 
+ -- Vernon Tang <vt at foilhead.net>  Tue, 20 Jan 2009 13:49:13 +0800
+
 mercurial (1.1.2-2) unstable; urgency=low
 
   * debian/mercurial.postinst: symlink /usr/share/doc/mercurial if dpkg didn't

Modified: packages/mercurial/trunk/debian/control
===================================================================
--- packages/mercurial/trunk/debian/control	2009-01-19 19:20:59 UTC (rev 2241)
+++ packages/mercurial/trunk/debian/control	2009-01-20 05:52:32 UTC (rev 2242)
@@ -15,10 +15,10 @@
 Architecture: any 
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ucf (>= 2.0020),
  mercurial-common (= ${binary:Version})
-Recommends: rcs | kdiff3 | tkdiff | meld
 Suggests: qct, 
  wish, 
- vim | emacs
+ vim | emacs,
+ kdiff3 | tkdiff | meld | xxdiff
 Description: scalable distributed version control system
  Mercurial is a fast, lightweight Source Control Management system designed
  for efficient handling of very large distributed projects.

Modified: packages/mercurial/trunk/debian/patches/deb_specific__mergetools
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__mergetools	2009-01-19 19:20:59 UTC (rev 2241)
+++ packages/mercurial/trunk/debian/patches/deb_specific__mergetools	2009-01-20 05:52:32 UTC (rev 2242)
@@ -4,20 +4,18 @@
 diff -r 11a4eb81fb4f contrib/mergetools.hgrc
 --- a/contrib/mergetools.hgrc
 +++ b/contrib/mergetools.hgrc
-@@ -12,8 +12,11 @@
+@@ -12,8 +12,8 @@
  gvimdiff.regname=path
  gvimdiff.priority=-9
  
+-merge.checkconflicts=True
+-merge.priority=-10
 +vimdiff.args=$local $other $base
 +vimdiff.priority=-10
-+
- merge.checkconflicts=True
--merge.priority=-10
-+merge.priority=-11
  
  gpyfm.gui=True
  
-@@ -38,14 +41,6 @@
+@@ -38,14 +38,6 @@
  p4merge.gui=True
  p4merge.priority=-8