[jhbuild] Add a librsync tarball for duplicity. Update duplicity version and correct its dependency syntax. Up

[Michael Terry <mterry src gnome org>]

commit 58ffee92e1069fd6bd08d6301520056f901675ba
Author: Michael Terry <michael terry canonical com>
Date:   Tue May 17 10:25:56 2011 -0400

    Add a librsync tarball for duplicity.
    Update duplicity version and correct its dependency syntax.
    Update modern deja-dup dependencies.
    Point deja-dup entries at the various release branches.

 modulesets/gnome-apps-3.0.modules    |   28 +++++++++++++++++-----------
 modulesets/gnome-apps-3.2.modules    |   28 +++++++++++++++++-----------
 modulesets/gnome2/gnome-2.30.modules |   20 ++++++++++++++------
 modulesets/gnome2/gnome-2.32.modules |   20 ++++++++++++++------
 4 files changed, 62 insertions(+), 34 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.0.modules b/modulesets/gnome-apps-3.0.modules
index 5d6fde1..c792312 100644
--- a/modulesets/gnome-apps-3.0.modules
+++ b/modulesets/gnome-apps-3.0.modules
@@ -51,14 +51,22 @@
     <branch/>
   </autotools>
 
+  <tarball id="librsync" version="0.9.7" checkoutdir="librsync-0.9.7">
+    <source href="http://downloads.sourceforge.net/librsync/librsync-0.9.7.tar.gz";
+            hash="sha256:6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6"
+            md5sum="24cdb6b78f45e0e83766903fd4f6bc84" size="453802"/>
+  </tarball>
+
   <distutils id="duplicity">
     <branch repo="launchpad.net/tarball"
-            module="duplicity/0.6-series/0.6.07/+download/duplicity-0.6.07.tar.gz"
-            version="0.6.07"
-            hash="sha256:5a66ec622c273aef12f0c8ae1635b44f2de920c50395854715c5e4c70ec93c87"
-            md5sum="08efd239362f601b946f4dc2450fc840" size="280311">
+            module="duplicity/0.6-series/0.6.13/+download/duplicity-0.6.13.tar.gz"
+            version="0.6.13"
+            hash="sha256:381aa8d7a07541d81457c3eac0ab5b37f05272023e3af04cbebab831732ff41f"
+            md5sum="b3d627f35fc527b00121925840d5cca7" size="296955" />
+    <dependencies>
       <dep package="pygobject"/>
-    </branch>
+      <dep package="librsync"/>
+    </dependencies>
   </distutils>
 
   <!-- Other useful deps that you can install are:  -->
@@ -466,16 +474,14 @@
 
   <autotools id="deja-dup">
     <branch repo="launchpad.net"
-            module="~deja-dup-team/deja-dup/trunk"
+            module="~deja-dup-team/deja-dup/18"
             checkoutdir="deja-dup/"/>
     <dependencies>
-      <dep package="dbus-glib"/>
-      <dep package="gconf"/>
       <dep package="glib"/>
-      <dep package="gnome-keyring-2"/>
-      <dep package="gtk+-2"/>
+      <dep package="gtk+"/>
+      <dep package="libgnome-keyring"/>
       <dep package="libnotify"/>
-      <dep package="libunique-1"/>
+      <dep package="libunique"/>
       <dep package="nautilus"/>
       <dep package="vala"/>
       <dep package="duplicity"/>
diff --git a/modulesets/gnome-apps-3.2.modules b/modulesets/gnome-apps-3.2.modules
index 53c9dcb..6f46cba 100644
--- a/modulesets/gnome-apps-3.2.modules
+++ b/modulesets/gnome-apps-3.2.modules
@@ -51,14 +51,22 @@
     <branch/>
   </autotools>
 
+  <tarball id="librsync" version="0.9.7" checkoutdir="librsync-0.9.7">
+    <source href="http://downloads.sourceforge.net/librsync/librsync-0.9.7.tar.gz";
+            hash="sha256:6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6"
+            md5sum="24cdb6b78f45e0e83766903fd4f6bc84" size="453802"/>
+  </tarball>
+
   <distutils id="duplicity">
     <branch repo="launchpad.net/tarball"
-            module="duplicity/0.6-series/0.6.07/+download/duplicity-0.6.07.tar.gz"
-            version="0.6.07"
-            hash="sha256:5a66ec622c273aef12f0c8ae1635b44f2de920c50395854715c5e4c70ec93c87"
-            md5sum="08efd239362f601b946f4dc2450fc840" size="280311">
+            module="duplicity/0.6-series/0.6.13/+download/duplicity-0.6.13.tar.gz"
+            version="0.6.13"
+            hash="sha256:381aa8d7a07541d81457c3eac0ab5b37f05272023e3af04cbebab831732ff41f"
+            md5sum="b3d627f35fc527b00121925840d5cca7" size="296955" />
+    <dependencies>
       <dep package="pygobject"/>
