[Python-apps-commits] r7426 - in packages/hg-git/trunk/debian (7 files)
jwilk at users.alioth.debian.org
jwilk at users.alioth.debian.org
Tue Aug 9 14:45:05 UTC 2011
Date: Tuesday, August 9, 2011 @ 14:45:03
Author: jwilk
Revision: 7426
* Backport two patches from upstream VCS to fix compatiblity with Mercurial 1.9.
* Convert to dh_python2.
Added:
packages/hg-git/trunk/debian/patches/
packages/hg-git/trunk/debian/patches/fix-mercurial-1.9-compat-1.diff
packages/hg-git/trunk/debian/patches/fix-mercurial-1.9-compat-2.diff
packages/hg-git/trunk/debian/patches/series
Modified:
packages/hg-git/trunk/debian/changelog
packages/hg-git/trunk/debian/control
packages/hg-git/trunk/debian/rules
Modified: packages/hg-git/trunk/debian/changelog
===================================================================
--- packages/hg-git/trunk/debian/changelog 2011-08-09 07:32:36 UTC (rev 7425)
+++ packages/hg-git/trunk/debian/changelog 2011-08-09 14:45:03 UTC (rev 7426)
@@ -1,3 +1,15 @@
+hg-git (0.2.6-2) UNRELEASED; urgency=medium
+
+ * Backport two patches from upstream VCS to fix compatiblity with Mercurial
+ 1.9 (closes: #635500).
+ * Convert to dh_python2:
+ + Build depend on python (>= 2.6.6-3) instead of python-support.
+ + Add ‘--with python2’ to dh call in debian/rules.
+ + Bump minimum required version of mercurial to 1.9.1-1, which is the
+ first version using dh_python2.
+
+ -- Jakub Wilk <jwilk at debian.org> Tue, 09 Aug 2011 16:38:05 +0200
+
hg-git (0.2.6-1) unstable; urgency=low
* New upstream release.
Modified: packages/hg-git/trunk/debian/control
===================================================================
--- packages/hg-git/trunk/debian/control 2011-08-09 07:32:36 UTC (rev 7425)
+++ packages/hg-git/trunk/debian/control 2011-08-09 14:45:03 UTC (rev 7426)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Qijiang Fan <fqj1994 at gmail.com>
Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.8), python-support (>= 0.90)
+Build-Depends: debhelper (>= 7.0.8), python (>= 2.6.6-3~)
Standards-Version: 3.9.1
XS-Python-Version: >= 2.5
Homepage: http://hg-git.github.com/
@@ -12,7 +12,7 @@
Package: mercurial-git
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, mercurial (>= 1.1), python-dulwich (>= 0.6)
+Depends: ${misc:Depends}, ${python:Depends}, mercurial (>= 1.9.1-1~), python-dulwich (>= 0.6)
Description: Git plugin for Mercurial
The Hg-Git plugin for Mercurial adds the ability to push and pull to/from
a Git server repository. This means you can collaborate on Git based
Added: packages/hg-git/trunk/debian/patches/fix-mercurial-1.9-compat-1.diff
===================================================================
--- packages/hg-git/trunk/debian/patches/fix-mercurial-1.9-compat-1.diff (rev 0)
+++ packages/hg-git/trunk/debian/patches/fix-mercurial-1.9-compat-1.diff 2011-08-09 14:45:03 UTC (rev 7426)
@@ -0,0 +1,27 @@
+Description: The `url` function wasn't ever published as `url.url`, and is now `util.url`.
+Author: Augie Fackler <durin42 at gmail.com>
+Origin: upstream, https://bitbucket.org/durin42/hg-git/changeset/bcc79fa3fe09
+Last-Update: 2011-08-09
+
+--- a/hggit/__init__.py
++++ b/hggit/__init__.py
+@@ -41,8 +41,18 @@
+ # support for `hg clone localgitrepo`
+ _oldlocal = hg.schemes['file']
+
++try:
++ urlcls = hgutil.url
++except AttributeError:
++ class urlcls(object):
++ def __init__(self, path):
++ self.p = hgutil.drop_scheme('file', path)
++
++ def localpath(self):
++ return self.p
++
+ def _local(path):
+- p = hgutil.drop_scheme('file', path)
++ p = urlcls(path).localpath()
+ if (os.path.exists(os.path.join(p, '.git')) and
+ not os.path.exists(os.path.join(p, '.hg'))):
+ return gitrepo
Added: packages/hg-git/trunk/debian/patches/fix-mercurial-1.9-compat-2.diff
===================================================================
--- packages/hg-git/trunk/debian/patches/fix-mercurial-1.9-compat-2.diff (rev 0)
+++ packages/hg-git/trunk/debian/patches/fix-mercurial-1.9-compat-2.diff 2011-08-09 14:45:03 UTC (rev 7426)
@@ -0,0 +1,32 @@
+Description: Cope with new discovery code without crashing.
+Author: Augie Fackler <durin42 at gmail.com>
+Origin: upstream, https://bitbucket.org/durin42/hg-git/changeset/5fdff9b8e742
+Last-Update: 2011-08-09
+
+--- a/hggit/__init__.py
++++ b/hggit/__init__.py
+@@ -124,6 +124,8 @@
+ kwname = 'heads'
+ if hg.util.version() >= '1.7':
+ kwname = 'remoteheads'
++ if getattr(discovery, 'findcommonoutgoing', None):
++ kwname = 'onlyheads'
+ def findoutgoing(orig, local, remote, *args, **kwargs):
+ kw = {}
+ kw.update(kwargs)
+@@ -140,8 +142,14 @@
+ if kwname == 'heads':
+ r = orig(local, remote, **kw)
+ return [x[0] for x in r]
++ if kwname == 'onlyheads':
++ del kw['base']
+ return orig(local, remote, **kw)
+- extensions.wrapfunction(discovery, 'findoutgoing', findoutgoing)
++ if getattr(discovery, 'findoutgoing', None):
++ extensions.wrapfunction(discovery, 'findoutgoing', findoutgoing)
++ else:
++ extensions.wrapfunction(discovery, 'findcommonoutgoing',
++ findoutgoing)
+ except ImportError:
+ pass
+
Added: packages/hg-git/trunk/debian/patches/series
===================================================================
--- packages/hg-git/trunk/debian/patches/series (rev 0)
+++ packages/hg-git/trunk/debian/patches/series 2011-08-09 14:45:03 UTC (rev 7426)
@@ -0,0 +1,2 @@
+fix-mercurial-1.9-compat-1.diff
+fix-mercurial-1.9-compat-2.diff
Modified: packages/hg-git/trunk/debian/rules
===================================================================
--- packages/hg-git/trunk/debian/rules 2011-08-09 07:32:36 UTC (rev 7425)
+++ packages/hg-git/trunk/debian/rules 2011-08-09 14:45:03 UTC (rev 7426)
@@ -12,7 +12,7 @@
dh install --until dh_prep
dh_installdirs $(MODULE_DIR)
cp -r hggit/*.py debian/mercurial-git/$(MODULE_DIR)/
- dh install --after dh_install
+ dh install --after dh_install --with python2
# Build architecture-independent files here.
binary-indep: install
More information about the Python-apps-commits
mailing list