diff -Nru gtk+3.0-3.4.2/debian/changelog gtk+3.0-3.4.2/debian/changelog --- gtk+3.0-3.4.2/debian/changelog 2012-07-03 19:03:14.000000000 +0100 +++ gtk+3.0-3.4.2/debian/changelog 2012-07-27 23:08:30.000000000 +0100 @@ -1,3 +1,11 @@ +gtk+3.0 (3.4.2-0ubuntu0.5~ppa~tj) precise; urgency=low + + * debian/patches/102_do_not_duplicate_cups_custom_prefix.patch: + - Fix failure to print custom page sizes - do not duplicate CUPS "Custom." + prefix (lp: #998156) + + -- TJ Fri, 27 Jul 2012 19:41:21 +0100 + gtk+3.0 (3.4.2-0ubuntu0.4) precise-proposed; urgency=low * debian/patches/git_gtkstatusicon_segfault.patch: diff -Nru gtk+3.0-3.4.2/debian/patches/102_do_not_duplicate_cups_custom_prefix.patch gtk+3.0-3.4.2/debian/patches/102_do_not_duplicate_cups_custom_prefix.patch --- gtk+3.0-3.4.2/debian/patches/102_do_not_duplicate_cups_custom_prefix.patch 1970-01-01 01:00:00.000000000 +0100 +++ gtk+3.0-3.4.2/debian/patches/102_do_not_duplicate_cups_custom_prefix.patch 2012-07-27 23:08:13.000000000 +0100 @@ -0,0 +1,18 @@ +## Description: Fix failure to print custom page sizes - do not duplicate CUPS "Custom." +## Origin/Author: TJ +## Bug: https://bugs.launchpad.net/ubuntu/+source/gtk+3.0/+bug/998156 +Index: gtk+3.0-3.4.2/modules/printbackends/cups/gtkprintbackendcups.c +=================================================================== +--- gtk+3.0-3.4.2.orig/modules/printbackends/cups/gtkprintbackendcups.c 2012-05-02 13:44:17.000000000 +0100 ++++ gtk+3.0-3.4.2/modules/printbackends/cups/gtkprintbackendcups.c 2012-07-27 19:07:42.894867275 +0100 +@@ -562,8 +562,8 @@ + } + } + +- /* Add "Custom." prefix to custom values. */ +- if (custom_value) ++ /* Add "Custom." prefix to custom values (if they don't already have the prefix). */ ++ if (custom_value && !g_str_has_prefix(value, "Custom.")) + { + new_value = g_strdup_printf ("Custom.%s", value); + gtk_cups_request_encode_option (request, key, new_value); diff -Nru gtk+3.0-3.4.2/debian/patches/series gtk+3.0-3.4.2/debian/patches/series --- gtk+3.0-3.4.2/debian/patches/series 2012-07-03 19:03:14.000000000 +0100 +++ gtk+3.0-3.4.2/debian/patches/series 2012-07-27 23:08:20.000000000 +0100 @@ -23,3 +23,4 @@ git_gtkstatusicon_segfault.patch git_get_property.patch git_api_documentation_tweaks.patch +102_do_not_duplicate_cups_custom_prefix.patch