-    </branch>
+      <dep package="librsync"/>
+    </dependencies>
   </distutils>
 
   <!-- Other useful deps that you can install are:  -->
@@ -464,17 +472,15 @@
 
   <autotools id="deja-dup">
     <branch repo="launchpad.net"
-            module="~deja-dup-team/deja-dup/trunk"
+            module="~deja-dup-team/deja-dup/20"
             checkoutdir="deja-dup/"/>
     <dependencies>
-      <dep package="dbus-glib"/>
-      <dep package="gconf"/>
       <dep package="glib"/>
-      <dep package="gnome-keyring-2"/>
-      <dep package="gtk+-2"/>
+      <dep package="gtk+"/>
+      <dep package="libgnome-keyring"/>
       <dep package="libnotify"/>
-      <dep package="libunique-1"/>
       <dep package="nautilus"/>
+      <dep package="gnome-control-center"/>
       <dep package="vala"/>
       <dep package="duplicity"/>
     </dependencies>
diff --git a/modulesets/gnome2/gnome-2.30.modules b/modulesets/gnome2/gnome-2.30.modules
index 144d7b2..cf94757 100644
--- a/modulesets/gnome2/gnome-2.30.modules
+++ b/modulesets/gnome2/gnome-2.30.modules
@@ -2406,19 +2406,27 @@
     </dependencies>
   </waf>
 
+  <tarball id="librsync" version="0.9.7" checkoutdir="librsync-0.9.7">
+    <source href="http://downloads.sourceforge.net/librsync/librsync-0.9.7.tar.gz";
+            hash="sha256:6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6"
+            md5sum="24cdb6b78f45e0e83766903fd4f6bc84" size="453802"/>
+  </tarball>
+
   <distutils id="duplicity">
     <branch repo="launchpad.net/tarball"
-            module="duplicity/0.6-series/0.6.07/+download/duplicity-0.6.07.tar.gz"
-            version="0.6.07"
-            hash="sha256:5a66ec622c273aef12f0c8ae1635b44f2de920c50395854715c5e4c70ec93c87"
-            md5sum="08efd239362f601b946f4dc2450fc840" size="280311">
+            module="duplicity/0.6-series/0.6.13/+download/duplicity-0.6.13.tar.gz"
+            version="0.6.13"
+            hash="sha256:381aa8d7a07541d81457c3eac0ab5b37f05272023e3af04cbebab831732ff41f"
+            md5sum="b3d627f35fc527b00121925840d5cca7" size="296955" />
+    <dependencies>
       <dep package="pygobject"/>
-    </branch>
+      <dep package="librsync"/>
+    </dependencies>
   </distutils>
 
   <autotools id="deja-dup">
     <branch repo="launchpad.net"
-            module="~deja-dup-team/deja-dup/trunk"
+            module="~deja-dup-team/deja-dup/14"
             checkoutdir="deja-dup/"/>
     <dependencies>
       <dep package="dbus-glib"/>
diff --git a/modulesets/gnome2/gnome-2.32.modules b/modulesets/gnome2/gnome-2.32.modules
index 9e93fe5..bcce3fa 100644
--- a/modulesets/gnome2/gnome-2.32.modules
+++ b/modulesets/gnome2/gnome-2.32.modules
@@ -2298,19 +2298,27 @@
     </dependencies>
   </waf>
 
+  <tarball id="librsync" version="0.9.7" checkoutdir="librsync-0.9.7">
+    <source href="http://downloads.sourceforge.net/librsync/librsync-0.9.7.tar.gz";
+            hash="sha256:6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6"
+            md5sum="24cdb6b78f45e0e83766903fd4f6bc84" size="453802"/>
+  </tarball>
+
   <distutils id="duplicity">
     <branch repo="launchpad.net/tarball"
-            module="duplicity/0.6-series/0.6.07/+download/duplicity-0.6.07.tar.gz"
-            version="0.6.07"
-            hash="sha256:5a66ec622c273aef12f0c8ae1635b44f2de920c50395854715c5e4c70ec93c87"
-            md5sum="08efd239362f601b946f4dc2450fc840" size="280311">
+            module="duplicity/0.6-series/0.6.13/+download/duplicity-0.6.13.tar.gz"
+            version="0.6.13"
+            hash="sha256:381aa8d7a07541d81457c3eac0ab5b37f05272023e3af04cbebab831732ff41f"
+            md5sum="b3d627f35fc527b00121925840d5cca7" size="296955" />
+    <dependencies>
       <dep package="pygobject"/>
-    </branch>
+      <dep package="librsync"/>
+    </dependencies>
   </distutils>
 
   <autotools id="deja-dup">
     <branch repo="launchpad.net"
-            module="~deja-dup-team/deja-dup/trunk"
+            module="~deja-dup-team/deja-dup/16"
             checkoutdir="deja-dup/"/>
     <dependencies>
       <dep package="dbus-glib"/>