diff -u system-config-printer-1.5.6+20150318/debian/changelog system-config-printer-1.5.6+20150318/debian/changelog
--- system-config-printer-1.5.6+20150318/debian/changelog
+++ system-config-printer-1.5.6+20150318/debian/changelog
@@ -1,3 +1,11 @@
+system-config-printer (1.5.6+20150318-0ubuntu2.1) vivid-proposed; urgency=medium
+
+  * debian/patches/33_ipp-over-usb-support.patch: Fixes on IPP-over-USB support,
+    to make auto-setup of print queues work correctly again, for both
+    devices supporting and not supporting IPP-over-USB (LP: #1455212).
+
+ -- Till Kamppeter <till.kamppeter@gmail.com>  Thu, 14 May 2015 17:02:47 -0300
+
 system-config-printer (1.5.6+20150318-0ubuntu2) vivid; urgency=medium
 
   * debian-control: Added udev to the build dependencies to have the
diff -u system-config-printer-1.5.6+20150318/debian/patches/33_ipp-over-usb-support.patch system-config-printer-1.5.6+20150318/debian/patches/33_ipp-over-usb-support.patch
--- system-config-printer-1.5.6+20150318/debian/patches/33_ipp-over-usb-support.patch
+++ system-config-printer-1.5.6+20150318/debian/patches/33_ipp-over-usb-support.patch
@@ -1,6 +1,12 @@
-diff -Nur -x '*.orig' -x '*~' system-config-printer-1.5.3+20141027/udev/udev-add-printer system-config-printer-1.5.3+20141027.new/udev/udev-add-printer
---- system-config-printer-1.5.3+20141027/udev/udev-add-printer	2014-10-27 20:48:16.000000000 +0100
-+++ system-config-printer-1.5.3+20141027.new/udev/udev-add-printer	2014-10-28 12:03:43.999980553 +0100
+diff -Nur -x '*.orig' -x '*~' system-config-printer-1.5.6+20150318/udev/udev-add-printer system-config-printer-1.5.6+20150318.new/udev/udev-add-printer
+--- system-config-printer-1.5.6+20150318/udev/udev-add-printer	2015-03-17 20:33:03.000000000 -0300
++++ system-config-printer-1.5.6+20150318.new/udev/udev-add-printer	2015-05-14 16:55:12.306155238 -0300
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python3 -s -B
++#!/usr/bin/python3
+ 
+ ## udev-add-printer
+ 
 @@ -32,28 +32,73 @@
      "graphtec",
      ]
@@ -91,9 +97,9 @@
  
      c.addPrinter (name,
                    device=device_uri,
-diff -Nur -x '*.orig' -x '*~' system-config-printer-1.5.3+20141027/udev/udev-configure-printer.c system-config-printer-1.5.3+20141027.new/udev/udev-configure-printer.c
---- system-config-printer-1.5.3+20141027/udev/udev-configure-printer.c	2014-10-27 20:48:16.000000000 +0100
-+++ system-config-printer-1.5.3+20141027.new/udev/udev-configure-printer.c	2014-10-28 12:15:49.436728284 +0100
+diff -Nur -x '*.orig' -x '*~' system-config-printer-1.5.6+20150318/udev/udev-configure-printer.c system-config-printer-1.5.6+20150318.new/udev/udev-configure-printer.c
+--- system-config-printer-1.5.6+20150318/udev/udev-configure-printer.c	2015-03-17 20:33:03.000000000 -0300
++++ system-config-printer-1.5.6+20150318.new/udev/udev-configure-printer.c	2015-05-14 16:54:32.825727736 -0300
 @@ -168,6 +168,7 @@
  /* Device URI schemes in decreasing order of preference. */
  static const char *device_uri_types[] =
@@ -426,7 +432,7 @@
 +              /* IPP over USB must be
 +	       * readded each time to
 +	       * update the port num */
- 	    }
++	    }
 +	  else
 +            {
 +	      device_uri_n = normalize_device_uri(device_uris->uri[i]);
@@ -478,7 +484,7 @@
 +
 +	      if (does_match)
 +	        matched++;
-+	    }
+ 	    }
 +
  	  if (i == 0)
  	    syslog (LOG_DEBUG, "URI of print queue: %s, normalized: %s",
@@ -499,7 +505,7 @@
  	      syslog (LOG_DEBUG, "Queue %s has matching device URI",
  		      this_printer_uri);
  	      if (((flags & MATCH_ONLY_DISABLED) &&
-@@ -1582,18 +1765,325 @@
+@@ -1582,18 +1765,322 @@
  }
  
  static int
@@ -538,10 +544,7 @@
 +          alt = &interface->altsetting[alt_i];
 +
 +          if (is_ippusb_interface (alt) > 0)
-+            continue;
-+
-+          count++;
-+          break;
++            count++;
 +        }
 +    }
 +
@@ -826,7 +829,7 @@
    syslog (LOG_DEBUG, "add %s", devaddr);
  
    is_bluetooth = bluetooth_verify_address (devaddr);
-@@ -1619,8 +2109,6 @@
+@@ -1619,8 +2106,6 @@
      usb_device_devpath = device_id_from_devpath (udev, devpath, map, &id,
  						 usbserial, sizeof (usbserial),
  						 usblpdev, sizeof (usblpdev));
@@ -835,7 +838,7 @@
    }
  
    if (!id.mfg || !id.mdl)
-@@ -1632,18 +2120,40 @@
+@@ -1632,18 +2117,40 @@
    syslog (LOG_DEBUG, "MFG:%s MDL:%s SERN:%s serial:%s", id.mfg, id.mdl,
  	  id.sern ? id.sern : "-", usbserial[0] ? usbserial : "-");
  
@@ -881,7 +884,7 @@
  
    if (device_uris.n_uris == 0)
      {
-@@ -1678,10 +2188,24 @@
+@@ -1678,10 +2185,24 @@
  	    }
  	}
  
@@ -906,7 +909,7 @@
        argv[i + 2] = NULL;
  
        syslog (LOG_DEBUG, "About to add queue for %s", argv[2]);
-@@ -1700,6 +2224,9 @@
+@@ -1700,6 +2221,9 @@
        exit (1);
      }
  
@@ -916,7 +919,7 @@
    clear_device_id (&id);
    free_device_uris (&device_uris);
    return 0;
-@@ -1740,7 +2267,7 @@
+@@ -1740,7 +2264,7 @@
  static void
  disable_queue (const char *printer_uri, void *context)
  {
@@ -925,7 +928,7 @@
    http_t *cups = httpConnectEncrypt (cupsServer (), ippPort (),
  				     cupsEncryption ());
    ipp_t *request, *answer;
-@@ -1810,7 +2337,7 @@
+@@ -1810,7 +2334,7 @@
    prev = &map->entries;
    for (entry = map->entries; entry; entry = entry->next)
      {