[jhbuild] 3.8: move libgphoto2 to sysdeps: 2.4 is enough

[Javier JardÃn <jjardon src gnome org>]

commit 9042f0157b8b60dc96df35671460b73ea76113c2
Author: Javier JardÃn <jjardon gnome org>
Date:   Thu Jan 3 15:56:51 2013 +0000

    3.8: move libgphoto2 to sysdeps: 2.4 is enough

 modulesets/gnome-suites-core-deps-base-3.8.modules |   13 -------------
 modulesets/gnome-sysdeps-3.8.modules               |    6 ++++++
 2 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-base-3.8.modules b/modulesets/gnome-suites-core-deps-base-3.8.modules
index 721086d..a332531 100644
--- a/modulesets/gnome-suites-core-deps-base-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-base-3.8.modules
@@ -100,19 +100,6 @@
     </after>
   </autotools>
 
-  <!-- with-libusb=no will result in libgphoto2 using the newer libusb-1.0 -->
-  <autotools id="libgphoto2"
-             autogen-sh="configure" autogenargs="--with-libusb=no">
-    <pkg-config>libgphoto2.pc</pkg-config>
-    <branch repo="sourceforge.net"
-            module="gphoto/libgphoto/2.5.0/libgphoto2-2.5.0.tar.bz2"
-            version="2.5.0"
-            hash="sha256:e7df389f1b034be021066227c0908b8f21d3be0cd0c6ed56979c04c3a9f75b31"/>
-    <dependencies>
-      <dep package="libusb1"/>
-    </dependencies>
-  </autotools>
-
   <cmake id="libmusicbrainz"
          cmakeargs="-DLIB_SUFFIX=${libsuffix}">
     <pkg-config>libmusicbrainz5.pc</pkg-config>
diff --git a/modulesets/gnome-sysdeps-3.8.modules b/modulesets/gnome-sysdeps-3.8.modules
index 2071bba..c8539f9 100644
--- a/modulesets/gnome-sysdeps-3.8.modules
+++ b/modulesets/gnome-sysdeps-3.8.modules
@@ -285,6 +285,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="libgphoto2">
+    <pkg-config>libgphoto2.pc</pkg-config>
+    <branch repo="system"
+            version="2.4.13"/>
+  </systemmodule>
+
   <systemmodule id="liboauth">
     <pkg-config>oauth.pc</pkg-config>
     <branch repo="system"