From a25c4ebc85c0d7fc18693524ff8e4b8ad874bf5d Mon Sep 17 00:00:00 2001
From: Thiago Abdo <tja14@inf.ufpr.br>
Date: Thu, 4 Feb 2016 09:44:22 -0200
Subject: [PATCH] [ldm] Update to the new schema

Signed-off-by: Thiago Abdo <tja14@inf.ufpr.br>
---
 remote/modules/ldm-gtk-greeter/module.build          | 4 ++--
 remote/modules/ldm-gtk-greeter/module.conf           | 9 ---------
 remote/modules/ldm-gtk-greeter/module.conf.ubuntu.14 | 9 +++++++++
 remote/modules/ldm/module.build                      | 4 ++--
 remote/modules/ldm/module.conf                       | 8 --------
 remote/modules/ldm/module.conf.ubuntu.14             | 8 ++++++++
 6 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100644 remote/modules/ldm-gtk-greeter/module.conf.ubuntu.14
 create mode 100644 remote/modules/ldm/module.conf.ubuntu.14

diff --git a/remote/modules/ldm-gtk-greeter/module.build b/remote/modules/ldm-gtk-greeter/module.build
index 27e5a592..d467f386 100644
--- a/remote/modules/ldm-gtk-greeter/module.build
+++ b/remote/modules/ldm-gtk-greeter/module.build
@@ -1,11 +1,11 @@
 #tool/distro specific functions for fetching, building and installing dependencies
 
 fetch_source () {
-	download_untar "$URL" "src/"
+	download_untar "$REQUIRED_URL" "src/"
 }	
 
 build () {
-	cd "src/$VERSION"
+	cd "src/$REQUIRED_VERSION"
 	pinfo "Running configure"
 	./configure --prefix="/" --datarootdir="/usr/share" || perror "failed."
 	pinfo "Running make"
diff --git a/remote/modules/ldm-gtk-greeter/module.conf b/remote/modules/ldm-gtk-greeter/module.conf
index e9349002..e69de29b 100644
--- a/remote/modules/ldm-gtk-greeter/module.conf
+++ b/remote/modules/ldm-gtk-greeter/module.conf
@@ -1,9 +0,0 @@
-VERSION=lightdm-gtk-greeter-1.3.1
-URL=https://launchpad.net/lightdm-gtk-greeter/1.4/1.3.1/+download/lightdm-gtk-greeter-1.3.1.tar.gz
-REQUIRED_INSTALLED_PACKAGES="gtk+-3.0 liblightdm-gobject-1-dev libgdk-pixbuf2.0-0 libpango1.0-0 librsvg2-common shared-mime-info gnome-themes-standard"
-REQUIRED_CONTENT_PACKAGES="libgdk-pixbuf2.0-0 libpango1.0-0 librsvg2-common shared-mime-info gnome-themes-standard"
-REQUIRED_BINARIES="lightdm-gtk-greeter"
-REQUIRED_DIRECTORIES="/usr/lib /usr/share/lightdm-gtk-greeter /usr/share/mime /usr/share/xgreeters /usr/share/icons /usr/share/themes /etc /usr/bin"
-REQUIRED_FILES="/etc/lightdm/lightdm-gtk-greeter.conf"
-REQUIRED_MODULES="ldm"
-
diff --git a/remote/modules/ldm-gtk-greeter/module.conf.ubuntu.14 b/remote/modules/ldm-gtk-greeter/module.conf.ubuntu.14
new file mode 100644
index 00000000..8cbf356a
--- /dev/null
+++ b/remote/modules/ldm-gtk-greeter/module.conf.ubuntu.14
@@ -0,0 +1,9 @@
+REQUIRED_VERSION=lightdm-gtk-greeter-1.3.1
+REQUIRED_URL=https://launchpad.net/lightdm-gtk-greeter/1.4/1.3.1/+download/lightdm-gtk-greeter-1.3.1.tar.gz
+REQUIRED_INSTALLED_PACKAGES="gtk+-3.0 liblightdm-gobject-1-dev libgdk-pixbuf2.0-0 libpango1.0-0 librsvg2-common shared-mime-info gnome-themes-standard"
+REQUIRED_CONTENT_PACKAGES="libgdk-pixbuf2.0-0 libpango1.0-0 librsvg2-common shared-mime-info gnome-themes-standard"
+REQUIRED_BINARIES="lightdm-gtk-greeter"
+REQUIRED_DIRECTORIES="/usr/lib /usr/share/lightdm-gtk-greeter /usr/share/mime /usr/share/xgreeters /etc /usr/bin"
+REQUIRED_FILES="/etc/lightdm/lightdm-gtk-greeter.conf"
+REQUIRED_MODULES="ldm"
+
diff --git a/remote/modules/ldm/module.build b/remote/modules/ldm/module.build
index e88f0b08..a316490f 100644
--- a/remote/modules/ldm/module.build
+++ b/remote/modules/ldm/module.build
@@ -1,11 +1,11 @@
 #tool/distro specific functions for fetching, building and installing dependencies
 
 fetch_source () {
-	download_untar "$URL" "src/"
+	download_untar "$REQUIRED_URL" "src/"
 }	
 
 build () {
-	cd "src/$VERSION"
+	cd "src/$REQUIRED_VERSION"
 	pinfo "Running configure"
 	./configure --prefix="/" --datarootdir="/usr/share" || perror "failed."
 	pinfo "Running make"
diff --git a/remote/modules/ldm/module.conf b/remote/modules/ldm/module.conf
index 74ab9450..e69de29b 100644
--- a/remote/modules/ldm/module.conf
+++ b/remote/modules/ldm/module.conf
@@ -1,8 +0,0 @@
-VERSION=lightdm-1.4.0
-URL=https://launchpad.net/lightdm/1.4/1.4.0/+download/lightdm-1.4.0.tar.gz
-REQUIRED_INSTALLED_PACKAGES="libpam-dev itstool liblightdm-gobject-1-dev"
-REQUIRED_CONTENT_PACKAGES=""
-REQUIRED_BINARIES="dm-tool lightdm lightdm-set-defaults gdmflexiserver lightdm-guest-session-wrapper lightdm-set-defaults"
-REQUIRED_DIRECTORIES="/etc /lib"
-REQUIRED_FILES=""
-
diff --git a/remote/modules/ldm/module.conf.ubuntu.14 b/remote/modules/ldm/module.conf.ubuntu.14
new file mode 100644
index 00000000..51fbf64c
--- /dev/null
+++ b/remote/modules/ldm/module.conf.ubuntu.14
@@ -0,0 +1,8 @@
+REQUIRED_VERSION=lightdm-1.4.0
+REQUIRED_URL=https://launchpad.net/lightdm/1.4/1.4.0/+download/lightdm-1.4.0.tar.gz
+REQUIRED_INSTALLED_PACKAGES="libpam-dev itstool liblightdm-gobject-1-dev libxml2-utils intltool"
+REQUIRED_CONTENT_PACKAGES=""
+REQUIRED_BINARIES="dm-tool lightdm lightdm-set-defaults gdmflexiserver lightdm-guest-session-wrapper lightdm-set-defaults"
+REQUIRED_DIRECTORIES="/etc /lib"
+REQUIRED_FILES=""
+
-- 
GitLab