Ubuntu
ubuntuone-control-panel package

Merge lp:~dobey/ubuntu/oneiric/ubuntuone-control-panel/use-dhpython2 into lp:ubuntu/oneiric/ubuntuone-control-panel

  1. Oneiric (11.10)
  2. use-dhpython2
  3. Merge into oneiric
Proposed by dobey
Status: Merged
Merged at revision: 25
Proposed branch: lp:~dobey/ubuntu/oneiric/ubuntuone-control-panel/use-dhpython2
Merge into: lp:ubuntu/oneiric/ubuntuone-control-panel
Diff against target: 80 lines (+14/-10)
4 files modified
debian/changelog (+6/-0)
debian/compat (+1/-1)
debian/control (+5/-8)
debian/rules (+2/-1)
To merge this branch: bzr merge lp:~dobey/ubuntu/oneiric/ubuntuone-control-panel/use-dhpython2
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+68459@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-05-17 15:29:16 +0000
3+++ debian/changelog 2011-07-19 20:28:33 +0000
4@@ -1,3 +1,9 @@
5+ubuntuone-control-panel (1.0.0-0ubuntu3) oneiric; urgency=low
6+
7+ * Convert to dh_python2
8+
9+ -- Rodney Dawes <rodney.dawes@ubuntu.com> Tue, 19 Jul 2011 16:21:42 -0400
10+
11 ubuntuone-control-panel (1.0.0-0ubuntu2) oneiric; urgency=low
12
13 * debian/control: ubuntuone-control-panel-gtk depends on python-aptdaemon-gtk
14
15=== modified file 'debian/compat'
16--- debian/compat 2010-12-06 12:27:11 +0000
17+++ debian/compat 2011-07-19 20:28:33 +0000
18@@ -1,1 +1,1 @@
19-6
20+7
21
22=== modified file 'debian/control'
23--- debian/control 2011-05-11 10:41:48 +0000
24+++ debian/control 2011-07-19 20:28:33 +0000
25@@ -1,18 +1,16 @@
26 Source: ubuntuone-control-panel
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: cdbs (>= 0.4.90),
34+ debhelper (>= 7.0.14),
35+ python (>= 2.6.6),
36 python-distutils-extra (>= 2.10)
37 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
38 Standards-Version: 3.9.1
39-XS-Python-Version: current
40+X-Python-Version: >= 2.6
41
42 Package: ubuntuone-control-panel
43 Architecture: all
44-XB-Python-Version: ${python:Versions}
45 Depends: ${misc:Depends},
46 ${python:Depends},
47 python,
48@@ -27,7 +25,6 @@
49 Package: python-ubuntuone-control-panel
50 Section: python
51 Architecture: all
52-XB-Python-Version: ${python:Versions}
53 Depends: ${misc:Depends},
54 ${python:Depends},
55 gir1.2-soup-2.4,
56@@ -45,7 +42,6 @@
57
58 Package: ubuntuone-control-panel-gtk
59 Architecture: all
60-XB-Python-Version: ${python:Versions}
61 Depends: ${misc:Depends},
62 ${python:Depends},
63 python,
64@@ -62,3 +58,4 @@
65 Provides: ubuntuone-control-panel-gui
66 Description: Ubuntu One Control Panel
67 GTK+ desktop application to manage a Ubuntu One account.
68+
69
70=== modified file 'debian/rules'
71--- debian/rules 2010-12-06 12:27:11 +0000
72+++ debian/rules 2011-07-19 20:28:33 +0000
73@@ -1,5 +1,6 @@
74 #!/usr/bin/make -f
75-DEB_PYTHON_SYSTEM := pysupport
76+
77+DEB_PYTHON2_MODULE_PACKAGES = python-ubuntuone-control-panel ubuntuone-control-panel-gtk
78
79 include /usr/share/cdbs/1/rules/debhelper.mk
80 include /usr/share/cdbs/1/class/python-distutils.mk

Subscribers

People subscribed via source and target branches

to all changes: