Ubuntu
system-config-printer package

Merge lp:~mterry/ubuntu/maverick/system-config-printer/gtkbuilder into lp:ubuntu/maverick/system-config-printer

Proposed by Michael Terry on 2010-10-05

Status:

Merged

Merge reported by:

Merged at revision:

not available

Proposed branch:

Merge into:

Diff against target:

2 files modified

debian/changelog (+7/-0)
debian/control (+1/-1)

To merge this branch:

bzr merge lp:~mterry/ubuntu/maverick/system-config-printer/gtkbuilder

Wishlist

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Ubuntu Development Team		2010-10-05	Pending
Review via email: mp+37621@code.launchpad.net

Revision history for this message

Sebastien Bacher (seb128) wrote on 2010-11-04:

Till did a similar change, closing the merge request

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'debian/changelog'
2	--- debian/changelog 2010-09-16 14:43:06 +0000
3	+++ debian/changelog 2010-10-05 15:31:50 +0000
4	@@ -1,3 +1,10 @@
5	+system-config-printer (1.2.3+20100723-0ubuntu8) maverick; urgency=low
6	+
7	+ * debian/control: Drop dependency on python-glade2 and bump the required
8	+ version of python-gtk2. LP: #403540
9	+
10	+ -- Michael Terry <mterry@ubuntu.com> Tue, 05 Oct 2010 11:22:52 -0400
11	+
12	system-config-printer (1.2.3+20100723-0ubuntu7) maverick; urgency=low
13
14	* debian/patches/70_select-ppd-by-command-set.patch: Updated the patch so
15
16	=== modified file 'debian/control'
17	--- debian/control 2010-07-28 14:50:06 +0000
18	+++ debian/control 2010-10-05 15:31:50 +0000
19	@@ -41,7 +41,7 @@
20
21	Package: system-config-printer-gnome
22	Architecture: all
23	-Depends: ${shlibs:Depends}, ${python:Depends}, system-config-printer-common, python-gtk2, python-glade2, python-gnome2, python-notify, python-gobject, gnome-icon-theme, python-libxml2
24	+Depends: ${shlibs:Depends}, ${python:Depends}, system-config-printer-common, python-gtk2 (>= 2.12), python-gnome2, python-notify, python-gobject, gnome-icon-theme, python-libxml2
25	Conflicts: system-config-printer
26	Replaces: system-config-printer
27	Description: Printer configuration GUI