[PATCH 3/4] Drop all patches

Riccardo Magliocchetti riccardo.magliocchetti at gmail.com
Mon Jul 26 12:40:29 UTC 2010


Drop all patches since they are all applied upstream or obsoleted
by upstream changes. The only hunk that looks sensible is the
second one in 11_hurd_no_path_max_bsdsource. Anyway since it
was already disabled just drop it.

Signed-off-by: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
---
 debian/patches/10_disable_cache              |   16 -------
 debian/patches/11_hurd_no_path_max_bsdsource |   56 --------------------------
 debian/patches/45_increase_canon_timeout     |   43 --------------------
 debian/patches/70_increase_max_entries       |   14 ------
 debian/patches/80_kfreebsd                   |   11 -----
 debian/patches/series                        |    5 --
 6 files changed, 0 insertions(+), 145 deletions(-)
 delete mode 100644 debian/patches/10_disable_cache
 delete mode 100644 debian/patches/11_hurd_no_path_max_bsdsource
 delete mode 100644 debian/patches/45_increase_canon_timeout
 delete mode 100644 debian/patches/70_increase_max_entries
 delete mode 100644 debian/patches/80_kfreebsd

diff --git a/debian/patches/10_disable_cache b/debian/patches/10_disable_cache
deleted file mode 100644
index 6077b5b..0000000
--- a/debian/patches/10_disable_cache
+++ /dev/null
@@ -1,16 +0,0 @@
-10_disable_cache.dpatch by Frederic Peters <fpeters at debian.org>
-
-Do not cache downloaded files in memory to plug a giant memory
-hole (see Debian bug #372166)
---- a/libgphoto2/gphoto2-filesys.c
-+++ b/libgphoto2/gphoto2-filesys.c
-@@ -1628,9 +1628,6 @@ gp_filesystem_get_file_impl (CameraFiles
- 	CR (gp_file_set_type (file, type));
- 	CR (gp_file_set_name (file, filename));
- 
--	/* Cache this file */
--	CR (gp_filesystem_set_file_noop (fs, folder, file, context));
--
- 	/*
- 	 * Often, thumbnails are of a different mime type than the normal
- 	 * picture. In this case, we should rename the file.
diff --git a/debian/patches/11_hurd_no_path_max_bsdsource b/debian/patches/11_hurd_no_path_max_bsdsource
deleted file mode 100644
index 418bb15..0000000
--- a/debian/patches/11_hurd_no_path_max_bsdsource
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_hurd_no_path_max_bsdsource.dpatch by Samuel Thibault
-## <samuel.thibault at ens-lyon.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Hurd has no such hard limit like PATH_MAX, and define _BSD_SOURCE
-## DP: because code uses IXANY and O_NDELAY.
-
- at DPATCH@
-diff -urNad libgphoto2-2.4.0~/camlibs/digita/digita.c libgphoto2-2.4.0/camlibs/digita/digita.c
---- libgphoto2-2.4.0~/camlibs/digita/digita.c	2007-07-27 02:35:51.000000000 +0200
-+++ libgphoto2-2.4.0/camlibs/digita/digita.c	2007-08-15 00:08:35.993573985 +0200
-@@ -138,7 +138,6 @@
- 	/* Walk through all of the pictures building a list of folders */
- 	for (i = 0; i < camera->pl->num_pictures; i++) {
- 		int found;
--		char tmppath[PATH_MAX + 1];
- 		char *path;
- 
- 		/* Check to make sure the path matches the folder we're */
-@@ -159,22 +158,19 @@
- 		if (strchr(path, '/') != path + strlen(path) - 1)
- 			continue;
- 
--		strncpy(tmppath, path, MIN(strlen(path) - 1, PATH_MAX));
--		tmppath[strlen(path) - 1] = 0;
--
- 		found = 0;
- 		for (i1 = 0; i1 < gp_list_count(list); i1++) {
- 			const char *name;
- 
- 			gp_list_get_name(list, i1, &name);
--			if (!strcmp(name, tmppath)) {
-+			if (!strcmp(name, path)) {
- 				found = 1;
- 				break;
- 			}
- 		}
- 
- 		if (!found)
--			gp_list_append(list, tmppath, NULL);
-+			gp_list_append(list, path, NULL);
- 	}
- 
- 	return GP_OK;
-diff -urNad libgphoto2-2.4.0~/libgphoto2_port/serial/unix.c libgphoto2-2.4.0/libgphoto2_port/serial/unix.c
---- libgphoto2-2.4.0~/libgphoto2_port/serial/unix.c	2007-07-27 02:36:13.000000000 +0200
-+++ libgphoto2-2.4.0/libgphoto2_port/serial/unix.c	2007-08-15 00:08:58.494856260 +0200
-@@ -27,6 +27,7 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+#define _BSD_SOURCE
- #include "config.h"
- #include <gphoto2/gphoto2-port-library.h>
- 
diff --git a/debian/patches/45_increase_canon_timeout b/debian/patches/45_increase_canon_timeout
deleted file mode 100644
index 7098c87..0000000
--- a/debian/patches/45_increase_canon_timeout
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 45_increase_canon_timeout.dpatch by  <fpeters at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Increase timeout wait for an URB to come back on an interrupt endpoint
-##
-## Reported by Shai Berger <shai at platonix.com> as Bug#453114:
-##
-## Version 2.4.0 of libgphoto2 broke support for several Canon camares,
-## it seems, by using a parameter CANON_FAST_TIMEOUT whose value
-## seems to be set too low. The result is that libgphoto fails to
-## connect to the camera, reporting something like
-## 
-##   Error (-114: 'OS error in camera communication')
-## 
-## This is all reported in an upstream bug:
-## http://sourceforge.net/tracker/index.php?func=detail&aid=1790633&group_id=8874&atid=108874
-## 
-## The upstream bug includes a suggestion for a fix -- increase
-## the timeout constant. The fix seems to have helped the original
-## reporter, and he said so over two months ago; it seems to have
-## corrected the problem completely for me. So I'm filing this
-## bug, hoping to get the fix tested in debian as long as upstream
-## hesitates.
-##
-## Update (2008-11-05) by Cyril Brulebois <kibi at debian.org>:
-##   Upstream bumped the timeout from 75 to 150, but users reported that
-##   a single image only would then be downloaded. Keeping the timeout
-##   to 750 as in the previous version of that patch.
-##
- at DPATCH@
-diff -urNad libgphoto2-2.4.0~/camlibs/canon/usb.c libgphoto2-2.4.0/camlibs/canon/usb.c
---- libgphoto2-2.4.0~/camlibs/canon/usb.c	2007-07-27 02:35:50.000000000 +0200
-+++ libgphoto2-2.4.0/camlibs/canon/usb.c	2007-11-27 15:11:33.290924579 +0100
-@@ -72,7 +72,7 @@
- 
- /* CANON_FAST_TIMEOUT: how long (in milliseconds) we should wait for
-  * an URB to come back on an interrupt endpoint */
--#define CANON_FAST_TIMEOUT 150
-+#define CANON_FAST_TIMEOUT 750
- 
- /* WARNING: This destroys reentrancy of the code. Better to put this
-  * in the camera descriptor somewhere. */
diff --git a/debian/patches/70_increase_max_entries b/debian/patches/70_increase_max_entries
deleted file mode 100644
index e46207d..0000000
--- a/debian/patches/70_increase_max_entries
+++ /dev/null
@@ -1,14 +0,0 @@
-70_increase_max_entries.dpatch by Frederic Peters <fpeters at debian.org>
-
-Increase max entries from 1024 to 8192 (closes: #425515, #427476)
---- a/libgphoto2/gphoto2-list.c
-+++ b/libgphoto2/gphoto2-list.c
-@@ -72,7 +72,7 @@
- 
- #ifdef CAMERALIST_STRUCT_COMPATIBILITY
- 
--#define MAX_ENTRIES 1024
-+#define MAX_ENTRIES 8192
- #define MAX_LIST_STRING_LENGTH 128
- struct _CameraList {
- 	int  count;
diff --git a/debian/patches/80_kfreebsd b/debian/patches/80_kfreebsd
deleted file mode 100644
index 5e46b08..0000000
--- a/debian/patches/80_kfreebsd
+++ /dev/null
@@ -1,11 +0,0 @@
-Fix missing include on GNU/kFreeBSD.
---- a/camlibs/ptp2/config.c
-+++ b/camlibs/ptp2/config.c
-@@ -24,6 +24,7 @@
- #include <string.h>
- #include <stdio.h>
- #include <time.h>
-+#include <netinet/in.h>
- 
- #include <gphoto2/gphoto2-library.h>
- #include <gphoto2/gphoto2-port-log.h>
diff --git a/debian/patches/series b/debian/patches/series
index af45255..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +0,0 @@
-10_disable_cache
-#11_hurd_no_path_max_bsdsource
-#45_increase_canon_timeout
-70_increase_max_entries
-80_kfreebsd
-- 
1.7.1


--------------080408000802020709050709
Content-Type: text/x-patch;
 name="0004-Update-changelog-for-new-upstream-release.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="0004-Update-changelog-for-new-upstream-release.patch"



More information about the Pkg-phototools-devel mailing list