[Python-apps-commits] r2521 - in packages/moap/trunk/debian (3 files)

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

    Date: Wednesday, March 4, 2009 @ 21:19:03
  Author: gilir-guest
Revision: 2521

Add patch for git-svn (#517551)

Added:
  packages/moap/trunk/debian/patches/02-moap-git-svn.patch
Modified:
  packages/moap/trunk/debian/changelog
  packages/moap/trunk/debian/control

Modified: packages/moap/trunk/debian/changelog
===================================================================
--- packages/moap/trunk/debian/changelog	2009-03-04 11:35:49 UTC (rev 2520)
+++ packages/moap/trunk/debian/changelog	2009-03-04 21:19:03 UTC (rev 2521)
@@ -1,10 +1,18 @@
 moap (0.2.6-3) UNRELEASED; urgency=low
 
+  [ Sandro Tosi ]
   * debian/control
     - switch Vcs-Browser field to viewsvn
 
- -- Sandro Tosi <morph at debian.org>  Mon, 03 Nov 2008 22:47:38 +0100
+  [ Julien Lavergne ]
+  * debian/patches/02-moap-git-svn.patch:
+   - Call git svn instead of git-svn, change since git 1.6. Thanks Jonny 
+     Lamb for the patch (Closes: #517551).
+  * debian/control:
+   - Suggest git-core (>= 1:1.6.0) and git-svn.
 
+ -- Julien Lavergne <julien.lavergne at gmail.com>  Wed, 04 Mar 2009 22:14:53 +0100
+
 moap (0.2.6-2) unstable; urgency=low
 
   * debian/control

Modified: packages/moap/trunk/debian/control
===================================================================
--- packages/moap/trunk/debian/control	2009-03-04 11:35:49 UTC (rev 2520)
+++ packages/moap/trunk/debian/control	2009-03-04 21:19:03 UTC (rev 2521)
@@ -32,7 +32,8 @@
 Suggests: 	bzr,
 		cvs,
 		darcs,
-		git-core,
+		git-core (>= 1:1.6.0),
+		git-svn,
 		subversion
 XB-Python-Version: ${python:Versions}
 Description: Swiss army knife for project maintainers and developers

Added: packages/moap/trunk/debian/patches/02-moap-git-svn.patch
===================================================================
--- packages/moap/trunk/debian/patches/02-moap-git-svn.patch	                        (rev 0)
+++ packages/moap/trunk/debian/patches/02-moap-git-svn.patch	2009-03-04 21:19:03 UTC (rev 2521)
@@ -0,0 +1,45 @@
+#Debian bug : http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=517551
+#Upstream bug : https://thomas.apestaart.org/moap/trac/ticket/399
+diff -Nruad -Nruad moap-0.2.6.orig/moap/test/test_vcs_git_svn.py moap-0.2.6/moap/test/test_vcs_git_svn.py
+--- moap-0.2.6.orig/moap/test/test_vcs_git_svn.py	2009-02-28 15:13:58.000000000 +0000
++++ moap-0.2.6/moap/test/test_vcs_git_svn.py	2009-02-28 15:20:21.000000000 +0000
+@@ -12,14 +12,15 @@
+ from moap.vcs import svn, git, git_svn
+ 
+ class GitSvnTestCase(test_vcs_svn.SVNTestCase):
+-    # git-svn --version just errors about not having a git repo
+-    if os.system('which git-svn > /dev/null 2>&1') != 0:
++    # git svn --version just errors about not having a git repo
++    # TODO: this might break on non-Debian machines.
++    if not os.path.isfile('/usr/lib/git-core/git-svn'):
+         skip = "No 'git-svn' binary, skipping test."
+ 
+     def setUp(self):
+         self.repository = self.createRepository()
+         self.livedir = self.createLive()
+-        cmd = 'git-svn init file://%s %s' % (self.repository, self.livedir)
++        cmd = 'git svn init file://%s %s' % (self.repository, self.livedir)
+         (status, output) = commands.getstatusoutput(cmd)
+         self.failIf(status)
+ 
+diff -Nruad -Nruad moap-0.2.6.orig/moap/vcs/git_svn.py moap-0.2.6/moap/vcs/git_svn.py
+--- moap-0.2.6.orig/moap/vcs/git_svn.py	2009-02-28 15:13:59.000000000 +0000
++++ moap-0.2.6/moap/vcs/git_svn.py	2009-02-28 15:17:21.000000000 +0000
+@@ -36,7 +36,7 @@
+         oldPath = os.getcwd()
+         os.chdir(self.path)
+ 
+-        status, output = commands.getstatusoutput("git-svn fetch")
++        status, output = commands.getstatusoutput("git svn fetch")
+         if status != 0:
+             raise vcs.VCSException(output)
+ 
+@@ -44,7 +44,7 @@
+         if status != 0:
+             raise vcs.VCSException(output)
+ 
+-        status, output = commands.getstatusoutput("git-svn show-ignore >> .git/info/exclude")
++        status, output = commands.getstatusoutput("git svn show-ignore >> .git/info/exclude")
+         if status != 0:
+             raise vcs.VCSException(output)
+