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

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

    Date: Friday, July 2, 2010 @ 17:51:10
  Author: vicho-guest
Revision: 5723

Removed patch bashism in examples.patch

Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/series
Deleted:
  packages/mercurial/trunk/debian/patches/for_upstream__bashism_in_examples.patch

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2010-07-02 17:50:48 UTC (rev 5722)
+++ packages/mercurial/trunk/debian/changelog	2010-07-02 17:51:10 UTC (rev 5723)
@@ -5,8 +5,10 @@
     - push: break infinite http recursion bug with Python 2.6.5
          (issue2179 and issue2255) (Closes: #586907)
     - zeroconf: Don't use string exceptions (Closes: #585250)
+  * Removed patch for_upstream__bashism_in_examples.patch since a fix for
+      #581122 is included upstream.
 
- -- Javi Merino <cibervicho at gmail.com>  Fri, 02 Jul 2010 12:42:21 +0200
+ -- Javi Merino <cibervicho at gmail.com>  Fri, 02 Jul 2010 13:02:34 +0200
 
 mercurial (1.5.4-2) unstable; urgency=low
 

Deleted: packages/mercurial/trunk/debian/patches/for_upstream__bashism_in_examples.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__bashism_in_examples.patch	2010-07-02 17:50:48 UTC (rev 5722)
+++ packages/mercurial/trunk/debian/patches/for_upstream__bashism_in_examples.patch	2010-07-02 17:51:10 UTC (rev 5723)
@@ -1,10 +0,0 @@
-Fix bashism in hgeditor
-Close: #581122
---- a/hgeditor
-+++ b/hgeditor
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- #
- # This is an example of using HGEDITOR to create of diff to review the
- # changes while commiting.

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2010-07-02 17:50:48 UTC (rev 5722)
+++ packages/mercurial/trunk/debian/patches/series	2010-07-02 17:51:10 UTC (rev 5723)
@@ -8,5 +8,4 @@
 deb_specific__optional-dependencies
 proposed_upstream__correct-zeroconf-doc
 deb_specific__install-mo-fhs.patch
-for_upstream__bashism_in_examples.patch
 from_upstream__fix_regression_in_python_2_6_5