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

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

    Date: Saturday, February 5, 2011 @ 21:18:03
  Author: vicho-guest
Revision: 6579

Delete patch for_upstream__typo_in_manpage.patch

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

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2011-02-05 21:17:46 UTC (rev 6578)
+++ packages/mercurial/trunk/debian/changelog	2011-02-05 21:18:03 UTC (rev 6579)
@@ -1,8 +1,10 @@
 mercurial (1.7.5-1) unstable; urgency=low
 
   * New upstream release 1.7.5
+  * Delete patch for_upstream__typo_in_manpage.patch which is now
+    included upstream
 
- -- Javi Merino <cibervicho at gmail.com>  Sat, 05 Feb 2011 20:44:04 +0000
+ -- Javi Merino <cibervicho at gmail.com>  Sat, 05 Feb 2011 20:53:42 +0000
 
 mercurial (1.7.3-1) experimental; urgency=low
 

Deleted: packages/mercurial/trunk/debian/patches/for_upstream__typo_in_manpage.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__typo_in_manpage.patch	2011-02-05 21:17:46 UTC (rev 6578)
+++ packages/mercurial/trunk/debian/patches/for_upstream__typo_in_manpage.patch	2011-02-05 21:18:03 UTC (rev 6579)
@@ -1,15 +0,0 @@
-s/extention/extension/
-
-I'll submit this soon to the mercurial mailing list.
-
---- a/hgext/win32mbcs.py
-+++ b/hgext/win32mbcs.py
-@@ -34,7 +34,7 @@
- 
- - You should use single encoding in one repository.
- - If the repository path ends with 0x5c, .hg/hgrc cannot be read.
--- win32mbcs is not compatible with fixutf8 extention.
-+- win32mbcs is not compatible with fixutf8 extension.
- 
- By default, win32mbcs uses encoding.encoding decided by Mercurial.
- You can specify the encoding by config option::

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2011-02-05 21:17:46 UTC (rev 6578)
+++ packages/mercurial/trunk/debian/patches/series	2011-02-05 21:18:03 UTC (rev 6579)
@@ -5,4 +5,3 @@
 deb_specific__optional-dependencies
 proposed_upstream__correct-zeroconf-doc
 deb_specific__install-mo-fhs.patch
-for_upstream__typo_in_manpage.patch