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

[vicho at users.alioth.debian.org]

    Date: Saturday, May 2, 2015 @ 08:15:24
  Author: vicho
Revision: 11894

Delete patch for_upstream__fix_typo_in_man_page.patch as it is applied upstream

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

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2015-05-02 08:15:05 UTC (rev 11893)
+++ packages/mercurial/trunk/debian/changelog	2015-05-02 08:15:24 UTC (rev 11894)
@@ -1,6 +1,8 @@
 mercurial (3.4-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Delete patch for_upstream__fix_typo_in_man_page.patch as it is applied
+    upstream
 
  -- Javi Merino <vicho at debian.org>  Sat, 02 May 2015 09:07:38 +0100
 

Deleted: packages/mercurial/trunk/debian/patches/for_upstream__fix_typo_in_man_page.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__fix_typo_in_man_page.patch	2015-05-02 08:15:05 UTC (rev 11893)
+++ packages/mercurial/trunk/debian/patches/for_upstream__fix_typo_in_man_page.patch	2015-05-02 08:15:24 UTC (rev 11894)
@@ -1,16 +0,0 @@
-Description: help: fix typo commited -> committed
-Author: Javi Merino <merino.jav at gmail.com>
-Forwarded: http://thread.gmane.org/gmane.comp.version-control.mercurial.devel/78868
-
-diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
---- a/mercurial/help/config.txt
-+++ b/mercurial/help/config.txt
-@@ -828,7 +828,7 @@ variables it is passed are listed with n
-   ``HG_PHASES_MOVED`` to ``1``, etc.
- 
- ``txnclose``
--  Run after any repository transaction has been commited. At this
-+  Run after any repository transaction has been committed. At this
-   point, the transaction can no longer be rolled back. The hook will run
-   after the lock is released. see ``pretxnclose`` docs for details about
-   available variables.

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2015-05-02 08:15:05 UTC (rev 11893)
+++ packages/mercurial/trunk/debian/patches/series	2015-05-02 08:15:24 UTC (rev 11894)
@@ -5,4 +5,3 @@
 deb_specific__disable_libdir_replacement.patch
 for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
 deb_specific__fix_fhs_paths.patch
-for_upstream__fix_typo_in_man_page.patch