Ubuntu Single Sign On Client

Merge lp:~mvo/ubuntu-sso-client/dh_python2 into lp:ubuntu/oneiric/ubuntu-sso-client

Proposed by Michael Vogt on 2011-06-10
Status: Merged
Merged at revision: 32
Proposed branch: lp:~mvo/ubuntu-sso-client/dh_python2
Merge into: lp:ubuntu/oneiric/ubuntu-sso-client
Diff against target: 51 lines (+11/-9) 4 files modified
To merge this branch: bzr merge lp:~mvo/ubuntu-sso-client/dh_python2
Reviewer Review Type Date Requested Status
Ubuntu branches 2011-06-10 Pending
Review via email: mp+64154@code.launchpad.net

Description of the Change

This changes the python helper from python-support to dh_python2 and the build system from cdbs to debhelper7.

To post a comment you must log in.
Michael Vogt (mvo) wrote :

For some background on the switch, please see the announcement from Barry:
https://lists.ubuntu.com/archives/ubuntu-devel-announce/2011-June/000857.html

Charlie_Smotherman (cjsmo) wrote :

Although XS-Python-Version: current is still supported it is strongly suggested to change XS-P-V to X-P-V. I would suggest X-Python-Version: >=2.6. XB-Python-Version should be removed. Just my $0.02

http://wiki.debian.org/Python/PythonSupportToDHPython2

Have a nice day :)

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2011-04-26 08:48:51 +0000
3+++ debian/changelog 2011-06-10 11:17:05 +0000
4@@ -1,3 +1,9 @@
5+ubuntu-sso-client (1.2.1-0ubuntu3) oneiric; urgency=low
6+
7+ * switch to dh_python2 and dh7
8+
9+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 10 Jun 2011 13:06:27 +0200
10+
11 ubuntu-sso-client (1.2.1-0ubuntu2) natty-proposed; urgency=low
12
13 * debian/control
14
15=== modified file 'debian/compat'
16--- debian/compat 2010-06-16 15:11:04 +0000
17+++ debian/compat 2011-06-10 11:17:05 +0000
18@@ -1,1 +1,1 @@
19-6
20+7
21
22=== modified file 'debian/control'
23--- debian/control 2011-04-26 08:48:51 +0000
24+++ debian/control 2011-06-10 11:17:05 +0000
25@@ -1,10 +1,8 @@
26 Source: ubuntu-sso-client
27 Section: python
28 Priority: extra
29-Build-Depends: cdbs (>= 0.4.43),
30- debhelper (>= 6),
31- python,
32- python-support (>= 0.6.4),
33+Build-Depends: debhelper (>= 7),
34+ python (>= 2.6.6-3~),
35 python-distutils-extra (>= 2.10)
36 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
37 XSBC-Original-Maintainer: Natalia Bidart <natalia.bidart@canonical.com>
38
39=== modified file 'debian/rules'
40--- debian/rules 2010-06-16 15:11:04 +0000
41+++ debian/rules 2011-06-10 11:17:05 +0000
42@@ -1,6 +1,4 @@
43 #!/usr/bin/make -f
44-DEB_PYTHON_SYSTEM := pysupport
45
46-include /usr/share/cdbs/1/rules/debhelper.mk
47-include /usr/share/cdbs/1/class/python-distutils.mk
48-include /usr/share/cdbs/1/rules/langpack.mk
49+%:
50+ dh $@ --with python2
51\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: