[Python-apps-commits] r941 - in packages/mercurial/trunk/debian (2 files)

[vdanjean at users.alioth.debian.org]

    Date: Friday, April 11, 2008 @ 17:00:15
  Author: vdanjean
Revision: 941

Make backporting for etch straitforward
- workaround a etch asciidoc bug in manpage generation
- get (arch-indep) templates from python2.4 build instead of python2.5

Modified:
  packages/mercurial/trunk/debian/mercurial-common.install
  packages/mercurial/trunk/debian/rules

Modified: packages/mercurial/trunk/debian/mercurial-common.install
===================================================================
--- packages/mercurial/trunk/debian/mercurial-common.install	2008-04-10 18:13:10 UTC (rev 940)
+++ packages/mercurial/trunk/debian/mercurial-common.install	2008-04-11 17:00:15 UTC (rev 941)
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/python2.5/site-packages/mercurial/templates usr/share/mercurial
+debian/tmp/usr/lib/python2.4/site-packages/mercurial/templates usr/share/mercurial
 debian/tmp/usr/lib
 
 contrib/mercurial.el usr/share/emacs/site-lisp

Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules	2008-04-10 18:13:10 UTC (rev 940)
+++ packages/mercurial/trunk/debian/rules	2008-04-11 17:00:15 UTC (rev 941)
@@ -36,8 +36,8 @@
 build/mercurial-common::
 	$(MAKE) -C doc man
 	# workaround a bug in asciidoc that generates incorrect manpages
-	sed -i 's,^\([\\][.]hg/hgrc\),\\\&\1,' doc/hg.1
-	sed -i 's,^\([\\][.][*][\\][.]swp\),\\\&\1,' doc/hgignore.5
+	sed -i 's,^\([\\]\?[.]hg/hgrc\),\\\&\1,' doc/hg.1
+	sed -i 's,^\([\\]\?[.][*][\\]\?[.]swp\),\\\&\1,' doc/hgignore.5
 
 binary-install/mercurial-common::
 	rm -rf $(CURDIR)/debian/mercurial-common/usr/share/python-support/mercurial-common/mercurial/templates