Control: tags -1 patch

Hello there,

please find attached a debdiff with a proposed fixed. The changelog reads:

commando (0.3.4-1.1) unstable; urgency=medium

* Add patch to stop using deprecated python module "distribute" to build.
  (Closes: #733437)
* debian/control, debian/rules: Build-Depend on dh-python and use the
  pybuild buildsystem
* Add Build-Depends on python-fswrap, python-markdown, python-mock,
  python-nose python-yaml, required for the nosetests to succeed.

It fixes the build failure for me.

-- 
Andreas Moog, Berliner Str. 29, 36205 Sontra/Germany
PGP-encrypted mails preferred (Key-ID: 74DE6624)
PGP Fingerprint: 74CD D9FE 5BCB FE0D 13EE 8EEA 61F3 4426 74DE 6624
diff -Nru commando-0.3.4/debian/changelog commando-0.3.4/debian/changelog
--- commando-0.3.4/debian/changelog     2013-05-30 16:55:36.000000000 +0200
+++ commando-0.3.4/debian/changelog     2014-02-01 22:07:30.000000000 +0100
@@ -1,3 +1,14 @@
+commando (0.3.4-1.1) unstable; urgency=medium
+
+  * Add patch to stop using deprecated python module "distribute" to build.
+    (Closes: #733437)
+  * debian/control, debian/rules: Build-Depend on dh-python and use the
+    pybuild buildsystem
+  * Add Build-Depends on python-fswrap, python-markdown, python-mock,
+    python-nose python-yaml, required for the nosetests to succeed.
+
+ -- Andreas Moog <andreas.m...@warperbbs.de>  Sat, 01 Feb 2014 21:42:34 +0100
+
 commando (0.3.4-1) unstable; urgency=low
 
   * New upstream release
diff -Nru commando-0.3.4/debian/control commando-0.3.4/debian/control
--- commando-0.3.4/debian/control       2013-05-30 16:53:46.000000000 +0200
+++ commando-0.3.4/debian/control       2014-02-01 22:07:01.000000000 +0100
@@ -2,7 +2,15 @@
 Section: python
 Priority: extra
 Maintainer: Julien Danjou <a...@debian.org>
-Build-Depends: debhelper (>= 8.0.0), python, python-setuptools
+Build-Depends: debhelper (>= 8.0.0),
+               dh-python,
+               python,
+               python-fswrap,
+               python-markdown,
+               python-mock,
+               python-nose,
+               python-setuptools,
+               python-yaml
 Standards-Version: 3.9.4
 Homepage: http://github.com/lakshmivyas/commando/
 Vcs-Git: git://git.debian.org/collab-maint/commando.git
@@ -10,7 +18,10 @@
 
 Package: python-commando
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python (>= 
2.7) | python-argparse
+Depends: python (>= 2.7) | python-argparse,
+         ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends}
 Description: wrapper for argparse to define declaratively
  A simple wrapper for `argparse` that allows commands and arguments to be
  defined declaratively using decorators. Note that this does not support all
diff -Nru commando-0.3.4/debian/patches/remove-distribute.patch 
commando-0.3.4/debian/patches/remove-distribute.patch
--- commando-0.3.4/debian/patches/remove-distribute.patch       1970-01-01 
01:00:00.000000000 +0100
+++ commando-0.3.4/debian/patches/remove-distribute.patch       2014-02-01 
21:41:50.000000000 +0100
@@ -0,0 +1,15 @@
+Description: Don't use deprecated python module "distribute" to build.
+Author: Andreas Moog <andreas.m...@warperbbs.de>
+Bug: https://github.com/lakshmivyas/commando/issues/13
+Bug-Debian: http://bugs.debian.org/733437
+
+--- commando-0.3.4.orig/setup.py
++++ commando-0.3.4/setup.py
+@@ -1,5 +1,5 @@
+-from distribute_setup import use_setuptools
+-use_setuptools()
++# from distribute_setup import use_setuptools
++# use_setuptools()
+ from setuptools import setup
+ 
+ try:
diff -Nru commando-0.3.4/debian/patches/series 
commando-0.3.4/debian/patches/series
--- commando-0.3.4/debian/patches/series        1970-01-01 01:00:00.000000000 
+0100
+++ commando-0.3.4/debian/patches/series        2014-02-01 20:55:57.000000000 
+0100
@@ -0,0 +1 @@
+remove-distribute.patch
diff -Nru commando-0.3.4/debian/rules commando-0.3.4/debian/rules
--- commando-0.3.4/debian/rules 2013-05-30 16:46:58.000000000 +0200
+++ commando-0.3.4/debian/rules 2014-02-01 20:54:52.000000000 +0100
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+export PYBUILD_NAME=commando
+
 %:
-       dh $@ --with python2
+       dh $@ --with python2 --buildsystem=pybuild

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to