Merge lp:~jtaylor/ubuntu/oneiric/genshi/dh_python2 into lp:ubuntu/oneiric/genshi

Proposed by Julian Taylor
Status: Merged
Merge reported by: Barry Warsaw
Merged at revision: not available
Proposed branch: lp:~jtaylor/ubuntu/oneiric/genshi/dh_python2
Merge into: lp:ubuntu/oneiric/genshi
Diff against target: 53 lines (+8/-7)
5 files modified
debian/changelog (+6/-0)
debian/control (+2/-3)
debian/pycompat (+0/-1)
debian/pyversions (+0/-1)
debian/rules (+0/-2)
To merge this branch: bzr merge lp:~jtaylor/ubuntu/oneiric/genshi/dh_python2
Reviewer Review Type Date Requested Status
Barry Warsaw (community) Approve
Ubuntu branches Pending
Review via email: mp+71051@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Barry Warsaw (barry) wrote :

Looks great, thanks! Sponsored.

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 2010-12-03 00:00:28 +0000
3+++ debian/changelog 2011-08-10 14:24:46 +0000
4@@ -1,3 +1,9 @@
5+genshi (0.6-1ubuntu3) oneiric; urgency=low
6+
7+ * switch do dh_python2 (LP: #788514)
8+
9+ -- Julian Taylor <jtaylor.debian@googlemail.com> Wed, 10 Aug 2011 16:08:27 +0200
10+
11 genshi (0.6-1ubuntu2) natty; urgency=low
12
13 * Rebuild to add support for python 2.7.
14
15=== modified file 'debian/control'
16--- debian/control 2010-05-05 02:05:51 +0000
17+++ debian/control 2011-08-10 14:24:46 +0000
18@@ -5,9 +5,8 @@
19 XSBC-Original-Maintainer: Arnaud Fontaine <arnau@debian.org>
20 Uploaders: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
21 Build-Depends: debhelper (>= 5.0.37.2),
22- cdbs (>= 0.4.43),
23- python-all-dev (>= 2.4),
24- python-support (>= 0.7.1),
25+ cdbs (>= 0.4.90~),
26+ python-all-dev (>= 2.6.6-3~),
27 python-setuptools (>= 0.6b3)
28 Standards-Version: 3.8.4
29 Homepage: http://genshi.edgewall.org/
30
31=== removed file 'debian/pycompat'
32--- debian/pycompat 2006-11-02 23:42:32 +0000
33+++ debian/pycompat 1970-01-01 00:00:00 +0000
34@@ -1,1 +0,0 @@
35-2
36
37=== removed file 'debian/pyversions'
38--- debian/pyversions 2008-03-08 13:55:45 +0000
39+++ debian/pyversions 1970-01-01 00:00:00 +0000
40@@ -1,1 +0,0 @@
41-2.4-
42
43=== modified file 'debian/rules'
44--- debian/rules 2010-05-05 02:05:51 +0000
45+++ debian/rules 2011-08-10 14:24:46 +0000
46@@ -1,8 +1,6 @@
47 #!/usr/bin/make -f
48 # -*- mode: makefile; coding: utf-8 -*-
49
50-DEB_PYTHON_SYSTEM=pysupport
51-
52 include /usr/share/cdbs/1/rules/debhelper.mk
53 include /usr/share/cdbs/1/class/python-distutils.mk
54

Subscribers

People subscribed via source and target branches

to all changes: