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

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
=== modified file 'debian/changelog'
--- debian/changelog 2011-04-19 04:02:07 +0000
+++ debian/changelog 2011-06-23 14:39:59 +0000
@@ -1,3 +1,10 @@
1lernid (0.8.0.2) oneiric; urgency=low
2
3 * debian/control, debian/rules:
4 (LP: #788514) - Switch to dh_python2
5
6 -- Mat Scales <mat@wibbly.org.uk> Thu, 23 Jun 2011 15:12:56 +0100
7
1lernid (0.8.0.1) natty; urgency=low8lernid (0.8.0.1) natty; urgency=low
29
3 * Closes: LP: #749848: Revert the slide loading function to run synchronously10 * Closes: LP: #749848: Revert the slide loading function to run synchronously
411
=== modified file 'debian/control'
--- debian/control 2011-03-31 01:06:03 +0000
+++ debian/control 2011-06-23 14:39:59 +0000
@@ -1,18 +1,16 @@
1Source: lernid1Source: lernid
2Section: net2Section: net
3Priority: extra3Priority: extra
4Build-Depends: cdbs (>= 0.4.43),4Build-Depends: cdbs (>= 0.4.90~),
5 debhelper (>= 6),5 debhelper (>= 6),
6 python,6 python (>= 2.6.6-3~),
7 python-central (>= 0.6.11),
8Build-Depends-Indep: python-distutils-extra (>= 2.10)7Build-Depends-Indep: python-distutils-extra (>= 2.10)
9Maintainer: Jono Bacon <jono@ubuntu.com>8Maintainer: Jono Bacon <jono@ubuntu.com>
10Standards-Version: 3.8.39Standards-Version: 3.8.3
11XS-Python-Version: current10X-Python-Version: >= 2.6
1211
13Package: lernid12Package: lernid
14Architecture: all13Architecture: all
15XB-Python-Version: ${python:Versions}
16Depends: ${misc:Depends},14Depends: ${misc:Depends},
17 ${python:Depends},15 ${python:Depends},
18 python-xdg,16 python-xdg,
1917
=== modified file 'debian/rules'
--- debian/rules 2010-02-24 22:58:17 +0000
+++ debian/rules 2011-06-23 14:39:59 +0000
@@ -1,6 +1,6 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
22
3DEB_PYTHON_SYSTEM := pycentral3DEB_PYTHON2_MODULE_PACKAGES = lernid
44
5include /usr/share/cdbs/1/rules/debhelper.mk5include /usr/share/cdbs/1/rules/debhelper.mk
6include /usr/share/cdbs/1/class/python-distutils.mk6include /usr/share/cdbs/1/class/python-distutils.mk

Subscribers

People subscribed via source and target branches