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

[vdanjean at users.alioth.debian.org]

    Date: Saturday, April 10, 2010 @ 08:02:19
  Author: vdanjean
Revision: 5098

Install mo file in correct FHS directory

Added:
  packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch
Modified:
  packages/mercurial/trunk/debian/mercurial-common.install
  packages/mercurial/trunk/debian/patches/series

Modified: packages/mercurial/trunk/debian/mercurial-common.install
===================================================================
--- packages/mercurial/trunk/debian/mercurial-common.install	2010-04-10 08:01:55 UTC (rev 5097)
+++ packages/mercurial/trunk/debian/mercurial-common.install	2010-04-10 08:02:19 UTC (rev 5098)
@@ -1,5 +1,6 @@
 mercurial/help/*.txt usr/share/mercurial/help
 mercurial/templates usr/share/mercurial
+mercurial/locale usr/share
 debian/tmp/usr/lib
 
 contrib/mq.el usr/share/emacs/site-lisp

Added: packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch	2010-04-10 08:02:19 UTC (rev 5098)
@@ -0,0 +1,23 @@
+Look for *.mo files in /usr/share/locale (FHS compliant)
+--- a/mercurial/i18n.py
++++ b/mercurial/i18n.py
+@@ -15,7 +15,7 @@
+     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
+--- a/setup.py
++++ b/setup.py
+@@ -263,7 +263,7 @@
+                                      ['hgext/inotify/linux/_inotify.c']))
+         packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
+ 
+-packagedata = {'mercurial': ['locale/*/LC_MESSAGES/hg.mo']}
++packagedata = {'mercurial': []}
+ 
+ def ordinarypath(p):
+     return p and p[0] != '.' and p[-1] != '~'

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2010-04-10 08:01:55 UTC (rev 5097)
+++ packages/mercurial/trunk/debian/patches/series	2010-04-10 08:02:19 UTC (rev 5098)
@@ -7,3 +7,4 @@
 deb_specific__hgk.py.patch
 deb_specific__optional-dependencies
 proposed_upstream__correct-zeroconf-doc
+deb_specific__install-mo-fhs.patch