Merge lp:~danilo/ubuntu/raring/command-not-found/python2-package into lp:ubuntu/raring/command-not-found

[Данило Шеган]

Provide a python-commandnotfound package which installs CommandNotFound into Python2 paths as well.

This is a solution for bug 1123193.

Some improvements already done as per https://code.launchpad.net/~danilo/ubuntu/quantal/command-not-found/python2-package/+merge/147965

[Dmitry Shachnev (mitya57)]

Thanks a lot for your work here!

Only minor issues are remaining:

- lintian emits:

    W: python-commandnotfound: wrong-section-according-to-package-name python-commandnotfound => python
    I: python-commandnotfound: extended-description-is-probably-too-short
    I: command-not-found source: duplicate-short-description command-not-found python-commandnotfound

- Is the build-dependency on python[3]-dev really needed?

[Данило Шеган (danilo)]

Here're the simple fixes. I'll need to double check the python3?-dev deps since it was originally in.

[Barry Warsaw (barry)]

Hmm, I wonder if we shouldn't restructure this package in a better, more Debian Python policy compliant way.

Meaning, the following binary packages:

 * python-commandnotfound - Python 2 library
 * python3-commandnotfound - Python 3 library
 * command-not-found-data - unchanged
 * command-not-found - everything else

Obviously command-not-found would Depends on python3-commandnotfound

[Barry Warsaw (barry)]

How about verifying and updating Standards-Version too?

[Barry Warsaw (barry)]

Also, is --without=python-support really necessary?

review: Needs Fixing

[Bryce Harrington (bryce)]

[Setting to WIP to remove this from sponsor queue; please set back to Needs Review once it's ready for review again.]

[Barry Warsaw (barry)]

I'm going to fix these problems and upload - thanks Danilo!

[Barry Warsaw (barry)]

review: Approve

[Данило Шеган (danilo)]

Thanks Barry: it'd probably take me days to get all of that fixed considering my packaging experience :)

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-26 11:19:07 +0000
+++ debian/changelog	2013-02-25 22:29:20 +0000
@@ -1,3 +1,9 @@
+command-not-found (0.3ubuntu7) raring; urgency=low
+
+  * Reintroduce Python2 support with python-commandnotfound package.
+
+ -- Danilo Segan <[e-mail]>  Wed, 20 Feb 2013 09:51:10 +0100
+
 command-not-found (0.3ubuntu6) raring; urgency=low
 
   * Build depend on python3-all.

=== modified file 'debian/command-not-found.install'
--- debian/command-not-found.install	2012-02-03 10:10:52 +0000
+++ debian/command-not-found.install	2013-02-25 22:29:20 +0000
@@ -1,3 +1,3 @@
-usr/lib
+usr/lib/python3
 usr/bin
 etc/
\ No newline at end of file

=== modified file 'debian/control'
--- debian/control	2012-10-26 11:19:07 +0000
+++ debian/control	2013-02-25 22:29:20 +0000
@@ -11,9 +11,15 @@
                python3-apt,
                python3-gdbm,
                python3-distutils-extra,
+               python,
+               python-dev,
+               python-apt,
+               python-gdbm,
+               python-distutils-extra,
 Standards-Version: 3.7.2
 XS-Vcs-Bzr: http://launchpad.net/~ubuntu-core-dev/command-not-found/ubuntu
 X-Python3-Version: >= 3.2
+X-Python-Version: >= 2.7
 
 Package: command-not-found
 Architecture: all
@@ -28,3 +34,11 @@
 Description: Set of data files for command-not-found.
  This package provides the required data used by the command-not-found 
  application.
+
+Package: python-commandnotfound
+Section: python
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}, python-apt, command-not-found-data, python-gdbm, lsb-release
+Description: Python2 bindings for command-not-found.
+ This package will install Python2 library for command_not_found tool.
+ Useful if you still have programs in Python2 that depend on it.

=== added file 'debian/python-commandnotfound.install'
--- debian/python-commandnotfound.install	1970-01-01 00:00:00 +0000
+++ debian/python-commandnotfound.install	2013-02-25 22:29:20 +0000
@@ -0,0 +1,1 @@
+usr/lib/python2.*/*-packages/*

=== modified file 'debian/rules'
--- debian/rules	2012-06-29 13:46:06 +0000
+++ debian/rules	2013-02-25 22:29:20 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with=python3 --without=python-support
+	dh $@ --with=python2,python3 --without=python-support
 
 PY3REQUESTED := $(shell py3versions -r)
 PY3DEFAULT := $(shell py3versions -d)
@@ -10,6 +10,7 @@
 PY3 := $(filter-out $(PY3DEFAULT),$(PY3REQUESTED)) python3
 
 override_dh_auto_build:
+	dh_auto_build
 	set -e; for python in $(PY3); do \
 		$$python setup.py build; \
 	done
@@ -23,6 +24,7 @@
 	find -name __pycache__ -print0 | xargs -0r rm -rf
 
 override_dh_auto_install:
+	dh_auto_install
 	set -e; for python in $(PY3); do \
 		$$python setup.py install --force --root=$(CURDIR)/debian/tmp \
 			--no-compile -O0 --install-layout=deb; \