Merge lp:~stgraber/update-manager/update-manager-split-modules into lp:update-manager

[Stéphane Graber]

[lp:~stgraber/update-manager/update-manager-split-modules]

2475. By Stéphane Graber on 2012-06-12

Update version dependency of python-apt and python3-apt

2476. By Stéphane Graber on 2012-06-12

Move from -all-dev to -all python packages as we no longer build binaries

2477. By Stéphane Graber on 2012-06-12

Update target of DistUpgrade/apt_clone.py for new python3 version of apt-clone

2478. By Stéphane Graber on 2012-06-12

Add versioned dependency on apt-clone

2479. By Stéphane Graber on 2012-06-12

Set base python version to 3.2

2480. By Stéphane Graber on 2012-06-12

Set the right version of apt-clone

2481. By Stéphane Graber on 2012-06-12

Set uploaded apt-clone version as minimum

[Barry Warsaw (barry)]

review: Approve

=== modified symlink 'DistUpgrade/apt_clone.py'
=== target changed u'/usr/share/pyshared/apt_clone.py' => u'/usr/lib/python3/dist-packages/apt_clone.py'
=== modified file 'debian/changelog'
--- debian/changelog	2012-06-12 16:59:59 +0000
+++ debian/changelog	2012-06-12 22:03:19 +0000
@@ -71,6 +71,10 @@
   [ Stéphane Graber ]
   * Drop fdsend as it's not used and doesn't build with python3.
   * Make update-manager-core a binary all packages (everything is python).
+  * Split update-manager-core into python-update-manager,
+    python3-update-manager and update-manager-core.
+  * Build-depend and depend on python-apt >= 0.8.5~ as we need proper
+    python3 support.
 
  -- Colin Watson <[e-mail]>  Mon, 11 Jun 2012 11:46:37 +0100
 

=== modified file 'debian/control'
--- debian/control	2012-06-12 16:59:59 +0000
+++ debian/control	2012-06-12 22:03:19 +0000
@@ -3,25 +3,28 @@
 Priority: optional
 Maintainer: Michael Vogt <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50~), 
-               python-all-dev (>= 2.7),
+               python-all (>= 2.7),
                python-distutils-extra (>= 1.90), 
-               python-apt (>= 0.8.0),
+               python-apt (>= 0.8.5~),
+               python3-all,
+               python3-distutils-extra,
                lsb-release,
                ubuntu-drivers-common [i386 amd64], 
-               apt-clone
+               apt-clone (>= 0.2.3~ubuntu1)
 Build-Depends-Indep: libxml-parser-perl, 
                      scrollkeeper, 
                      intltool
 Standards-Version: 3.8.0
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/update-manager/main
 X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.2
 
 Package: update-manager-core
 Architecture: all
 Section: admin
 Depends: ${python:Depends}, 
          ${misc:Depends}, 
-         python-apt (>= 0.8.0),
+         python-update-manager,
          lsb-release
 Recommends: libpam-modules (>= 1.0.1-9ubuntu3)
 Replaces: update-manager (<< 1:0.146.2)
@@ -30,6 +33,34 @@
 Description: manage release upgrades
  This is the core of update-manager and the release upgrader
 
+Package: python-update-manager
+Architecture: all
+Section: admin
+Replaces: update-manager-core (<< 1:0.163)
+Breaks: update-manager-core (<< 1:0.163)
+Depends: ${python:Depends}, 
+         ${misc:Depends}, 
+         python-apt (>= 0.8.5~),
+         lsb-release
+Description: python 2.x module for update-manager
+ Python modules for update-manager (DistUpgrade, UpdateManager).
+ .
+ This package contains the python 2.x version of these modules.
+
+Package: python3-update-manager
+Architecture: all
+Section: admin
+Replaces: update-manager-core (<< 1:0.163)
+Breaks: update-manager-core (<< 1:0.163)
+Depends: ${python3:Depends},
+         ${misc:Depends},
+         python3-apt (>= 0.8.5~),
+         lsb-release
+Description: python 3.x module for update-manager
+ Python modules for update-manager (DistUpgrade, UpdateManager).
+ .
+ This package contains the python 3.x version of these modules.
+
 Package: update-manager
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, 

=== added file 'debian/python-update-manager.install'
--- debian/python-update-manager.install	1970-01-01 00:00:00 +0000
+++ debian/python-update-manager.install	2012-06-12 22:03:19 +0000
@@ -0,0 +1,4 @@
+debian/tmp/usr/lib/python2*/dist-packages/UpdateManager/Core
+debian/tmp/usr/lib/python2*/dist-packages/UpdateManager/__init__.py
+debian/tmp/usr/lib/python2*/dist-packages/DistUpgrade
+debian/tmp/usr/lib/python2*/dist-packages/janitor

=== added file 'debian/python3-update-manager.install'
--- debian/python3-update-manager.install	1970-01-01 00:00:00 +0000
+++ debian/python3-update-manager.install	2012-06-12 22:03:19 +0000
@@ -0,0 +1,4 @@
+debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/Core
+debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/__init__.py
+debian/tmp/usr/lib/python3*/dist-packages/DistUpgrade
+debian/tmp/usr/lib/python3*/dist-packages/janitor

=== modified file 'debian/rules'
--- debian/rules	2012-06-01 19:53:40 +0000
+++ debian/rules	2012-06-12 22:03:19 +0000
@@ -4,7 +4,7 @@
 DIST=$(shell lsb_release -c -s)
 DEBVER=$(shell LC_ALL=C dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' | sed s/.*://)
 TARNAME=dist-upgrader_$(DEBVER)_$(ARCH).tar.gz
-DH_ARGS=--with=python2
+DH_ARGS=--with=python2,python3
 %:
 	dh $@ $(DH_ARGS)
 
@@ -26,3 +26,15 @@
 	       $(DEBVER)/*ReleaseAnnouncement* \
                $(DEBVER)/$(DIST).tar.gz )
 	dpkg-distaddfile $(TARNAME) raw-dist-upgrader -
+
+override_dh_auto_build:
+	dh_auto_build
+	set -ex; for python in $(shell py3versions -r); do \
+		$$python setup.py build; \
+	done
+
+override_dh_auto_install:
+	dh_auto_install
+	set -ex; for python in $(shell py3versions -r); do \
+		$$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
+	done

=== modified file 'debian/update-manager-core.dirs'
--- debian/update-manager-core.dirs	2012-06-11 15:08:35 +0000
+++ debian/update-manager-core.dirs	2012-06-12 22:03:19 +0000
@@ -4,4 +4,3 @@
 etc/update-motd.d
 etc/update-manager/release-upgrades.d
 usr/bin
-usr/lib/python*/dist-packages/janitor

=== modified file 'debian/update-manager-core.install'
--- debian/update-manager-core.install	2012-06-12 16:59:59 +0000
+++ debian/update-manager-core.install	2012-06-12 22:03:19 +0000
@@ -3,10 +3,6 @@
 debian/tmp/etc/update-manager/*
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/update-manager/*.cfg
-debian/tmp/usr/lib/python*/dist-packages/UpdateManager/Core
-debian/tmp/usr/lib/python*/dist-packages/UpdateManager/__init__.py
-debian/tmp/usr/lib/python*/dist-packages/DistUpgrade
-debian/tmp/usr/lib/python*/dist-packages/janitor
 debian/release-upgrade-motd usr/lib/update-manager
 debian/91-release-upgrade etc/update-motd.d/
 debian/source_update-manager.py /usr/share/apport/package-hooks/