[Python-apps-commits] r4103 - in packages/mercurial/trunk/debian (8 files)

vt-guest at users.alioth.debian.org vt-guest at users.alioth.debian.org
Wed Nov 11 10:39:15 UTC 2009 

    Date: Wednesday, November 11, 2009 @ 10:39:10
  Author: vt-guest
Revision: 4103

mercurial: update for prospective 1.4 (based on dec177286deb)

Added:
  packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/control
  packages/mercurial/trunk/debian/mercurial-common.examples
  packages/mercurial/trunk/debian/mercurial-common.install
  packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
  packages/mercurial/trunk/debian/patches/for_upstream__force_C_locale.patch
  packages/mercurial/trunk/debian/patches/series

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2009-11-11 03:23:18 UTC (rev 4102)
+++ packages/mercurial/trunk/debian/changelog	2009-11-11 10:39:10 UTC (rev 4103)
@@ -1,10 +1,15 @@
 mercurial (1.4-1~hg) UNRELEASED; urgency=low
 
+  [ Vernon Tang ]
   * New upstream release.
+    - /usr/share/doc/mercurial-common/examples/hg-relink gone
+      (replaced by the relink extension)
+
+  [ Vincent Danjean ]
   * adjust quilt dependency so that it works with backports
     (ie quilt >> 0.46-6 instead of quilt >= 0.46-7)
 
- -- Vernon Tang <vt at foilhead.net>  Wed, 11 Nov 2009 14:18:36 +1100
+ -- Vernon Tang <vt at foilhead.net>  Wed, 11 Nov 2009 19:22:45 +1100
 
 mercurial (1.3.1-1) unstable; urgency=low
 

Modified: packages/mercurial/trunk/debian/control
===================================================================
--- packages/mercurial/trunk/debian/control	2009-11-11 03:23:18 UTC (rev 4102)
+++ packages/mercurial/trunk/debian/control	2009-11-11 10:39:10 UTC (rev 4103)
@@ -7,7 +7,7 @@
  Vernon Tang <vt at foilhead.net>
 Build-Depends: debhelper (>= 7.0.50), quilt (>> 0.46-6),
  patchutils (>= 0.2.25), gettext,
- python-support (>= 0.5.3), python-all-dev (>= 2.5.4-1~), xmlto, asciidoc
+ python-support (>= 0.5.3), python-all-dev (>= 2.5.4-1~), python-docutils
 Standards-Version: 3.8.2
 Homepage: http://www.selenic.com/mercurial/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/mercurial/trunk

Modified: packages/mercurial/trunk/debian/mercurial-common.examples
===================================================================
--- packages/mercurial/trunk/debian/mercurial-common.examples	2009-11-11 03:23:18 UTC (rev 4102)
+++ packages/mercurial/trunk/debian/mercurial-common.examples	2009-11-11 10:39:10 UTC (rev 4103)
@@ -2,14 +2,18 @@
 contrib/dumprevlog
 contrib/git-viz
 contrib/hgdiff
-contrib/hg-relink
 contrib/hgsh
+contrib/hgwebdir.fcgi
+contrib/hgwebdir.wsgi
 contrib/perf.py
+contrib/python-hook-examples.py
 contrib/rewrite-log
 contrib/sample.hgrc
+contrib/shrink-revlog.py
 contrib/simplemerge
 contrib/tcsh_completion
 contrib/tcsh_completion_build.sh
+contrib/tmplrewrite.py
 contrib/undumprevlog
 contrib/vim
 contrib/zsh_completion

Modified: packages/mercurial/trunk/debian/mercurial-common.install
===================================================================
--- packages/mercurial/trunk/debian/mercurial-common.install	2009-11-11 03:23:18 UTC (rev 4102)
+++ packages/mercurial/trunk/debian/mercurial-common.install	2009-11-11 10:39:10 UTC (rev 4103)
@@ -1,3 +1,4 @@
+help usr/share/mercurial
 templates usr/share/mercurial
 debian/tmp/usr/lib
 

Added: packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2009-11-11 10:39:10 UTC (rev 4103)
@@ -0,0 +1,31 @@
+Support installation of help topics handled by mercurial-common.install.
+
+diff -r fc7206c1290a mercurial/help.py
+--- a/mercurial/help.py
++++ b/mercurial/help.py
+@@ -70,9 +70,11 @@
+             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):
++            path = os.path.join(base, dir, 'help')
++            if os.path.isdir(path):
++                docdir = path
+                 break
+ 
+         path = os.path.join(docdir, topic + ".txt")
+diff -r fc7206c1290a setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -254,7 +254,7 @@
+         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('.')]

Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately	2009-11-11 03:23:18 UTC (rev 4102)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately	2009-11-11 10:39:10 UTC (rev 4103)
@@ -1,6 +1,6 @@
 Support installation of templates handled by mercurial-common.install.
 
-diff -r 55fb3b7436b4 mercurial/templater.py
+diff -r 2cbbf40418af mercurial/templater.py
 --- a/mercurial/templater.py
 +++ b/mercurial/templater.py
 @@ -9,7 +9,7 @@
@@ -12,7 +12,7 @@
  stringify = templatefilters.stringify
  
  def parsestring(s, quoted=True):
-diff -r 55fb3b7436b4 setup.py
+diff -r 2cbbf40418af setup.py
 --- a/setup.py
 +++ b/setup.py
 @@ -254,7 +254,7 @@
@@ -20,7 +20,7 @@
  
  datafiles = []
 -for root in ('templates', 'help'):
-+for root in ('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('.')]

Modified: packages/mercurial/trunk/debian/patches/for_upstream__force_C_locale.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__force_C_locale.patch	2009-11-11 03:23:18 UTC (rev 4102)
+++ packages/mercurial/trunk/debian/patches/for_upstream__force_C_locale.patch	2009-11-11 10:39:10 UTC (rev 4103)
@@ -1,12 +1,14 @@
 Force C local when generating the documentation
+
+diff -r dec177286deb doc/Makefile
 --- a/doc/Makefile
 +++ b/doc/Makefile
-@@ -17,7 +17,7 @@
+@@ -18,7 +18,7 @@
  	touch hg.1.txt
  
- hg.1.gendoc.txt: ../mercurial/commands.py ../mercurial/help.py
--	${PYTHON} gendoc.py > $@
-+	env LC_ALL=C ${PYTHON} gendoc.py > $@
+ hg.1.gendoc.txt: $(GENDOC)
+-	${PYTHON} gendoc.py > $@.tmp
++	env LC_ALL=C ${PYTHON} gendoc.py > $@.tmp
+ 	mv $@.tmp $@
  
- %: %.xml
- 	xmlto man $*.xml && \
+ %: %.txt common.txt

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2009-11-11 03:23:18 UTC (rev 4102)
+++ packages/mercurial/trunk/debian/patches/series	2009-11-11 10:39:10 UTC (rev 4103)
@@ -2,6 +2,7 @@
 deb_specific__mergetools
 proposed_upstream__dont-install-i18n
 deb_specific__install-templates-separately
+deb_specific__install-help-separately
 proposed_upstream__python-module-not-script.patch
 deb_specific__use_sensible-editor.patch
 deb_specific__hgk.py.patch

More information about the Python-apps-commits mailing list