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

[vicho at users.alioth.debian.org]

    Date: Monday, April 7, 2014 @ 22:07:18
  Author: vicho
Revision: 10749

Drop patch deb_specific__fix_hg-ssh_interpreter.patch as dh_python2
fixes the interpreter for us

Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/series
Deleted:
  packages/mercurial/trunk/debian/patches/deb_specific__fix_hg-ssh_interpreter.patch

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2014-04-07 21:58:43 UTC (rev 10748)
+++ packages/mercurial/trunk/debian/changelog	2014-04-07 22:07:18 UTC (rev 10749)
@@ -2,6 +2,8 @@
 
   * Don't explicitly change the python interpreter in debian/rules, it's
     already handled by dh_python2
+  * Drop patch deb_specific__fix_hg-ssh_interpreter.patch as dh_python2
+    fixes the interpreter for us
 
  -- Javi Merino <vicho at debian.org>  Sun, 06 Apr 2014 13:18:06 +0100
 

Deleted: packages/mercurial/trunk/debian/patches/deb_specific__fix_hg-ssh_interpreter.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__fix_hg-ssh_interpreter.patch	2014-04-07 21:58:43 UTC (rev 10748)
+++ packages/mercurial/trunk/debian/patches/deb_specific__fix_hg-ssh_interpreter.patch	2014-04-07 22:07:18 UTC (rev 10749)
@@ -1,17 +0,0 @@
-Author: Javi Merino <cibervicho at gmail.com>
-Description: Fix python interpreter for hg-ssh
- hg-ssh is installed by dh_install instead of setup.py, so it's
- interpreter is not fixed automatically for us.  System-wide commands
- should use /usr/bin/python as the Debian Python Policy recommends.
-Bug-Debian: http://bugs.debian.org/654925
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/912625
-Forwarded: not-needed
-
---- a/contrib/hg-ssh
-+++ b/contrib/hg-ssh
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2005-2007 by Intevation GmbH <intevation at intevation.de>
- #

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2014-04-07 21:58:43 UTC (rev 10748)
+++ packages/mercurial/trunk/debian/patches/series	2014-04-07 22:07:18 UTC (rev 10749)
@@ -6,6 +6,5 @@
 proposed_upstream__correct-zeroconf-doc
 deb_specific__support_mo_in_fhs.patch
 deb_specific__disable_libdir_replacement.patch
-deb_specific__fix_hg-ssh_interpreter.patch
 for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
 for_upstream__lenient_test-shelve.patch