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

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

    Date: Friday, March 6, 2009 @ 09:43:53
  Author: vt-guest
Revision: 2538

Mercurial 1.2

Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/deb_specific__fix_version_for_snapshot.patch
  packages/mercurial/trunk/debian/patches/deb_specific__mergetools

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2009-03-06 07:33:24 UTC (rev 2537)
+++ packages/mercurial/trunk/debian/changelog	2009-03-06 09:43:53 UTC (rev 2538)
@@ -1,9 +1,11 @@
-mercurial (1.1.2+hg20090217-7787-b8d750daadde-2) UNRELEASED; urgency=low
+mercurial (1.2-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+
   * Fix FTBFS with python-support 0.90 by removing dependence on
     python-support internals. (closes: #516269)
 
- -- Vernon Tang <vt at foilhead.net>  Sat, 21 Feb 2009 17:22:07 +0800
+ -- Vernon Tang <vt at foilhead.net>  Fri, 06 Mar 2009 17:37:45 +0800
 
 mercurial (1.1.2+hg20090217-7787-b8d750daadde-1) experimental; urgency=low
 

Modified: packages/mercurial/trunk/debian/patches/deb_specific__fix_version_for_snapshot.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__fix_version_for_snapshot.patch	2009-03-06 07:33:24 UTC (rev 2537)
+++ packages/mercurial/trunk/debian/patches/deb_specific__fix_version_for_snapshot.patch	2009-03-06 09:43:53 UTC (rev 2538)
@@ -6,7 +6,7 @@
  f = file("mercurial/__version__.py", "w")
  f.write('# this file is autogenerated by setup.py\n')
 -f.write('version = "%s"\n' % version)
-+f.write('version = "%s"\n' % "b8d750daadde")
++f.write('version = "%s"\n' % "1.2")
  f.close()
  
  class install_package_data(install_data):

Modified: packages/mercurial/trunk/debian/patches/deb_specific__mergetools
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__mergetools	2009-03-06 07:33:24 UTC (rev 2537)
+++ packages/mercurial/trunk/debian/patches/deb_specific__mergetools	2009-03-06 09:43:53 UTC (rev 2538)
@@ -1,6 +1,6 @@
 Remove merge tools irrelevant to a Debian system and RCS merge and add vimdiff
 
-diff -r 9f73bddb9d0b contrib/mergetools.hgrc
+diff -r 11efa41037e2 contrib/mergetools.hgrc
 --- a/contrib/mergetools.hgrc
 +++ b/contrib/mergetools.hgrc
 @@ -12,8 +12,8 @@
@@ -31,7 +31,7 @@
 -filemerge.args=-left $other -right $local -ancestor $base -merge $output
 -filemerge.gui=True
 -
- beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centerfile=base /righttitle=other /automerge /reviewconflicts
+ beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centerfile=base /righttitle=other /automerge /reviewconflicts /solo
  beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
  beyondcompare3.regname=ExePath
  beyondcompare3.gui=True