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

[vicho at users.alioth.debian.org]

    Date: Sunday, November 9, 2014 @ 22:56:35
  Author: vicho
Revision: 11568

Fix FHS paths in mercurial 3.2

Added:
  packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/series

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2014-11-09 16:22:49 UTC (rev 11567)
+++ packages/mercurial/trunk/debian/changelog	2014-11-09 22:56:35 UTC (rev 11568)
@@ -1,9 +1,11 @@
 mercurial (3.2-1) UNRELEASED; urgency=medium
 
   * New upstream release
-  * Drop deb_specific__support_templates_in_fsh.patch,
+  * Replace 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
+    deb_specific__support_mo_in_fhs.patch with
+    deb_specific__fix_fhs_paths.py as the mechanism to specify the path to
+    datafiles has been unified.
   * Remove from_upstream__test-
     patchbomb_t_work_around_Python_change_d579866d6419_issue4188.patch
     as it is now included upstream

Added: packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch	2014-11-09 22:56:35 UTC (rev 11568)
@@ -0,0 +1,20 @@
+Description: Use FHS compliant path for data
+ mercurial installs expects its data files next to their py files in
+ /usr/lib/python2.7/dist-packages/mercurial .  We put data file in the
+ fhs compliant /usr/share/mercurial .
+Author: Javi Merino <vicho at debian.org>
+
+--- a/mercurial/util.py
++++ b/mercurial/util.py
+@@ -578,8 +578,10 @@ def mainfrozen():
+ if mainfrozen():
+     # executable version (py2exe) doesn't support __file__
+     datapath = os.path.dirname(sys.executable)
+-else:
++elif sys.argv[0] == "gendoc.py":
+     datapath = os.path.dirname(__file__)
++else:
++    datapath = "/usr/share/mercurial"
+ 
+ i18n.setdatapath(datapath)
+ 

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2014-11-09 16:22:49 UTC (rev 11567)
+++ packages/mercurial/trunk/debian/patches/series	2014-11-09 22:56:35 UTC (rev 11568)
@@ -5,3 +5,4 @@
 deb_specific__disable_libdir_replacement.patch
 for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
 for_upstream__lenient_test-shelve.patch
+deb_specific__fix_fhs_paths.patch