Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master xorg-modular grimoire by Juuso Alasuutari (a1e1a9530d25b55c951f63ec22101192c399e6fd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master xorg-modular grimoire by Juuso Alasuutari (a1e1a9530d25b55c951f63ec22101192c399e6fd)
  • Date: Tue, 26 Dec 2006 10:40:06 -0600

GIT changes to master xorg-modular grimoire by Juuso Alasuutari
<iuso AT sourcemage.org>:

beryl/emerald/DEPENDS | 45
+++++++++++++++++++++++++++------------------
beryl/emerald/DETAILS | 6 ++++--
beryl/emerald/FINAL | 4 ++--
beryl/emerald/HISTORY | 9 +++++++++
beryl/emerald/POST_REMOVE | 4 ++--
beryl/emerald/PREPARE | 6 ++++--
beryl/emerald/PRE_BUILD | 10 ++++++----
7 files changed, 54 insertions(+), 30 deletions(-)

New commits:
commit a1e1a9530d25b55c951f63ec22101192c399e6fd
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

emerald: Added deps shared-mime-info & desktop-file-utils, did other
fixing

diff --git a/beryl/emerald/DEPENDS b/beryl/emerald/DEPENDS
index f2c278f..a9e0e79 100755
--- a/beryl/emerald/DEPENDS
+++ b/beryl/emerald/DEPENDS
@@ -1,18 +1,27 @@
-depends "gtk+2" &&
-depends "cairo" &&
-depends "dbus" &&
-depends "OPENGL" &&
-depends "libice" &&
-depends "pango" &&
-depends "libpng" &&
-depends "libsm" &&
-depends "startup-notification" &&
-depends "libwnck" &&
-depends "libxdamage" &&
-depends "libxcomposite" &&
-depends "libxfixes" &&
-depends "libxrandr" &&
-depends "libxinerama" &&
-depends "libxrender" &&
-depends "libdrm" &&
-depends "beryl-core"
+depends gtk+2 &&
+depends cairo &&
+depends dbus &&
+depends OPENGL &&
+depends libice &&
+depends pango &&
+depends libpng &&
+depends libsm &&
+depends libwnck &&
+depends libxdamage &&
+depends libxcomposite &&
+depends libxfixes &&
+depends libxrandr &&
+depends libxinerama &&
+depends libxrender &&
+depends libdrm &&
+depends beryl-core &&
+depends startup-notification &&
+
+# For the mime database update in FINAL
+depends shared-mime-info &&
+depends desktop-file-utils &&
+
+if [[ $EMERALD_TRUNK == y ]]
+then
+ depends autoconf
+fi
diff --git a/beryl/emerald/DETAILS b/beryl/emerald/DETAILS
index 7036499..0cf8de5 100755
--- a/beryl/emerald/DETAILS
+++ b/beryl/emerald/DETAILS
@@ -1,6 +1,8 @@
SPELL=emerald
-if [ "$EMERALD_TRUNK" == "y" ]; then
- if [ "$EMERALD_TRUNK_AUTOUPDATE" = "y" ]; then
+if [[ $EMERALD_TRUNK == y ]]
+then
+ if [[ $EMERALD_TRUNK_AUTOUPDATE == y ]]
+ then
VERSION=svn-$(date +%Y%m%d)
else
VERSION=svn
diff --git a/beryl/emerald/FINAL b/beryl/emerald/FINAL
index d6f85ab..d76fbf0 100755
--- a/beryl/emerald/FINAL
+++ b/beryl/emerald/FINAL
@@ -1,2 +1,2 @@
-$INSTALL_ROOT/usr/bin/update-mime-database $INSTALL_ROOT/usr/share/mime &&
-$INSTALL_ROOT/usr/bin/update-desktop-database
$INSTALL_ROOT/usr/share/applications
+update-mime-database $INSTALL_ROOT/usr/share/mime &&
+update-desktop-database $INSTALL_ROOT/usr/share/applications
diff --git a/beryl/emerald/HISTORY b/beryl/emerald/HISTORY
index 975c74f..542e802 100644
--- a/beryl/emerald/HISTORY
+++ b/beryl/emerald/HISTORY
@@ -1,3 +1,12 @@
+2006-12-26 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Changed invalid operator = to ==.
+ * DEPENDS: Added depends shared-mime-info & desktop-file-utils
+ (needed in FINAL and POST_REMOVE), added depends autoconf for
+ SVN version.
+ * PRE_BUILD: Fixed ./autogen.sh execution to depend on
+ $EMERALD_TRUNK.
+ * FINAL, POST_REMOVE: Removed invalid $INSTALL_ROOTs.
+
2006-12-10 Lalo Martins <lalo AT sourcemage.org>
* DETAILS: release 0.1.3

diff --git a/beryl/emerald/POST_REMOVE b/beryl/emerald/POST_REMOVE
index d6f85ab..d76fbf0 100755
--- a/beryl/emerald/POST_REMOVE
+++ b/beryl/emerald/POST_REMOVE
@@ -1,2 +1,2 @@
-$INSTALL_ROOT/usr/bin/update-mime-database $INSTALL_ROOT/usr/share/mime &&
-$INSTALL_ROOT/usr/bin/update-desktop-database
$INSTALL_ROOT/usr/share/applications
+update-mime-database $INSTALL_ROOT/usr/share/mime &&
+update-desktop-database $INSTALL_ROOT/usr/share/applications
diff --git a/beryl/emerald/PREPARE b/beryl/emerald/PREPARE
index 57e6d44..841d385 100755
--- a/beryl/emerald/PREPARE
+++ b/beryl/emerald/PREPARE
@@ -1,6 +1,8 @@
config_query EMERALD_TRUNK "Use SVN trunk version?" n
-if [ "$EMERALD_TRUNK" == "y" ]; then
- config_query EMERALD_TRUNK_AUTOUPDATE \
+
+if [[ $EMERALD_TRUNK == y ]]
+then
+ config_query EMERALD_TRUNK_AUTOUPDATE \
"Update to the latest SVN trunk on every cast?" \
n
fi
diff --git a/beryl/emerald/PRE_BUILD b/beryl/emerald/PRE_BUILD
index 0789c71..bf046d7 100755
--- a/beryl/emerald/PRE_BUILD
+++ b/beryl/emerald/PRE_BUILD
@@ -1,5 +1,7 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-if [ -x autogen.sh ]; then
-NOCONFIGURE=Y ./autogen.sh
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if [[ $EMERALD_TRUNK == y ]]
+then
+ NOCONFIGURE=Y ./autogen.sh
fi



  • [SM-Commit] GIT changes to master xorg-modular grimoire by Juuso Alasuutari (a1e1a9530d25b55c951f63ec22101192c399e6fd), Juuso Alasuutari, 12/26/2006

Archive powered by MHonArc 2.6.24.

Top of Page