[jhbuild/jjardon/modulesets-update: 1/8] 3.20: Replace gnome-packagekit with gnome-software

[Javier Jardón Cabezas <jjardon src gnome org>]

commit b165dc7096e860835ef67df5a109f556ba6bcd33
Author: Javier Jardón <jjardon gnome org>
Date:   Fri Jan 8 15:17:56 2016 +0000

    3.20: Replace gnome-packagekit with gnome-software

 modulesets/gnome-apps-3.20.modules             |   41 +-----------------------
 modulesets/gnome-suites-core-3.20.modules      |   35 ++++++++++----------
 modulesets/gnome-suites-core-deps-3.20.modules |   22 +++++++++++++
 modulesets/gnome-world.modules                 |   18 ++++++++++
 4 files changed, 58 insertions(+), 58 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.20.modules b/modulesets/gnome-apps-3.20.modules
index f6f6723..9356e70 100644
--- a/modulesets/gnome-apps-3.20.modules
+++ b/modulesets/gnome-apps-3.20.modules
@@ -693,28 +693,6 @@
     </dependencies>
   </autotools>
 
-
-
-  <autotools id="fwupd"
-             autogenargs="--disable-colorhug --disable-uefi">
-    <branch repo="tarball.github.com"
-            module="hughsie/fwupd/archive/${version}.tar.gz"
-            version="0.5.1"
-            hash="9640a6099c6be03e335a527b864d058a2621202a3050a3d4f9180cc81ac928f0"
-            checkoutdir="fwupd-${version}"/>
-    <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="gcab"/>
-      <dep package="glib"/>
-      <dep package="gudev"/>
-      <dep package="libarchive"/>
-      <dep package="libgusb"/>
-      <dep package="libsoup"/>
-      <dep package="polkit-gobject"/>
-      <dep package="sqlite3"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gedit">
     <branch/>
     <dependencies>
@@ -1143,23 +1121,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-software">
-    <branch/>
-    <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="glib"/>
-      <dep package="gnome-desktop"/>
-      <dep package="gsettings-desktop-schemas"/>
-      <dep package="gtk+"/>
-      <dep package="libsoup"/>
-      <dep package="PackageKit"/>
-      <dep package="sqlite3"/>
-      <if condition-set="linux">
-        <dep package="fwupd"/>
-      </if>
-    </dependencies>
-  </autotools>
-
   <autotools id="nautilus-sendto">
     <branch/>
     <dependencies>
@@ -1346,9 +1307,9 @@
       <dep package="gnome-mines"/>
       <dep package="gnome-nettool"/>
       <dep package="gnome-nibbles"/>
+      <dep package="gnome-packagekit"/>
       <dep package="gnome-photos"/>
       <dep package="gnome-robots"/>
-      <dep package="gnome-software"/>
       <dep package="gnome-sound-recorder"/>
       <dep package="gnome-sudoku"/>
       <dep package="gnome-taquin"/>
diff --git a/modulesets/gnome-suites-core-3.20.modules b/modulesets/gnome-suites-core-3.20.modules
index d5b42ba..cbc0ebc 100644
--- a/modulesets/gnome-suites-core-3.20.modules
+++ b/modulesets/gnome-suites-core-3.20.modules
@@ -241,24 +241,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-packagekit">
-    <branch/>
-    <dependencies>
-      <dep package="PackageKit"/>
-      <dep package="gtk+"/>
-      <dep package="libnotify"/>
-      <dep package="libcanberra"/>
-    </dependencies>
-    <suggests>
-      <if condition-set="linux">
-        <dep package="gudev"/>
-      </if>
-      <if condition-set="systemd">
-        <dep package="libsystemd-login"/>
-      </if>
-    </suggests>
-  </autotools>
-
   <autotools id="gnome-session">
     <branch/>
     <dependencies>
@@ -363,6 +345,23 @@
     </after>
   </autotools>
 
+  <autotools id="gnome-software">
+    <branch/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="glib"/>
+      <dep package="gnome-desktop"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <dep package="gtk+"/>
+      <dep package="libsoup"/>
+      <dep package="PackageKit"/>
+      <dep package="sqlite3"/>
+      <if condition-set="linux">
+        <dep package="fwupd"/>
+      </if>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-themes-standard">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-suites-core-deps-3.20.modules b/modulesets/gnome-suites-core-deps-3.20.modules
index 7fdabe6..e946c5d 100644
--- a/modulesets/gnome-suites-core-deps-3.20.modules
+++ b/modulesets/gnome-suites-core-deps-3.20.modules
@@ -56,6 +56,8 @@
     href="https://github.com/"/>
 <repository type="tarball" name="libxkbcommon"
     href="http://xkbcommon.org/download/"/>
+<repository type="tarball" name="tarball.github.com"
+    href="https://github.com/"/>
 
 <include href="gnome-sysdeps-3.20.modules"/>
 
@@ -393,6 +395,26 @@
     </suggests>
   </autotools>
 
+  <autotools id="fwupd"
+             autogenargs="--disable-colorhug --disable-uefi">
+    <branch repo="tarball.github.com"
+            module="hughsie/fwupd/archive/${version}.tar.gz"
+            version="0.5.1"
+            hash="9640a6099c6be03e335a527b864d058a2621202a3050a3d4f9180cc81ac928f0"
+            checkoutdir="fwupd-${version}"/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="gcab"/>
+      <dep package="glib"/>
+      <dep package="gudev"/>
+      <dep package="libarchive"/>
+      <dep package="libgusb"/>
+      <dep package="libsoup"/>
+      <dep package="polkit-gobject"/>
+      <dep package="sqlite3"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gdk-pixbuf" autogenargs="--enable-installed-tests">
     <if condition-set="macos">
       <autogenargs value="--without-libtiff"/>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index dd30745..56a8ade 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -2947,6 +2947,24 @@
     </suggests>
   </autotools>
 
+  <autotools id="gnome-packagekit">
+    <branch/>
+    <dependencies>
+      <dep package="PackageKit"/>
+      <dep package="gtk+"/>
+      <dep package="libnotify"/>
+      <dep package="libcanberra"/>
+    </dependencies>
+    <suggests>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
+      <if condition-set="systemd">
+        <dep package="libsystemd-login"/>
+      </if>
+    </suggests>
+  </autotools>
+
   <autotools id="gnome-power-manager">
     <branch/>
     <dependencies>