[Python-apps-commits] r10118 - in packages/mercurial/trunk/debian (11 files)
vicho at users.alioth.debian.org
vicho at users.alioth.debian.org
Sun Oct 20 21:23:53 UTC 2013
Date: Sunday, October 20, 2013 @ 21:23:51
Author: vicho
Revision: 10118
Fix patches deb_specific__install-help-separately, deb_specific__install-help-separately and deb_specific__install-mo-fhs.patch so that we can run the full testsuite when building
Added:
packages/mercurial/trunk/debian/patches/deb_specific__support_help_in_fhs.patch
(from rev 10047, packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately)
packages/mercurial/trunk/debian/patches/deb_specific__support_mo_in_fhs.patch
(from rev 10047, packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch)
packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch
(from rev 10047, packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately)
Modified:
packages/mercurial/trunk/debian/changelog
packages/mercurial/trunk/debian/mercurial-common.install
packages/mercurial/trunk/debian/patches/series
packages/mercurial/trunk/debian/rules (contents, properties)
Deleted:
packages/mercurial/trunk/debian/mercurial.test_blacklist
packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch
packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog 2013-10-20 18:48:09 UTC (rev 10117)
+++ packages/mercurial/trunk/debian/changelog 2013-10-20 21:23:51 UTC (rev 10118)
@@ -1,3 +1,12 @@
+mercurial (2.7.2-2) UNRELEASED; urgency=low
+
+ * Fix patches deb_specific__install-help-separately,
+ deb_specific__install-help-separately and
+ deb_specific__install-mo-fhs.patch so that we can run the full
+ testsuite when building
+
+ -- Javi Merino <vicho at debian.org> Fri, 18 Oct 2013 12:36:46 +0100
+
mercurial (2.7.2-1) unstable; urgency=low
* New upstream release
Modified: packages/mercurial/trunk/debian/mercurial-common.install
===================================================================
--- packages/mercurial/trunk/debian/mercurial-common.install 2013-10-20 18:48:09 UTC (rev 10117)
+++ packages/mercurial/trunk/debian/mercurial-common.install 2013-10-20 21:23:51 UTC (rev 10118)
@@ -1,6 +1,3 @@
-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
Deleted: packages/mercurial/trunk/debian/mercurial.test_blacklist
===================================================================
--- packages/mercurial/trunk/debian/mercurial.test_blacklist 2013-10-20 18:48:09 UTC (rev 10117)
+++ packages/mercurial/trunk/debian/mercurial.test_blacklist 2013-10-20 21:23:51 UTC (rev 10118)
@@ -1,56 +0,0 @@
-# Failed to locate styles (?)
-test-bisect3.t
-test-command-template.t
-test-commit-amend.t
-test-glog.t
-test-histedit-arguments.t
-test-histedit-revspec.t
-test-install.t
-test-log.t
-test-tag.t
-
-# No such file or directory /usr/share/mercurial/help/revsets.txt (?)
-test-bookmarks.t
-test-extension.t
-test-help.t
-test-mq.t
-test-transplant.t
-
-# No *.po in $TESTDIR/i18n/ (?)
-test-gendoc.t
-
-# I'm missing some locales or something (?)
-test-i18n.t
-
-# No hgweb templates
-test-archive.t
-test-hgweb.t
-test-hgweb-commands.t
-test-hgweb-descend-empties.t
-test-hgweb-diffs.t
-test-hgweb-empty.t
-test-hgweb-filelog.t
-test-hgweb-non-interactive.t
-test-hgweb-nopath.t
-test-hgweb-no-path-info.t
-test-hgweb-no-request-uri.t
-test-hgweb-raw.t
-test-hgwebdir.t
-test-hgwebdirsym.t
-test-keyword.t
-test-newcgi.t
-test-newercgi.t
-test-oldcgi.t
-test-share.t
-test-websub.t
-
-# local server failed (?)
-test-hgweb-removed.t
-test-largefiles.t
-test-mq-qclone-http.t
-test-mq-qimport.t
-test-obsolete.t
-test-subrepo-relative-path.t
-
-# no port number associated with service 'daytime' (this should be easily solvable)
-test-serve.t
Deleted: packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately 2013-10-20 18:48:09 UTC (rev 10117)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately 2013-10-20 21:23:51 UTC (rev 10118)
@@ -1,30 +0,0 @@
-Support installation of help topics handled by mercurial-common.install.
-
---- a/setup.py
-+++ b/setup.py
-@@ -472,8 +472,7 @@ if sys.platform.startswith('linux') and
- extmodules.append(inotify)
- packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
-
--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] != '~'
---- a/mercurial/help.py
-+++ b/mercurial/help.py
-@@ -131,9 +131,11 @@ def loaddoc(topic):
- 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):
-+ tmpdocdir = os.path.join(base, dir, 'help')
-+ if os.path.isdir(tmpdocdir):
-+ docdir = tmpdocdir
- break
-
- path = os.path.join(docdir, topic + ".txt")
Deleted: packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch 2013-10-20 18:48:09 UTC (rev 10117)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch 2013-10-20 21:23:51 UTC (rev 10118)
@@ -1,23 +0,0 @@
-Look for *.mo files in /usr/share/locale (FHS compliant)
---- a/mercurial/i18n.py
-+++ b/mercurial/i18n.py
-@@ -15,7 +15,7 @@ else:
- 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
-@@ -472,7 +472,7 @@ if sys.platform.startswith('linux') and
- extmodules.append(inotify)
- 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] != '~'
Deleted: packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately 2013-10-20 18:48:09 UTC (rev 10117)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately 2013-10-20 21:23:51 UTC (rev 10118)
@@ -1,30 +0,0 @@
-Support installation of templates handled by mercurial-common.install.
-
---- a/mercurial/templater.py
-+++ b/mercurial/templater.py
-@@ -368,7 +368,7 @@ funcs = {
-
- # template engine
-
--path = ['templates', '../templates']
-+path = ['templates', '../templates', '/usr/share/mercurial/templates']
- stringify = templatefilters.stringify
-
- def _flatten(thing):
---- a/setup.py
-+++ b/setup.py
-@@ -478,14 +478,6 @@ packagedata = {'mercurial': ['locale/*/L
- 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 = []
- setupversion = version
- extra = {}
Copied: packages/mercurial/trunk/debian/patches/deb_specific__support_help_in_fhs.patch (from rev 10047, packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately)
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__support_help_in_fhs.patch (rev 0)
+++ packages/mercurial/trunk/debian/patches/deb_specific__support_help_in_fhs.patch 2013-10-20 21:23:51 UTC (rev 10118)
@@ -0,0 +1,20 @@
+Author: Vernon Tang <vt at foilhead.net>
+Description: Support installation of help topics in FHS.
+Forwarded: not-needed
+
+--- a/mercurial/help.py
++++ b/mercurial/help.py
+@@ -131,9 +131,11 @@ def loaddoc(topic):
+ 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):
++ tmpdocdir = os.path.join(base, dir, 'help')
++ if os.path.isdir(tmpdocdir):
++ docdir = tmpdocdir
+ break
+
+ path = os.path.join(docdir, topic + ".txt")
Copied: packages/mercurial/trunk/debian/patches/deb_specific__support_mo_in_fhs.patch (from rev 10047, packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch)
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__support_mo_in_fhs.patch (rev 0)
+++ packages/mercurial/trunk/debian/patches/deb_specific__support_mo_in_fhs.patch 2013-10-20 21:23:51 UTC (rev 10118)
@@ -0,0 +1,15 @@
+Author: Vincent Danjean <vdanjean at debian.org>
+Description: Look for *.mo files in /usr/share/locale (FHS compliant)
+Forwarded: not-needed
+
+--- a/mercurial/i18n.py
++++ b/mercurial/i18n.py
+@@ -15,7 +15,7 @@ else:
+ 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
Copied: packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch (from rev 10047, packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately)
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch (rev 0)
+++ packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch 2013-10-20 21:23:51 UTC (rev 10118)
@@ -0,0 +1,15 @@
+Author: Vernon Tang <vt at foilhead.net>
+Description: Support installation of templates in FHS.
+Forwarded: not-needed
+
+--- a/mercurial/templater.py
++++ b/mercurial/templater.py
+@@ -368,7 +368,7 @@ funcs = {
+
+ # template engine
+
+-path = ['templates', '../templates']
++path = ['templates', '../templates', '/usr/share/mercurial/templates']
+ stringify = templatefilters.stringify
+
+ def _flatten(thing):
Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series 2013-10-20 18:48:09 UTC (rev 10117)
+++ packages/mercurial/trunk/debian/patches/series 2013-10-20 21:23:51 UTC (rev 10118)
@@ -1,10 +1,10 @@
-deb_specific__install-templates-separately
-deb_specific__install-help-separately
+deb_specific__support_templates_in_fsh.patch
+deb_specific__support_help_in_fhs.patch
deb_specific__use_sensible-editor.patch
deb_specific__hgk.py.patch
deb_specific__optional-dependencies
proposed_upstream__correct-zeroconf-doc
-deb_specific__install-mo-fhs.patch
+deb_specific__support_mo_in_fhs.patch
deb_specific__disable_libdir_replacement.patch
deb_specific__fix_hg-ssh_interpreter.patch
for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules 2013-10-20 18:48:09 UTC (rev 10117)
+++ packages/mercurial/trunk/debian/rules 2013-10-20 21:23:51 UTC (rev 10118)
@@ -35,7 +35,7 @@
sed -i.deb-backup -e 's/sleep 1/sleep 2/' $(CURDIR)/tests/test-pull-pull-corruption.t
endif
- http_proxy='' dh_auto_test -- TESTFLAGS="--verbose --timeout 480 $(PARALLEL_TEST_JOBS) --blacklist $(CURDIR)/debian/mercurial.test_blacklist"
+ http_proxy='' dh_auto_test -- TESTFLAGS="--verbose --timeout 480 $(PARALLEL_TEST_JOBS)"
rename.ul .deb-backup '' $(CURDIR)/tests/*
endif
@@ -77,6 +77,9 @@
install -m 644 \
debian/cacerts.hgrc \
$(CURDIR)/debian/mercurial-common/etc/mercurial/hgrc.d/cacerts.rc
+ # Move templates and help installed by setup.py to their FHS-correct location
+ mv $(CURDIR)/debian/mercurial-common/usr/lib/python*/dist-packages/mercurial/templates $(CURDIR)/debian/mercurial-common/usr/lib/python*/dist-packages/mercurial/help $(CURDIR)/debian/mercurial-common/usr/share/mercurial
+ mv $(CURDIR)/debian/mercurial-common/usr/lib/python*/dist-packages/mercurial/locale $(CURDIR)/debian/mercurial-common/usr/share
# remove arch-dependent python stuff
find debian/mercurial-common/usr/lib \
-name '*.so' ! -type d -delete , \
More information about the Python-apps-commits
mailing list