[Python-apps-commits] r3186 - in packages/moap/trunk/debian (5 files)

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

    Date: Thursday, June 25, 2009 @ 17:41:02
  Author: gilir-guest
Revision: 3186

New upstream release

Added:
  packages/moap/trunk/debian/pyversions
Modified:
  packages/moap/trunk/debian/changelog
  packages/moap/trunk/debian/control
Deleted:
  packages/moap/trunk/debian/patches/01-assign-variable-moap-bug.patch
  packages/moap/trunk/debian/patches/02-moap-git-svn.patch

Modified: packages/moap/trunk/debian/changelog
===================================================================
--- packages/moap/trunk/debian/changelog	2009-06-25 13:42:40 UTC (rev 3185)
+++ packages/moap/trunk/debian/changelog	2009-06-25 17:41:02 UTC (rev 3186)
@@ -1,3 +1,17 @@
+moap (0.2.7-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+   - Don't crash on unknow format of ChangeLog (Closes: #520997)
+  * debian/patches
+   - 01-assign-variable-moap-bug.patch : Removed, merged upstream.
+   - 02-moap-git-svn.patch: Removed, merged upstream.
+  * debian/control
+   - Remove X{B,S}-Python-Version.
+   - Bump Standards-Version to 3.8.1. (no change needed).
+  * debian/pyversions : Add compatible versions.
+
+ -- Julien Lavergne <julien.lavergne at gmail.com>  Thu, 25 Jun 2009 19:33:20 +0200
+
 moap (0.2.6-3) unstable; urgency=low
 
   [ Sandro Tosi ]

Modified: packages/moap/trunk/debian/control
===================================================================
--- packages/moap/trunk/debian/control	2009-06-25 13:42:40 UTC (rev 3185)
+++ packages/moap/trunk/debian/control	2009-06-25 17:41:02 UTC (rev 3186)
@@ -12,9 +12,8 @@
 			python-epydoc,
 			pychecker,
 			python-twisted-core
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Homepage: http://thomas.apestaart.org/moap/trac/
-XS-Python-Version: >= 2.4
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/moap/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/moap/trunk/
 
@@ -34,7 +33,6 @@
 		git-core (>= 1:1.6.0),
 		git-svn,
 		subversion
-XB-Python-Version: ${python:Versions}
 Description: Swiss army knife for project maintainers and developers
  moap aims to help in keeping you in the flow of maintaining, developing and
  releasing your project, automating whatever tasks can be automated.

Deleted: packages/moap/trunk/debian/patches/01-assign-variable-moap-bug.patch
===================================================================
--- packages/moap/trunk/debian/patches/01-assign-variable-moap-bug.patch	2009-06-25 13:42:40 UTC (rev 3185)
+++ packages/moap/trunk/debian/patches/01-assign-variable-moap-bug.patch	2009-06-25 17:41:02 UTC (rev 3186)
@@ -1,13 +0,0 @@
-# Debian : http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=496534
-# Upstream : https://thomas.apestaart.org/moap/trac/ticket/295
---- moap/command/bug.py	2008-08-25 16:25:13.000000000 +0200
-+++ moap/command/bug.py	2008-08-25 16:25:06.000000000 +0200
-@@ -109,6 +109,7 @@
-                 try:
-                     d = doap.findDoapFile(None)
-                 except doap.DoapException, e:
-+                    d = None
-                     sys.stderr.write(e.args[0])
- 
-             if not d:
-

Deleted: packages/moap/trunk/debian/patches/02-moap-git-svn.patch
===================================================================
--- packages/moap/trunk/debian/patches/02-moap-git-svn.patch	2009-06-25 13:42:40 UTC (rev 3185)
+++ packages/moap/trunk/debian/patches/02-moap-git-svn.patch	2009-06-25 17:41:02 UTC (rev 3186)
@@ -1,45 +0,0 @@
-#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)
- 

Added: packages/moap/trunk/debian/pyversions
===================================================================
--- packages/moap/trunk/debian/pyversions	                        (rev 0)
+++ packages/moap/trunk/debian/pyversions	2009-06-25 17:41:02 UTC (rev 3186)
@@ -0,0 +1 @@
+2.4-