Your message dated Thu, 9 Mar 2006 18:35:59 +0100
with message-id <[EMAIL PROTECTED]>
and subject line Bug#356084: please send patches to upstream
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message ---
Package: libgphoto2-2
Version: 2.1.99-3
libgphoto2 has some patches in the package that upstream has never heard
about. Even worse: these patches are not separate (use dpatch or
similar) which makes it hard for upstream to pull back changes.
Thanks for any help.
Hub
--- End Message ---
--- Begin Message ---
Hubert Figuiere wrote:
> Package: libgphoto2-2
> Version: 2.1.99-3
>
> libgphoto2 has some patches in the package that upstream has never heard
> about. Even worse: these patches are not separate (use dpatch or similar)
> which makes it hard for upstream to pull back changes.
Attached:
- kodak-c360.diff
- hp-photosmart-850-hack.diff (a patch from ubuntu)
Regards,
Frederic
--- libgphoto2-2.1.99.orig/camlibs/ptp2/library.c
+++ libgphoto2-2.1.99/camlibs/ptp2/library.c
@@ -294,6 +294,8 @@
{"Kodak:Z730", 0x040a, 0x0580, 0},
{"Kodak:CX6445", 0x040a, 0x0584, 0},
{"Kodak:CX7525", 0x040a, 0x0586, 0},
+ /* EasyShare C360, Guilherme de S. Pastore */
+ {"Kodak:EasyShare C360", 0x040a, 0x0589, 0},
/* Giulio Salani <[EMAIL PROTECTED]> */
{"Kodak:C310", 0x040a, 0x058a, 0},
/* Brandon Sharitt */
--- libgphoto2-2.1.99.orig/camlibs/ptp2/library.c
+++ libgphoto2-2.1.99/camlibs/ptp2/library.c
@@ -3381,6 +3383,7 @@
PTPParams *params = &camera->pl->params;
uint32_t parent, storage=0x0000000;
int i;
+ int ishp850 = 0;
/*((PTPData *)((Camera *)data)->pl->params.data)->context = context;*/
@@ -3399,8 +3402,17 @@
/* Get (parent) folder handle omiting storage pseudofolder */
find_folder_handle(folder,storage,parent,data);
-
+
+ /* Quick and dirty fix for the HP Photosmart 850, the camera tends to
duplicate
+ * filename in the list.
+ * Author: [EMAIL PROTECTED] */
+ if (strcmp(params->deviceinfo.Model, "hp photosmart 850") == 0)
+ ishp850 = 1;
+
for (i = 0; i < params->handles.n; i++) {
+ if (ishp850 && list->count != 0 && params->objectinfo[i].Filename && \
+ strcmp(params->objectinfo[i].Filename ,
list->entry[list->count-1].name) == 0)
+ continue;
if (params->objectinfo[i].ParentObject==parent) {
if (params->objectinfo[i].ObjectFormat != PTP_OFC_Association) {
if (!ptp_operation_issupported(params,PTP_OC_GetStorageIDs)
--- End Message ---
