[Python-apps-commits] r6394 - in packages/mercurial/trunk/debian (4 files)

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

    Date: Monday, December 13, 2010 @ 21:35:03
  Author: vicho-guest
Revision: 6394

Delete deb_specific__python-module-not-script.patch and deb_specific__mergetools

They are now part of upstream.

Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/series
Deleted:
  packages/mercurial/trunk/debian/patches/deb_specific__mergetools
  packages/mercurial/trunk/debian/patches/deb_specific__python-module-not-script.patch

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2010-12-13 20:44:27 UTC (rev 6393)
+++ packages/mercurial/trunk/debian/changelog	2010-12-13 21:35:03 UTC (rev 6394)
@@ -2,8 +2,10 @@
 
   * New upstream release 1.7.2 (Closes: #606678)
   * Fix typo in NEWS (Closes: #605541)
+  * Delete deb_specific__python-module-not-script.patch and
+        deb_specific__mergetools
 
- -- Javi Merino <cibervicho at gmail.com>  Mon, 13 Dec 2010 20:41:09 +0000
+ -- Javi Merino <cibervicho at gmail.com>  Mon, 13 Dec 2010 21:19:08 +0000
 
 mercurial (1.6.4-1) unstable; urgency=low
 

Deleted: packages/mercurial/trunk/debian/patches/deb_specific__mergetools
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__mergetools	2010-12-13 20:44:27 UTC (rev 6393)
+++ packages/mercurial/trunk/debian/patches/deb_specific__mergetools	2010-12-13 21:35:03 UTC (rev 6394)
@@ -1,14 +0,0 @@
-Add vimdiff to mergetools
-
---- a/contrib/mergetools.hgrc
-+++ b/contrib/mergetools.hgrc
-@@ -13,6 +13,9 @@
- gvimdiff.regname=path
- gvimdiff.priority=-9
- 
-+vimdiff.args=$local $other $base
-+vimdiff.priority=-10
-+
- merge.checkconflicts=True
- merge.priority=-100
- 

Deleted: packages/mercurial/trunk/debian/patches/deb_specific__python-module-not-script.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__python-module-not-script.patch	2010-12-13 20:44:27 UTC (rev 6393)
+++ packages/mercurial/trunk/debian/patches/deb_specific__python-module-not-script.patch	2010-12-13 21:35:03 UTC (rev 6394)
@@ -1,12 +0,0 @@
-Remove shebang line from non-executable Python modules.
-Upstream do not want to apply this patch because these files come from
-another place and they do not want to modify them.
-
---- a/mercurial/lsprof.py
-+++ b/mercurial/lsprof.py
-@@ -1,5 +1,3 @@
--#! /usr/bin/env python
--
- import sys
- from _lsprof import Profiler, profiler_entry
- 

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2010-12-13 20:44:27 UTC (rev 6393)
+++ packages/mercurial/trunk/debian/patches/series	2010-12-13 21:35:03 UTC (rev 6394)
@@ -1,7 +1,5 @@
-deb_specific__mergetools
 deb_specific__install-templates-separately
 deb_specific__install-help-separately
-deb_specific__python-module-not-script.patch
 deb_specific__use_sensible-editor.patch
 deb_specific__hgk.py.patch
 deb_specific__optional-dependencies