Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 graphics/libgphoto2/DETAILS      |    4 ++--
 graphics/libgphoto2/HISTORY      |    4 ++++
 graphics/libgphoto2/cameras.diff |   25 ++++++++-----------------
 3 files changed, 14 insertions(+), 19 deletions(-)

New commits:
commit a510139f5329e263ee82f12a03366f65c422621a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    libgphoto2: => 2.4.11

diff --git a/graphics/libgphoto2/DETAILS b/graphics/libgphoto2/DETAILS
index 887dd11..5261485 100755
--- a/graphics/libgphoto2/DETAILS
+++ b/graphics/libgphoto2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libgphoto2
-         VERSION=2.4.10.1
-     
SOURCE_HASH=sha512:170fc7f615cb518922f4c732fda35190f9f2adb1eb9197c9914c423ef67fea5ccd552963080a0f9d7fc515c4bc25d4018abc3bcfd2d4c7a4150821654c968e8b
+         VERSION=2.4.11
+     
SOURCE_HASH=sha512:1d31e676bd3a4bea98149a635f5a2abbd9f99d1f22c3f9c6b94558c1209dca9038f9faec1340877257320a7834947919876ab0919ea26bc3b744160dc960aa68
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/gphoto/$SOURCE
diff --git a/graphics/libgphoto2/HISTORY b/graphics/libgphoto2/HISTORY
index 8460ddb..a595da7 100644
--- a/graphics/libgphoto2/HISTORY
+++ b/graphics/libgphoto2/HISTORY
@@ -1,3 +1,7 @@
+2011-05-01 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 2.4.11
+       * cameras.diff: update; Nikon P90 is now included
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/graphics/libgphoto2/cameras.diff 
b/graphics/libgphoto2/cameras.diff
index 2aa3088..22dde8e 100644
--- a/graphics/libgphoto2/cameras.diff
+++ b/graphics/libgphoto2/cameras.diff
@@ -1,21 +1,12 @@
-diff -uNr libgphoto2-2.4.8/camlibs/ptp2/library.c 
libgphoto2-2.4.8.cp/camlibs/ptp2/library.c
---- libgphoto2-2.4.8/camlibs/ptp2/library.c    2010-01-22 20:20:57.000000000 
+0100
-+++ libgphoto2-2.4.8.cp/camlibs/ptp2/library.c 2010-01-26 13:44:05.000000000 
+0100
-@@ -647,6 +647,8 @@
-       {"Nikon:Coolpix P50 (PTP mode)",  0x04b0, 0x0169, 0},
-       /*   http://bugs.debian.org/520752 */
-       {"Nikon:Coolpix S60 (PTP mode)",  0x04b0, 0x0171, 0},
-+        /* Nikon:Coolpix P90: Treeve Jelbert 2009.08.31*/
-+      {"Nikon:Coolpix P90 (PTP mode)",  0x04b0, 0x0173, 
PTP_CAP|PTP_NIKON_BROKEN_CAP},
-       /* Christoph Muehlmann <c.muehlmann AT nagnag.de> */
-       {"Nikon:Coolpix S220 (PTP mode)", 0x04b0, 0x0177, 
PTP_CAP|PTP_NIKON_BROKEN_CAP},
-       /* */
-@@ -755,6 +757,8 @@
-       {"Casio:EX-S770",                 0x07cf, 0x1049, 0},
-       /* https://launchpad.net/bugs/64146 */
+diff -uNr libgphoto2-2.4.11.orig//camlibs/ptp2/library.c 
libgphoto2-2.4.11/camlibs/ptp2/library.c
+--- libgphoto2-2.4.11.orig//camlibs/ptp2/library.c     2011-04-17 
16:22:30.000000000 +0200
++++ libgphoto2-2.4.11/camlibs/ptp2/library.c   2011-05-01 21:47:04.000000000 
+0200
+@@ -843,6 +843,8 @@
        {"Casio:EX-Z700",                 0x07cf, 0x104c, 0},
-+      /* Casio:EX-Z150 (PTP mode): Treeve Jelbert 2009/09/02 */
-+      {"Casio:EX-Z150",                 0x07cf, 0x120f, 0},
+       /* IRC Reporter */
+       {"Casio:EX-Z65",                  0x07cf, 0x104d, 0},
++        /* Casio:EX-Z150 (PTP mode): Treeve Jelbert 2009/09/02 */
++        {"Casio:EX-Z150",                 0x07cf, 0x120f, 0},
  
        /* (at least some) newer Canon cameras can be switched between
         * PTP and "normal" (i.e. Canon) mode