summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlastair Tse <liquidx@gentoo.org>2003-10-13 20:46:38 +0000
committerAlastair Tse <liquidx@gentoo.org>2003-10-13 20:46:38 +0000
commitb6255895fe70c0c79e181540a773ae83dd233185 (patch)
treead9b80424874f19e702d8a18024dbe105164da13 /media-libs/libgphoto2/files
parentbad tarball =/ (diff)
downloadgentoo-2-b6255895fe70c0c79e181540a773ae83dd233185.tar.gz
gentoo-2-b6255895fe70c0c79e181540a773ae83dd233185.tar.bz2
gentoo-2-b6255895fe70c0c79e181540a773ae83dd233185.zip
fix patch errors
Diffstat (limited to 'media-libs/libgphoto2/files')
-rw-r--r--media-libs/libgphoto2/files/libgphoto2-2.1.2-canon.patch18
1 files changed, 0 insertions, 18 deletions
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.1.2-canon.patch b/media-libs/libgphoto2/files/libgphoto2-2.1.2-canon.patch
index f7789eca2f9c..3b24e3b54299 100644
--- a/media-libs/libgphoto2/files/libgphoto2-2.1.2-canon.patch
+++ b/media-libs/libgphoto2/files/libgphoto2-2.1.2-canon.patch
@@ -1,15 +1,6 @@
diff -r -u libgphoto2-2.1.2.orig/camlibs/canon/canon.c libgphoto2-2.1.2/camlibs/canon/canon.c
--- libgphoto2-2.1.2.orig/camlibs/canon/canon.c 2003-08-10 13:51:13.000000000 -0500
+++ libgphoto2-2.1.2/camlibs/canon/canon.c 2003-10-12 11:21:10.000000000 -0500
-@@ -15,7 +15,7 @@
- * and usb.c, keeping the common protocols/busses support in this
- * file.
- *
-- * $Id: libgphoto2-2.1.2-canon.patch,v 1.1 2003/10/12 19:41:18 mholzer Exp $
-+ * $Id: libgphoto2-2.1.2-canon.patch,v 1.1 2003/10/12 19:41:18 mholzer Exp $
- */
-
- #include "config.h"
@@ -112,7 +112,7 @@
{"Canon:PowerShot A20", CANON_PS_A20, 0x04A9, 0x304E, CAP_SUP, S10M, S32K, NULL},
{"Canon:PowerShot A10", CANON_PS_A10, 0x04A9, 0x304F, CAP_SUP, S10M, S32K, NULL},
@@ -63,15 +54,6 @@ diff -r -u libgphoto2-2.1.2.orig/camlibs/canon/canon.c libgphoto2-2.1.2/camlibs/
diff -r -u libgphoto2-2.1.2.orig/camlibs/canon/canon.h libgphoto2-2.1.2/camlibs/canon/canon.h
--- libgphoto2-2.1.2.orig/camlibs/canon/canon.h 2003-08-10 13:51:13.000000000 -0500
+++ libgphoto2-2.1.2/camlibs/canon/canon.h 2003-10-12 11:48:40.000000000 -0500
-@@ -3,7 +3,7 @@
- *
- * Written 1999 by Wolfgang G. Reissnegger and Werner Almesberger
- *
-- * $Id: libgphoto2-2.1.2-canon.patch,v 1.1 2003/10/12 19:41:18 mholzer Exp $
-+ * $Id: libgphoto2-2.1.2-canon.patch,v 1.1 2003/10/12 19:41:18 mholzer Exp $
- *
- */
-
@@ -88,8 +88,14 @@
* @CANON_PS_G3: PowerShot G3
* @CANON_PS_S230: PowerShot S230, Digital IXUS v3