[Python-apps-commits] r3984 - in packages/hg-git/trunk/debian (6 files)

[jwilk-guest at users.alioth.debian.org]

    Date: Sunday, October 18, 2009 @ 10:14:17
  Author: jwilk-guest
Revision: 3984

* New upstream release.
* Depend on python-dulwich, as hg-git no longer embeds the Dulwich library
  (closes: #541996, #544272).
* Drop mercurial-1.3.diff patch, applied upstream.
* Remove get-orig-source target, no longer needed; add watch file instead.

Added:
  packages/hg-git/trunk/debian/watch
Modified:
  packages/hg-git/trunk/debian/changelog
  packages/hg-git/trunk/debian/control
  packages/hg-git/trunk/debian/patches/series
  packages/hg-git/trunk/debian/rules
Deleted:
  packages/hg-git/trunk/debian/patches/mercurial-1.3.diff

Modified: packages/hg-git/trunk/debian/changelog
===================================================================
--- packages/hg-git/trunk/debian/changelog	2009-10-17 23:33:50 UTC (rev 3983)
+++ packages/hg-git/trunk/debian/changelog	2009-10-18 10:14:17 UTC (rev 3984)
@@ -1,3 +1,13 @@
+hg-git (0.1.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Depend on python-dulwich, as hg-git no longer embeds the Dulwich library
+    (closes: #541996, #544272).
+  * Drop mercurial-1.3.diff patch, applied upstream.
+  * Remove get-orig-source target, no longer needed; add watch file instead.
+
+ -- Jakub Wilk <ubanus at users.sf.net>  Sun, 18 Oct 2009 02:45:19 +0200
+
 hg-git (0+hg20090603-2) unstable; urgency=low
 
   * Use quilt to manage patches.

Modified: packages/hg-git/trunk/debian/control
===================================================================
--- packages/hg-git/trunk/debian/control	2009-10-17 23:33:50 UTC (rev 3983)
+++ packages/hg-git/trunk/debian/control	2009-10-18 10:14:17 UTC (rev 3984)
@@ -12,7 +12,7 @@
 
 Package: mercurial-git
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, mercurial (>= 1.1)
+Depends: ${misc:Depends}, ${python:Depends}, mercurial (>= 1.1), python-dulwich (>= 0.4)
 XB-Python-Version: ${python:Versions}
 Description: Git plugin for Mercurial
  Th Hg-Git plugin for Mercurial adds the ability to push and pull to/from

Deleted: packages/hg-git/trunk/debian/patches/mercurial-1.3.diff
===================================================================
--- packages/hg-git/trunk/debian/patches/mercurial-1.3.diff	2009-10-17 23:33:50 UTC (rev 3983)
+++ packages/hg-git/trunk/debian/patches/mercurial-1.3.diff	2009-10-18 10:14:17 UTC (rev 3984)
@@ -1,20 +0,0 @@
-Description: Fix compatibility with Mercurial 1.3.
-Origin: http://bitbucket.org/abderrahim/hg-git/changeset/53ef6f725598/
-Author: Abderrahim Kitouni <a.kitouni at gmail.com>
-
-diff --git a/hgrepo.py b/hgrepo.py
---- a/hgrepo.py
-+++ b/hgrepo.py
-@@ -54,7 +54,10 @@
-                 try:
-                     fctx = wctx.filectx(f)
-                     newflags = fctx.flags()
--                    new[f] = self.filecommit(fctx, m1, m2, linkrev, trp, changed)
-+                    try:
-+                        new[f] = self.filecommit(fctx, m1, m2, linkrev, trp, changed)
-+                    except AttributeError:
-+                        new[f] = self._filecommit(fctx, m1, m2, linkrev, trp, changed)
-                     if ((not changed or changed[-1] != f) and
-                         m2.get(f) != new[f]):
-                         # mention the file in the changelog if some
-

Modified: packages/hg-git/trunk/debian/patches/series
===================================================================
--- packages/hg-git/trunk/debian/patches/series	2009-10-17 23:33:50 UTC (rev 3983)
+++ packages/hg-git/trunk/debian/patches/series	2009-10-18 10:14:17 UTC (rev 3984)
@@ -1 +0,0 @@
-mercurial-1.3.diff

Modified: packages/hg-git/trunk/debian/rules
===================================================================
--- packages/hg-git/trunk/debian/rules	2009-10-17 23:33:50 UTC (rev 3983)
+++ packages/hg-git/trunk/debian/rules	2009-10-18 10:14:17 UTC (rev 3984)
@@ -13,8 +13,7 @@
 install: build
 	dh install --until dh_prep
 	dh_installdirs $(MODULE_DIR) $(MODULE_DIR)/dulwich/
-	cp -r *.py debian/mercurial-git/$(MODULE_DIR)/
-	cp -r dulwich/*.py debian/mercurial-git/$(MODULE_DIR)/dulwich/
+	cp -r hggit/*.py debian/mercurial-git/$(MODULE_DIR)/
 	dh install --after dh_install
 
 # Build architecture-independent files here.
@@ -25,16 +24,9 @@
 
 binary: binary-indep binary-arch
 
-get-orig-source:
-	rm -Rf orig-source
-	hg clone http://bitbucket.org/Scotty/hg-git orig-source
-	date=`hg -R orig-source log -l1 --template '{date|isodate}' | cut -c -10 | tr -d -` && \
-	hg archive --config ui.archivemeta=false -R orig-source -t tgz hg-git_0+hg$${date}.orig.tar.gz
-	rm -Rf orig-source
-
 patch unpatch:
 	dh_quilt_$(@)
 
-.PHONY: build clean binary-indep binary-arch binary install get-orig-source patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch
 
 # vim:ts=4 sw=4 noet

Added: packages/hg-git/trunk/debian/watch
===================================================================
--- packages/hg-git/trunk/debian/watch	                        (rev 0)
+++ packages/hg-git/trunk/debian/watch	2009-10-18 10:14:17 UTC (rev 3984)
@@ -0,0 +1,2 @@
+version=3
+http://githubredir.debian.net/github/schacon/hg-git .*/([0-9.]+)[.]tar[.]gz