[Python-apps-commits] r4947 - in packages/mercurial/trunk/debian (4 files)

[vdanjean at users.alioth.debian.org]

    Date: Friday, March 12, 2010 @ 14:54:48
  Author: vdanjean
Revision: 4947

Refresh patch for template/ and help/ directories

Added:
  packages/mercurial/trunk/debian/mercurial-common.dirs
Modified:
  packages/mercurial/trunk/debian/mercurial-common.install
  packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
  packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately

Added: packages/mercurial/trunk/debian/mercurial-common.dirs
===================================================================
--- packages/mercurial/trunk/debian/mercurial-common.dirs	                        (rev 0)
+++ packages/mercurial/trunk/debian/mercurial-common.dirs	2010-03-12 14:54:48 UTC (rev 4947)
@@ -0,0 +1 @@
+usr/share/mercurial/help

Modified: packages/mercurial/trunk/debian/mercurial-common.install
===================================================================
--- packages/mercurial/trunk/debian/mercurial-common.install	2010-03-12 14:54:35 UTC (rev 4946)
+++ packages/mercurial/trunk/debian/mercurial-common.install	2010-03-12 14:54:48 UTC (rev 4947)
@@ -1,5 +1,5 @@
-help usr/share/mercurial
-templates usr/share/mercurial
+mercurial/help/*.txt usr/share/mercurial/help
+mercurial/templates usr/share/mercurial
 debian/tmp/usr/lib
 
 contrib/mq.el usr/share/emacs/site-lisp

Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2010-03-12 14:54:35 UTC (rev 4946)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2010-03-12 14:54:48 UTC (rev 4947)
@@ -2,7 +2,7 @@
 
 --- a/mercurial/help.py
 +++ b/mercurial/help.py
-@@ -70,9 +70,11 @@
+@@ -73,9 +73,11 @@
              module = __file__
          base = os.path.dirname(module)
  
@@ -18,12 +18,13 @@
          path = os.path.join(docdir, topic + ".txt")
 --- a/setup.py
 +++ b/setup.py
-@@ -256,7 +256,7 @@
+@@ -257,8 +257,7 @@
+                                      ['hgext/inotify/linux/_inotify.c']))
          packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
  
- datafiles = []
--for root in ('help',):
-+for root in ():
-     for dir, dirs, files in os.walk(root):
-         dirs[:] = [x for x in dirs if not x.startswith('.')]
-         files = [x for x in files if not x.startswith('.')]
+-packagedata = {'mercurial': ['locale/*/LC_MESSAGES/hg.mo',
+-                             'help/*.txt']}
++packagedata = {'mercurial': ['locale/*/LC_MESSAGES/hg.mo']}
+ 
+ def ordinarypath(p):
+     return p and p[0] != '.' and p[-1] != '~'

Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately	2010-03-12 14:54:35 UTC (rev 4946)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately	2010-03-12 14:54:48 UTC (rev 4947)
@@ -13,12 +13,18 @@
  def parsestring(s, quoted=True):
 --- a/setup.py
 +++ b/setup.py
-@@ -256,7 +256,7 @@
-         packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
+@@ -263,14 +263,6 @@
+ def ordinarypath(p):
+     return p and p[0] != '.' and p[-1] != '~'
  
+-for root in ('templates',):
+-    for curdir, dirs, files in os.walk(os.path.join('mercurial', root)):
+-        curdir = curdir.split(os.sep, 1)[1]
+-        dirs[:] = filter(ordinarypath, dirs)
+-        for f in filter(ordinarypath, files):
+-            f = os.path.join(curdir, f)
+-            packagedata['mercurial'].append(f)
+-
  datafiles = []
--for root in ('templates', 'help'):
-+for root in ('help',):
-     for dir, dirs, files in os.walk(root):
-         dirs[:] = [x for x in dirs if not x.startswith('.')]
-         files = [x for x in files if not x.startswith('.')]
+ setupversion = version
+ extra = {}