diff options
| author |   Alastair Tse <liquidx@gentoo.org> | 2003-10-13 20:46:38 +0000 |
|---|---|---|
| committer | Alastair Tse <liquidx@gentoo.org> | 2003-10-13 20:46:38 +0000 |
| commit | b6255895fe70c0c79e181540a773ae83dd233185 (patch) | |
| tree | ad9b80424874f19e702d8a18024dbe105164da13 /media-libs/libgphoto2 | |
| parent | bad tarball =/ (diff) | |
| download | gentoo-2-b6255895fe70c0c79e181540a773ae83dd233185.tar.gz gentoo-2-b6255895fe70c0c79e181540a773ae83dd233185.tar.bz2 gentoo-2-b6255895fe70c0c79e181540a773ae83dd233185.zip | |
fix patch errors
Diffstat (limited to 'media-libs/libgphoto2')
| -rw-r--r-- | media-libs/libgphoto2/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libgphoto2/Manifest | 10 | ||||
| -rw-r--r-- | media-libs/libgphoto2/files/libgphoto2-2.1.2-canon.patch | 18 |
3 files changed, 10 insertions, 24 deletions
diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog index 4942b0076ccf..194e5075fa2a 100644 --- a/media-libs/libgphoto2/ChangeLog +++ b/media-libs/libgphoto2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libgphoto2 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.13 2003/10/12 19:41:18 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.14 2003/10/13 20:46:26 liquidx Exp $ + + 13 Oct 2003; Alastair Tse <liquidx@gentoo.org> + files/libgphoto2-2.1.2-canon.patch: + fix cvs ids conflict in canon patch 13 Oct 2003; Martin Holzer <mholzer@gentoo.org> libgphoto2-2.1.2-r1.ebuild, files/libgphoto2-2.1.2-canon.patch: diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest index 74180835bbb6..1608e8336db8 100644 --- a/media-libs/libgphoto2/Manifest +++ b/media-libs/libgphoto2/Manifest @@ -1,10 +1,10 @@ -MD5 df6df3a21459cc723201d8ebac030466 ChangeLog 2507 +MD5 7bcefb768dfc2febb94e32a962c890a9 ChangeLog 2633 MD5 829031ca68853e6d35c5d4adf780d8d9 libgphoto2-2.1.1-r2.ebuild 1393 -MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217 MD5 b3da41dc7a487088691db163e40cb24d libgphoto2-2.1.2-r1.ebuild 2242 +MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217 +MD5 8fc24b590738d4420bb8df6521fbbda0 files/canon.powershot.usermap 4575 MD5 6376376d006db7592d2ed520086e03e7 files/digest-libgphoto2-2.1.1-r2 70 +MD5 1e1dae62e219b69ed37673f1d0fe01f9 files/digest-libgphoto2-2.1.2-r1 70 MD5 ededea10cd8bf8a2f0d3f106c10b20ff files/libgphoto2-2.1.1-norpm.patch 533 -MD5 14d496f3b88571d345f9f6547f5bd675 files/libgphoto2-2.1.2-canon.patch 5470 +MD5 e860333a276c3461b4fc8cfdd0b09263 files/libgphoto2-2.1.2-canon.patch 4929 MD5 91db4be9fea579f0440cef2d114fcab3 files/libgphoto2-2.1.2-norpm.patch 533 -MD5 8fc24b590738d4420bb8df6521fbbda0 files/canon.powershot.usermap 4575 -MD5 1e1dae62e219b69ed37673f1d0fe01f9 files/digest-libgphoto2-2.1.2-r1 70 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 |