[Python-apps-commits] r11553 - in packages/mercurial/trunk/debian (5 files)

[vicho at users.alioth.debian.org]

    Date: Saturday, November 8, 2014 @ 10:22:43
  Author: vicho
Revision: 11553

Drop deb_specific__support_templates_in_fsh.patch, deb_specific__support_help_in_fhs.patch and deb_specific__support_mo_in_fhs.patch as they are no longer needed

Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/series
Deleted:
  packages/mercurial/trunk/debian/patches/deb_specific__support_help_in_fhs.patch
  packages/mercurial/trunk/debian/patches/deb_specific__support_mo_in_fhs.patch
  packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2014-11-08 10:22:37 UTC (rev 11552)
+++ packages/mercurial/trunk/debian/changelog	2014-11-08 10:22:43 UTC (rev 11553)
@@ -1,6 +1,9 @@
 mercurial (3.2-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Drop deb_specific__support_templates_in_fsh.patch,
+    deb_specific__support_help_in_fhs.patch and
+    deb_specific__support_mo_in_fhs.patch as they are no longer needed
 
  -- Javi Merino <vicho at debian.org>  Sun, 02 Nov 2014 12:55:06 +0000
 

Deleted: packages/mercurial/trunk/debian/patches/deb_specific__support_help_in_fhs.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__support_help_in_fhs.patch	2014-11-08 10:22:37 UTC (rev 11552)
+++ packages/mercurial/trunk/debian/patches/deb_specific__support_help_in_fhs.patch	2014-11-08 10:22:43 UTC (rev 11553)
@@ -1,20 +0,0 @@
-Author: Vernon Tang <vt at foilhead.net>
-Description: Support installation of help topics in FHS.
-Forwarded: not-needed
-
---- a/mercurial/help.py
-+++ b/mercurial/help.py
-@@ -134,9 +134,11 @@ def loaddoc(topic):
-             module = __file__
-         base = os.path.dirname(module)
- 
-+        docdir = '/usr/share/mercurial/help'
-         for dir in ('.', '..'):
--            docdir = os.path.join(base, dir, 'help')
--            if os.path.isdir(docdir):
-+            tmpdocdir = os.path.join(base, dir, 'help')
-+            if os.path.isdir(tmpdocdir):
-+                docdir = tmpdocdir
-                 break
- 
-         path = os.path.join(docdir, topic + ".txt")

Deleted: packages/mercurial/trunk/debian/patches/deb_specific__support_mo_in_fhs.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__support_mo_in_fhs.patch	2014-11-08 10:22:37 UTC (rev 11552)
+++ packages/mercurial/trunk/debian/patches/deb_specific__support_mo_in_fhs.patch	2014-11-08 10:22:43 UTC (rev 11553)
@@ -1,15 +0,0 @@
-Author: Vincent Danjean <vdanjean at debian.org>
-Description: Look for *.mo files in /usr/share/locale (FHS compliant)
-Forwarded: not-needed
-
---- a/mercurial/i18n.py
-+++ b/mercurial/i18n.py
-@@ -15,7 +15,7 @@ else:
-     module = __file__
- 
- base = os.path.dirname(module)
--for dir in ('.', '..'):
-+for dir in ('.', '..', '/usr/share'):
-     localedir = os.path.join(base, dir, 'locale')
-     if os.path.isdir(localedir):
-         break

Deleted: packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch	2014-11-08 10:22:37 UTC (rev 11552)
+++ packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch	2014-11-08 10:22:43 UTC (rev 11553)
@@ -1,15 +0,0 @@
-Author: Vernon Tang <vt at foilhead.net>
-Description: Support installation of templates in FHS.
-Forwarded: not-needed
-
---- a/mercurial/templater.py
-+++ b/mercurial/templater.py
-@@ -530,7 +530,7 @@ funcs = {
- 
- # template engine
- 
--path = ['templates', '../templates']
-+path = ['templates', '../templates', '/usr/share/mercurial/templates']
- stringify = templatefilters.stringify
- 
- def _flatten(thing):

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2014-11-08 10:22:37 UTC (rev 11552)
+++ packages/mercurial/trunk/debian/patches/series	2014-11-08 10:22:43 UTC (rev 11553)
@@ -1,10 +1,7 @@
-deb_specific__support_templates_in_fsh.patch
-deb_specific__support_help_in_fhs.patch
 deb_specific__use_sensible-editor.patch
 deb_specific__hgk.py.patch
 deb_specific__optional-dependencies
 proposed_upstream__correct-zeroconf-doc
-deb_specific__support_mo_in_fhs.patch
 deb_specific__disable_libdir_replacement.patch
 for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
 for_upstream__lenient_test-shelve.patch