Merge lp:~gandelman-a/ubuntu/raring/python-jenkinsapi/bs4-fix into lp:ubuntu/raring/python-jenkinsapi

Proposed by Adam Gandelman on 2013-03-11
Status: Merged
Merged at revision: 7
Proposed branch: lp:~gandelman-a/ubuntu/raring/python-jenkinsapi/bs4-fix
Merge into: lp:ubuntu/raring/python-jenkinsapi
Diff against target: 35 lines (+11/-1)
3 files modified
debian/changelog (+8/-0)
debian/control (+2/-1)
debian/pydist-overrides (+1/-0)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/raring/python-jenkinsapi/bs4-fix
Reviewer Review Type Date Requested Status
Daniel Holbach Approve on 2013-03-11
Ubuntu branches 2013-03-11 Pending
Review via email: mp+152606@code.launchpad.net
To post a comment you must log in.
Daniel Holbach (dholbach) wrote :

Good work. Uploaded.

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 2012-08-26 18:13:53 +0000
3+++ debian/changelog 2013-03-11 01:39:22 +0000
4@@ -1,3 +1,11 @@
5+python-jenkinsapi (0.1.11-5ubuntu1) raring-proposed; urgency=low
6+
7+ * debian/pydist-overrides: Add pydist-overrides to override
8+ beautifulsoup4 -> python-bs4 (LP: #1153412).
9+ * Update maintainer.
10+
11+ -- Adam Gandelman <adamg@ubuntu.com> Sun, 10 Mar 2013 18:36:37 -0700
12+
13 python-jenkinsapi (0.1.11-5) unstable; urgency=low
14
15 * Correct Build-Depends for dh addon.
16
17=== modified file 'debian/control'
18--- debian/control 2012-08-26 18:13:53 +0000
19+++ debian/control 2013-03-11 01:39:22 +0000
20@@ -1,7 +1,8 @@
21 Source: python-jenkinsapi
22 Section: python
23 Priority: optional
24-Maintainer: Al Stone <ahs3@debian.org>
25+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
26+XSBC-Original-Maintainer: Al Stone <ahs3@debian.org>
27 Build-Depends: debhelper (>= 8.0.0), python-all, python-lxml, python-setuptools
28 Standards-Version: 3.9.3
29 Homepage: http://pypi.python.org/pypi/jenkinsapi
30
31=== added file 'debian/pydist-overrides'
32--- debian/pydist-overrides 1970-01-01 00:00:00 +0000
33+++ debian/pydist-overrides 2013-03-11 01:39:22 +0000
34@@ -0,0 +1,1 @@
35+beautifulsoup4 python-bs4

Subscribers

People subscribed via source and target branches