Merge lp:~lool/computer-janitor/gir-pango-dep into lp:computer-janitor

Proposed by Loïc Minier
Status: Merged
Merged at revision: 256
Proposed branch: lp:~lool/computer-janitor/gir-pango-dep
Merge into: lp:computer-janitor
Diff against target: 43 lines (+12/-5)
2 files modified
debian/changelog (+7/-0)
debian/control (+5/-5)
To merge this branch: bzr merge lp:~lool/computer-janitor/gir-pango-dep
Reviewer Review Type Date Requested Status
computer-janitor-hackers Pending
Review via email: mp+50132@code.launchpad.net

Description of the change

Hey

I've actually uploaded a different version to the archive where I also comment out Vcs-Bzr since I can't commit to it

Would you mind merging either this version or the version with the archive (but then revert the Vcs-Bzr change), and adding ~ubuntu-dev to ~computer-janitor-hackers or something?

Thanks

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
=== modified file 'debian/changelog'
--- debian/changelog 2011-02-16 20:59:06 +0000
+++ debian/changelog 2011-02-17 11:56:00 +0000
@@ -1,3 +1,10 @@
1computer-janitor (2.1.0-0ubuntu2) natty; urgency=low
2
3 * control: computer-janitor-gtk depends gir1.2-pango-1.0 not
4 gir1.2-pango-2.0; LP: #720529.
5
6 -- Loïc Minier <loic.minier@ubuntu.com> Thu, 17 Feb 2011 12:48:55 +0100
7
1computer-janitor (2.1.0-0ubuntu1) natty; urgency=low8computer-janitor (2.1.0-0ubuntu1) natty; urgency=low
29
3 [ Martin Pitt ]10 [ Martin Pitt ]
411
=== modified file 'debian/control'
--- debian/control 2011-01-19 16:24:24 +0000
+++ debian/control 2011-02-17 11:56:00 +0000
@@ -4,7 +4,7 @@
4Section: admin4Section: admin
5Priority: optional5Priority: optional
6Standards-Version: 3.9.16Standards-Version: 3.9.1
7Build-Depends: debhelper (>= 7.3), python-support (>= 1.0.3), 7Build-Depends: debhelper (>= 7.3), python-support (>= 1.0.3),
8 python, python-apt, python-setuptools, python-distutils-extra8 python, python-apt, python-setuptools, python-distutils-extra
9XS-Python-Version: current9XS-Python-Version: current
10Vcs-Bzr: http://bazaar.launchpad.net/%7Ecomputer-janitor-hackers/computer-janitor/trunk10Vcs-Bzr: http://bazaar.launchpad.net/%7Ecomputer-janitor-hackers/computer-janitor/trunk
@@ -33,11 +33,11 @@
3333
34Package: computer-janitor-gtk34Package: computer-janitor-gtk
35Architecture: all35Architecture: all
36Depends: ${python:Depends}, 36Depends: ${python:Depends},
37 computer-janitor (=${source:Version}), 37 computer-janitor (=${source:Version}),
38 python-gobject (>= 2.27.0+git20110116),38 python-gobject (>= 2.27.0+git20110116),
39 gir1.2-gtk-2.0 (>= 2.23.90-0ubuntu3), 39 gir1.2-gtk-2.0 (>= 2.23.90-0ubuntu3),
40 gir1.2-pango-2.0,40 gir1.2-pango-1.0,
41 ${misc:Depends}41 ${misc:Depends}
42XB-Python-Version: ${python:Versions}42XB-Python-Version: ${python:Versions}
43Description: Clean up a system so it's more like a freshly installed one43Description: Clean up a system so it's more like a freshly installed one

Subscribers

People subscribed via source and target branches