[Openstack-devel] NMU of the cmd2 package

[Thomas Goirand]

Hi Frederico,

The build-depends of python-cmd2 were wrong, it was missing for example
python-setuptools, plus python-all should be in Build-Depends, not in
Build-Depends-Indep (because it is needed at the clean stage).

Also, your package is missing Python 3 support.

I have attached the a patch fixing a number of problems in the package.
The patch also adds Python 3 support.

Please apply the patch to your Git on collab-maint. Since you are using
collab-maint, I have guessed that you are open to collaborative
maintenance. However, it wasn't possible for me to push in your
repository due to a unix right problem. To fix it, log on Alioth, and do:

cd /git/collab-maint/cmd2.git
chgrm -R collab-main .
find . -exec chmod g+w {} \;
find . -type d -exec chmod g+s {} \;
git config core.sharedRepository group

then anyone with write access on collab-maint will be able to write in
your Git repository.

As your package is in collab-maint, I have uploaded the package as NMU.
I hope you don't mind that. I indeed needed this fix urgently (as I am
trying to upload all needed dependencies for the next release of
OpenStack due for the 17th of October).

Because it adds a python3 new binary package, it will go through the NEW
queue. So if you would like to change anything, it is still possible to
ask the FTP masters to reject the package (it often takes a long time
for them to accept or reject packages). I will then be happy to sponsor
an upload for you, also for any new version that you may need.

Cheers,

Thomas Goirand (zigo)
-------------- next part --------------
diff -Nru cmd2-0.6.7/debian/changelog cmd2-0.6.7/debian/changelog
--- cmd2-0.6.7/debian/changelog	2013-09-28 14:16:09.000000000 +0000
+++ cmd2-0.6.7/debian/changelog	2013-10-05 08:58:21.000000000 +0000
@@ -1,3 +1,14 @@
+cmd2 (0.6.7-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Adds support for python3 (and corresponding build-depends).
+  * Fixed missing python-setuptools build-depends.
+  * Added extend-diff-ignore = "^[^/]*[.]egg-info/" in debian/source/options.
+  * Added rm -rf build in dh_clean target.
+  * VCS URLs now canonical.
+
+ -- Thomas Goirand <zigo at debian.org>  Sat, 05 Oct 2013 08:46:30 +0000
+
 cmd2 (0.6.7-1) unstable; urgency=low
 
   * New upstream release. (Closes: #724206)
diff -Nru cmd2-0.6.7/debian/control cmd2-0.6.7/debian/control
--- cmd2-0.6.7/debian/control	2013-09-28 14:16:09.000000000 +0000
+++ cmd2-0.6.7/debian/control	2013-10-05 09:01:29.000000000 +0000
@@ -2,25 +2,45 @@
 Section: python
 Priority: optional
 Maintainer: Federico Ceratto <federico.ceratto at gmail.com>
-Build-Depends:
- debhelper (>= 9~)
-Build-Depends-Indep:
- python-all (>= 2.6.6-3~)
+Build-Depends: debhelper (>= 9~),
+               python-all (>= 2.6.6-3~),
+               python-setuptools,
+               python3-all,
+               python3-setuptools
 Standards-Version: 3.9.4
 X-Python-Version: >= 2.5
 Homepage: https://bitbucket.org/catherinedevlin/cmd2
-Vcs-Git: git://git.debian.org/git/collab-maint/cmd2.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/cmd2.git;a=summary
+Vcs-Git: git://anonscm.debian.org/collab-maint/cmd2.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/cmd2.git;a=summary
 
 Package: python-cmd2
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${misc:Depends}
- , ${python:Depends}
- , python-setuptools (>= 0.6.14)
- , python-pyparsing (>= 2.0.1)
+Depends: python-pyparsing (>= 2.0.1),
+         python-setuptools (>= 0.6.14),
+         ${misc:Depends},
+         ${python:Depends}
+Recommends: ${python:Recommends}
 Provides: ${python:Provides}
-Description: enhanced Python cmd module
+Description: enhanced Python cmd module - Python 2.x
  Drop-in replacement adds several features for command-prompt tools, like
  searchable and persistent command history, multi-line commands, input and
  output redirections, integrated Python shell, testing helpers
+ .
+ This package provides the Python 2.x module.
+
+Package: python3-cmd2
+Architecture: all
+Pre-Depends: dpkg (>= 1.15.6~)
+Depends: python3-pyparsing (>= 2.0.1),
+         python3-setuptools (>= 0.6.14),
+         ${misc:Depends},
+         ${python3:Depends}
+Recommends: ${python3:Recommends}
+Provides: ${python3:Provides}
+Description: enhanced Python cmd module - Python 3.x
+ Drop-in replacement adds several features for command-prompt tools, like
+ searchable and persistent command history, multi-line commands, input and
+ output redirections, integrated Python shell, testing helpers
+ .
+ This package provides the Python 3.x module.
diff -Nru cmd2-0.6.7/debian/rules cmd2-0.6.7/debian/rules
--- cmd2-0.6.7/debian/rules	2013-09-28 14:16:09.000000000 +0000
+++ cmd2-0.6.7/debian/rules	2013-10-05 08:54:56.000000000 +0000
@@ -1,4 +1,21 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE=1
+
+PYTHONS:=$(shell pyversions -vr)
+PYTHON3S:=$(shell py3versions -vr)
+
 %:
-	dh $@ --with python2
+	dh $@ --buildsystem=python_distutils --with python2,python3
+
+override_dh_auto_install:
+	set -e && for pyvers in $(PYTHONS); do \
+		python$$pyvers setup.py install --install-layout=deb \
+			--root $(CURDIR)/debian/python-cmd2; \
+	done
+	set -e && for pyvers in $(PYTHON3S); do \
+		python$$pyvers setup.py install --install-layout=deb \
+			--root $(CURDIR)/debian/python3-cmd2; \
+	done
+
+override_dh_clean:
+	dh_clean -O--buildsystem=python_distutils
+	rm -rf build
diff -Nru cmd2-0.6.7/debian/source/options cmd2-0.6.7/debian/source/options
--- cmd2-0.6.7/debian/source/options	1970-01-01 00:00:00.000000000 +0000
+++ cmd2-0.6.7/debian/source/options	2013-10-05 08:54:49.000000000 +0000
@@ -0,0 +1 @@
+extend-diff-ignore = "^[^/]*[.]egg-info/"