[Pkg-phototools-devel] Bug#718258: libgphoto2-2: turns on libusbx debugging by default

[Martin Pitt]

tag 718258 patch
user ubuntu-devel at lists.ubuntu.com
usertags 718258 origin-ubuntu saucy ubuntu-patch
thanks

Hello again,

Martin Pitt [2013-07-29 14:47 +0200]:
> The change from libusb to libusbx in libgphoto2 now somehow turned on libusbx
> debugging by default:

Tested debdiff (uploaded to Ubuntu).

Martin
-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
-------------- next part --------------
diff -Nru libgphoto2-2.4.14/debian/changelog libgphoto2-2.4.14/debian/changelog
--- libgphoto2-2.4.14/debian/changelog	2013-07-25 23:28:36.000000000 +0200
+++ libgphoto2-2.4.14/debian/changelog	2013-07-29 14:54:42.000000000 +0200
@@ -1,3 +1,11 @@
+libgphoto2 (2.4.14-2.3ubuntu1) saucy; urgency=low
+
+  * Add 02-libusbx_no_debug.patch: Disable libusbx debugging messages by
+    default. They can be turned back on with $LIBUSB_DEBUG if necessary.
+    (LP: #1206104, Closes: #718258)
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Mon, 29 Jul 2013 14:54:17 +0200
+
 libgphoto2 (2.4.14-2.3) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru libgphoto2-2.4.14/debian/patches/02-libusbx_no_debug.patch libgphoto2-2.4.14/debian/patches/02-libusbx_no_debug.patch
--- libgphoto2-2.4.14/debian/patches/02-libusbx_no_debug.patch	1970-01-01 01:00:00.000000000 +0100
+++ libgphoto2-2.4.14/debian/patches/02-libusbx_no_debug.patch	2013-07-29 14:54:14.000000000 +0200
@@ -0,0 +1,17 @@
+Description: Disable libusbx debugging messages by default. They can be turned back on with $LIBUSB_DEBUG if necessary.
+Author: Martin Pitt <martin.pitt at ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/1206104
+Bug-Debian: http://bugs.debian.org/718258
+
+Index: libgphoto2-2.4.14/libgphoto2_port/libusb1/libusb1.c
+===================================================================
+--- libgphoto2-2.4.14.orig/libgphoto2_port/libusb1/libusb1.c	2013-07-29 14:48:49.000000000 +0200
++++ libgphoto2-2.4.14/libgphoto2_port/libusb1/libusb1.c	2013-07-29 14:52:26.250620640 +0200
+@@ -260,7 +260,6 @@
+ 	port->pl->config = port->pl->interface = port->pl->altsetting = -1;
+ 
+ 	libusb_init (&port->pl->ctx);
+-	libusb_set_debug (port->pl->ctx, 255);
+ 
+ #if 0
+ 	usb_init ();
diff -Nru libgphoto2-2.4.14/debian/patches/series libgphoto2-2.4.14/debian/patches/series
--- libgphoto2-2.4.14/debian/patches/series	2013-07-25 23:25:22.000000000 +0200
+++ libgphoto2-2.4.14/debian/patches/series	2013-07-29 14:52:11.000000000 +0200
@@ -2,3 +2,4 @@
 #11_hurd_no_path_max_bsdsource
 01-increase_max_entries.patch
 kFreeBSD-ENODATA.patch
+02-libusbx_no_debug.patch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-phototools-devel/attachments/20130729/ada84c1d/attachment.sig>