[jhbuild] world-3.6: Use only one launchpad.net repository definition

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

commit 93acf5f3dfbe903d6a28130ad350c8dc7c0e186e
Author: Javier JardÃn <jjardon gnome org>
Date:   Mon Jun 25 07:13:31 2012 +0900

    world-3.6: Use only one launchpad.net repository definition

 modulesets/gnome-world-3.6.modules |   39 ++++++++++++-----------------------
 1 files changed, 14 insertions(+), 25 deletions(-)
---
diff --git a/modulesets/gnome-world-3.6.modules b/modulesets/gnome-world-3.6.modules
index 579f2ff..734993b 100644
--- a/modulesets/gnome-world-3.6.modules
+++ b/modulesets/gnome-world-3.6.modules
@@ -29,9 +29,7 @@
   <repository type="git" name="git.freedesktop.org"
       href="git://anongit.freedesktop.org/git/"/>
   <repository type="bzr" name="launchpad.net"
-      href="http://code.launchpad.net/"/>
-  <repository type="bzr" name="launchpad.net-lp"
-      href=""/>
+      href="lp:"/>
   <repository type="bzr" name="bzr.burtonini.com"
       href="http://burtonini.com/bzr/"/>
   <repository type="svn" name="elisa.code.fluendo.com"
@@ -1451,8 +1449,7 @@
 
   <autotools id="maximus">
     <branch repo="launchpad.net"
-            module="~netbook-remix-team/netbook-remix/maximus"
-            checkoutdir="maximus"/>
+            module="maximus"/>
     <dependencies>
       <dep package="gtk+-2"/>
       <dep package="gconf"/>
@@ -1463,8 +1460,7 @@
 
  <autotools id="window-picker-applet">
     <branch repo="launchpad.net"
-            module="~netbook-remix-team/netbook-remix/window-picker-applet"
-            checkoutdir="window-picker-applet"/>
+            module="window-picker-applet"/>
     <dependencies>
       <dep package="gnome-panel"/>
       <dep package="gconf"/>
@@ -1475,8 +1471,7 @@
 
  <autotools id="go-home-applet">
     <branch repo="launchpad.net"
-            module="~netbook-remix-team/netbook-remix/go-home-applet"
-            checkoutdir="go-home-applet"/>
+            module="go-home-applet"/>
     <dependencies>
       <dep package="gnome-panel"/>
       <dep package="gnome-desktop-2"/>
@@ -1488,8 +1483,7 @@
 
  <autotools id="netbook-remix-launcher">
     <branch repo="launchpad.net"
-            module="~netbook-remix-team/netbook-remix-launcher/trunk"
-            checkoutdir="netbook-remix-launcher"/>
+            module="netbook-remix-launcher"/>
     <dependencies>
       <dep package="clutter-gtk"/>
       <dep package="clutter"/>
@@ -1506,8 +1500,7 @@
 
  <autotools id="desktop-switcher">
    <branch repo="launchpad.net"
-           module="~netbook-remix-team/netbook-remix/desktop-switcher"
-           checkoutdir="desktop-switcher"/>
+           module="desktop-switcher"/>
    <dependencies>
      <dep package="gtk+-2"/>
      <dep package="gconf"/>
@@ -1912,9 +1905,8 @@
   </autotools>
 
   <autotools id="zeitgeist">
-    <branch repo="launchpad.net-lp"
-            module="lp:zeitgeist"
-            checkoutdir="zeitgeist"/>
+    <branch repo="launchpad.net"
+            module="zeitgeist"/>
     <dependencies>
       <dep package="pygtk"/>
       <dep package="sqlite3"/>
@@ -1923,9 +1915,8 @@
   </autotools>
 
   <autotools id="libzeitgeist">
-    <branch repo="launchpad.net-lp"
-            module="lp:libzeitgeist"
-            checkoutdir="libzeitgeist"/>
+    <branch repo="launchpad.net"
+            module="libzeitgeist"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="vala"/>
@@ -1933,17 +1924,15 @@
   </autotools>
 
   <distutils id="fungtk">
-    <branch repo="launchpad.net-lp"
-            module="lp:fungtk"
-            checkoutdir="fungtk"/>
+    <branch repo="launchpad.net"
+            module="fungtk"/>
     <dependencies>
     </dependencies>
   </distutils>
 
   <distutils id="gnome-activity-journal">
-    <branch repo="launchpad.net-lp"
-            module="lp:gnome-activity-journal"
-            checkoutdir="gnome-activity-journal"/>
+    <branch repo="launchpad.net"
+            module="gnome-activity-journal"/>
     <dependencies>
       <dep package="py2cairo"/>
       <dep package="pygtk"/>