Merge lp:~wibblymat/ubuntu/oneiric/lernid/remove-pycentral into lp:ubuntu/oneiric/lernid

Proposed by Mat Scales
Status: Merged
Merged at revision: 6
Proposed branch: lp:~wibblymat/ubuntu/oneiric/lernid/remove-pycentral
Merge into: lp:ubuntu/oneiric/lernid
Diff against target: 52 lines (+11/-6)
3 files modified
debian/changelog (+7/-0)
debian/control (+3/-5)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~wibblymat/ubuntu/oneiric/lernid/remove-pycentral
Reviewer Review Type Date Requested Status
Stefano Rivera Approve
Ubuntu branches Pending
Review via email: mp+65677@code.launchpad.net

Description of the change

Removed the dependency on pycentral, as described at https://wiki.ubuntu.com/BarryWarsaw/PythonHelpers

To post a comment you must log in.
6. By Mat Scales on 2011-06-23

Changed the version

Revision history for this message
Stefano Rivera (stefanor) wrote :
review: Approve

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-04-19 04:02:07 +0000
3+++ debian/changelog 2011-06-23 14:39:59 +0000
4@@ -1,3 +1,10 @@
5+lernid (0.8.0.2) oneiric; urgency=low
6+
7+ * debian/control, debian/rules:
8+ (LP: #788514) - Switch to dh_python2
9+
10+ -- Mat Scales <mat@wibbly.org.uk> Thu, 23 Jun 2011 15:12:56 +0100
11+
12 lernid (0.8.0.1) natty; urgency=low
13
14 * Closes: LP: #749848: Revert the slide loading function to run synchronously
15
16=== modified file 'debian/control'
17--- debian/control 2011-03-31 01:06:03 +0000
18+++ debian/control 2011-06-23 14:39:59 +0000
19@@ -1,18 +1,16 @@
20 Source: lernid
21 Section: net
22 Priority: extra
23-Build-Depends: cdbs (>= 0.4.43),
24+Build-Depends: cdbs (>= 0.4.90~),
25 debhelper (>= 6),
26- python,
27- python-central (>= 0.6.11),
28+ python (>= 2.6.6-3~),
29 Build-Depends-Indep: python-distutils-extra (>= 2.10)
30 Maintainer: Jono Bacon <jono@ubuntu.com>
31 Standards-Version: 3.8.3
32-XS-Python-Version: current
33+X-Python-Version: >= 2.6
34
35 Package: lernid
36 Architecture: all
37-XB-Python-Version: ${python:Versions}
38 Depends: ${misc:Depends},
39 ${python:Depends},
40 python-xdg,
41
42=== modified file 'debian/rules'
43--- debian/rules 2010-02-24 22:58:17 +0000
44+++ debian/rules 2011-06-23 14:39:59 +0000
45@@ -1,6 +1,6 @@
46 #!/usr/bin/make -f
47
48-DEB_PYTHON_SYSTEM := pycentral
49+DEB_PYTHON2_MODULE_PACKAGES = lernid
50
51 include /usr/share/cdbs/1/rules/debhelper.mk
52 include /usr/share/cdbs/1/class/python-distutils.mk

Subscribers

People subscribed via source and target branches