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

[vicho at users.alioth.debian.org]

    Date: Sunday, September 16, 2012 @ 11:44:38
  Author: vicho
Revision: 9119

Delete patch for_upstream__hgweb_fix_spelling_error.patch which is now included upstream

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

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2012-09-16 11:43:56 UTC (rev 9118)
+++ packages/mercurial/trunk/debian/changelog	2012-09-16 11:44:38 UTC (rev 9119)
@@ -1,6 +1,8 @@
 mercurial (2.3.1-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Delete patch for_upstream__hgweb_fix_spelling_error.patch which is
+    now included upstream
 
  -- Javi Merino <vicho at debian.org>  Sun, 16 Sep 2012 12:34:14 +0100
 

Deleted: packages/mercurial/trunk/debian/patches/for_upstream__hgweb_fix_spelling_error.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__hgweb_fix_spelling_error.patch	2012-09-16 11:43:56 UTC (rev 9118)
+++ packages/mercurial/trunk/debian/patches/for_upstream__hgweb_fix_spelling_error.patch	2012-09-16 11:44:38 UTC (rev 9119)
@@ -1,14 +0,0 @@
-Author: Javi Merino <vicho at debian.org>
-Description: help/hgweb: fix spelling error
-Forwarded: http://www.selenic.com/pipermail/mercurial-devel/2012-August/043344.html
-
-diff --git a/mercurial/help/hgweb.txt b/mercurial/help/hgweb.txt
---- a/mercurial/help/hgweb.txt
-+++ b/mercurial/help/hgweb.txt
-@@ -46,5 +46,5 @@ In this example::
- - The fourth entry will publish both ``http://server/user/bob/quux/``
-   and ``http://server/user/bob/quux/testsubrepo/``
- 
--The ``collections`` section is deprecated and has been superseeded by
-+The ``collections`` section is deprecated and has been superseded by
- ``paths``.

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2012-09-16 11:43:56 UTC (rev 9118)
+++ packages/mercurial/trunk/debian/patches/series	2012-09-16 11:44:38 UTC (rev 9119)
@@ -7,4 +7,3 @@
 deb_specific__install-mo-fhs.patch
 deb_specific__disable_libdir_replacement.patch
 deb_specific__fix_hg-ssh_interpreter.patch
-for_upstream__hgweb_fix_spelling_error.patch