Drop the upstream patch to fix the usb backend crash; was from upstream

3 files changed, 5 insertions, 58 deletions

diff --git a/debian/patches/0002-Don-t-run-the-insanely-long-test-rastertogutenprint-.patch b/debian/patches/0001-Don-t-run-the-insanely-long-test-rastertogutenprint-.patch
index 772a557..cd3d435 100644
--- a/debian/patches/0002-Don-t-run-the-insanely-long-test-rastertogutenprint-.patch
+++ b/debian/patches/0001-Don-t-run-the-insanely-long-test-rastertogutenprint-.patch
@@ -1,7 +1,7 @@
-From f82b71f8d70edd5423e824df4bf2023e7ccf76bb Mon Sep 17 00:00:00 2001
+From 1f97a23462a0c6f67ba515b58a3b1fc1dc916414 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Sun, 4 May 2014 12:34:59 +0200
-Subject: [PATCH 2/2] Don't run the insanely long test-rastertogutenprint
+Subject: [PATCH] Don't run the insanely long test-rastertogutenprint
  build-test that lets sbuild timeout on all architectures
 
 ---
@@ -9,11 +9,11 @@ Subject: [PATCH 2/2] Don't run the insanely long test-rastertogutenprint
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/cups/Makefile.am b/src/cups/Makefile.am
-index 939f1a8..8d18644 100644
+index ec2e01d..e829af1 100644
 --- a/src/cups/Makefile.am
 +++ b/src/cups/Makefile.am
 @@ -97,7 +97,7 @@ install-exec-hook:
- 	chmod 700 "$(DESTDIR)$(pkglibdir)/backend/gutenprint$(GUTENPRINT_MAJOR_VERSION)$(GUTENPRINT_MINOR_VERSION)+usb"
+ 	mv $(DESTDIR)$(pkglibdir)/backend/backend_gutenprint "$(DESTDIR)$(pkglibdir)/backend/gutenprint$(GUTENPRINT_MAJOR_VERSION)$(GUTENPRINT_MINOR_VERSION)+usb"
  endif
  
 -TESTS= test-ppds test-rastertogutenprint
diff --git a/debian/patches/0001-Upstream-patch-to-fix-the-gutenprint52-usb-CUPS-back.patch b/debian/patches/0001-Upstream-patch-to-fix-the-gutenprint52-usb-CUPS-back.patch
deleted file mode 100644
index ce3d500..0000000
--- a/debian/patches/0001-Upstream-patch-to-fix-the-gutenprint52-usb-CUPS-back.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c3cdc5f0fadf136e5df3d2873517f4f51a949691 Mon Sep 17 00:00:00 2001
-From: Till Kamppeter <till.kamppeter@gmail.com>
-Date: Tue, 18 Mar 2014 23:13:37 +0100
-Subject: [PATCH 1/2] Upstream patch to fix the gutenprint52+usb CUPS backend
- crashing on failure of USB access via libusb
-
-LP: #1297326
----
- src/cups/backend_common.c | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/src/cups/backend_common.c b/src/cups/backend_common.c
-index 1139e12..bcf1e8b 100644
---- a/src/cups/backend_common.c
-+++ b/src/cups/backend_common.c
-@@ -473,6 +473,7 @@ static void print_help(char *argv0, struct dyesub_backend *backend)
- {
- 	struct libusb_context *ctx = NULL;
- 	struct libusb_device **list = NULL;
-+	int i;
- 
- 	char *ptr = strrchr(argv0, '/');
- 	if (ptr)
-@@ -513,7 +514,12 @@ static void print_help(char *argv0, struct dyesub_backend *backend)
- 		if (backend->cmdline_usage)
- 			backend->cmdline_usage();
- 	}
--	libusb_init(&ctx);
-+
-+	i = libusb_init(&ctx);
-+	if (i) {
-+		ERROR("Failed to initialize libusb (%d)\n", i);
-+		exit(4); /* CUPS_BACKEND_STOP */
-+	}
- 	find_and_enumerate(ctx, &list, backend, NULL, P_ANY, 1);
- 	libusb_free_device_list(list, 1);
- 	libusb_exit(ctx);
-@@ -746,7 +752,13 @@ int main (int argc, char **argv)
- 	}
- 
- 	/* Libusb setup */
--	libusb_init(&ctx);
-+	ret = libusb_init(&ctx);
-+	if (ret) {
-+		ERROR("Failed to initialize libusb (%d)\n", ret);
-+		ret = 4;
-+		goto done;
-+	}
-+
- 	/* Enumerate devices */
- 	found = find_and_enumerate(ctx, &list, backend, use_serno, printer_type, 0);
- 
diff --git a/debian/patches/series b/debian/patches/series
index a0dfcf2..f59c91e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Upstream-patch-to-fix-the-gutenprint52-usb-CUPS-back.patch
-0002-Don-t-run-the-insanely-long-test-rastertogutenprint-.patch
+0001-Don-t-run-the-insanely-long-test-rastertogutenprint-.patch