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

[vdanjean at users.alioth.debian.org]

    Date: Tuesday, February 16, 2010 @ 00:48:27
  Author: vdanjean
Revision: 4770

Document patch with upstream comments

Added:
  packages/mercurial/trunk/debian/patches/deb_specific__python-module-not-script.patch
    (from rev 4769, packages/mercurial/trunk/debian/patches/proposed_upstream__python-module-not-script.patch)
Modified:
  packages/mercurial/trunk/debian/patches/series
Deleted:
  packages/mercurial/trunk/debian/patches/proposed_upstream__python-module-not-script.patch

Copied: packages/mercurial/trunk/debian/patches/deb_specific__python-module-not-script.patch (from rev 4769, packages/mercurial/trunk/debian/patches/proposed_upstream__python-module-not-script.patch)
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__python-module-not-script.patch	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/deb_specific__python-module-not-script.patch	2010-02-16 00:48:27 UTC (rev 4770)
@@ -0,0 +1,23 @@
+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.
+
+Index: mercurial-git/mercurial/lsprof.py
+===================================================================
+--- mercurial-git.orig/mercurial/lsprof.py	2008-04-06 20:12:23.000000000 +0200
++++ mercurial-git/mercurial/lsprof.py	2008-04-06 20:15:46.000000000 +0200
+@@ -1,5 +1,3 @@
+-#! /usr/bin/env python
+-
+ import sys
+ from _lsprof import Profiler, profiler_entry
+ 
+Index: mercurial-git/mercurial/simplemerge.py
+===================================================================
+--- mercurial-git.orig/mercurial/simplemerge.py	2008-04-06 20:12:00.000000000 +0200
++++ mercurial-git/mercurial/simplemerge.py	2008-04-06 20:12:02.000000000 +0200
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ # Copyright (C) 2004, 2005 Canonical Ltd
+ #
+ # This program is free software; you can redistribute it and/or modify

Deleted: packages/mercurial/trunk/debian/patches/proposed_upstream__python-module-not-script.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/proposed_upstream__python-module-not-script.patch	2010-02-16 00:47:44 UTC (rev 4769)
+++ packages/mercurial/trunk/debian/patches/proposed_upstream__python-module-not-script.patch	2010-02-16 00:48:27 UTC (rev 4770)
@@ -1,21 +0,0 @@
-Remove shebang line from non-executable Python modules.
-
-Index: mercurial-git/mercurial/lsprof.py
-===================================================================
---- mercurial-git.orig/mercurial/lsprof.py	2008-04-06 20:12:23.000000000 +0200
-+++ mercurial-git/mercurial/lsprof.py	2008-04-06 20:15:46.000000000 +0200
-@@ -1,5 +1,3 @@
--#! /usr/bin/env python
--
- import sys
- from _lsprof import Profiler, profiler_entry
- 
-Index: mercurial-git/mercurial/simplemerge.py
-===================================================================
---- mercurial-git.orig/mercurial/simplemerge.py	2008-04-06 20:12:00.000000000 +0200
-+++ mercurial-git/mercurial/simplemerge.py	2008-04-06 20:12:02.000000000 +0200
-@@ -1,4 +1,3 @@
--#!/usr/bin/env python
- # Copyright (C) 2004, 2005 Canonical Ltd
- #
- # This program is free software; you can redistribute it and/or modify

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2010-02-16 00:47:44 UTC (rev 4769)
+++ packages/mercurial/trunk/debian/patches/series	2010-02-16 00:48:27 UTC (rev 4770)
@@ -2,7 +2,7 @@
 proposed_upstream__dont-install-i18n
 deb_specific__install-templates-separately
 deb_specific__install-help-separately
-proposed_upstream__python-module-not-script.patch
+deb_specific__python-module-not-script.patch
 deb_specific__use_sensible-editor.patch
 deb_specific__hgk.py.patch
 deb_specific__optional-dependencies