[SM-Commit] GIT changes to master grimoire by Eric Sandall (1d8b6f5fb9a1737e9a7e75edf32cf5c1a8644440)

Eric Sandall scm at mail.sourcemage.org
Thu Nov 16 15:07:15 EST 2006


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 ChangeLog                            |    4 ++++
 e/e17/DEPENDS                        |   20 ++++++++++++++------
 e/e17/HISTORY                        |    3 +++
 e/e_module-alarm/CONFLICTS           |    2 ++
 e/e_module-alarm/DEPENDS             |    6 ++++++
 e/e_module-alarm/DETAILS             |   19 +++++++++++++++++++
 e/e_module-alarm/HISTORY             |    9 +++++++++
 e/e_module-alarm/PREPARE             |    6 ++++++
 e/e_module-alarm/PRE_BUILD           |    7 +++++++
 e/e_module-eveil/BUILD               |    1 +
 e/e_module-eveil/CONFLICTS           |    1 -
 e/e_module-eveil/DEPENDS             |    7 +------
 e/e_module-eveil/DETAILS             |    6 +-----
 e/e_module-eveil/EXPORTS             |    1 +
 e/e_module-eveil/HISTORY             |    3 +++
 e/e_module-eveil/INSTALL             |    1 +
 e/e_module-eveil/PREPARE             |    2 --
 e/e_module-eveil/PRE_BUILD           |    4 +---
 e/e_module-eveil/REPAIR^none^EXPORTS |    1 +
 e/e_module-eveil/TRIGGERS            |    1 +
 e/e_modules/DEPENDS                  |   10 +++++-----
 e/e_modules/HISTORY                  |    3 +++
 e/evas/DEPENDS                       |   13 ++++---------
 e/evas/HISTORY                       |    3 +++
 24 files changed, 96 insertions(+), 37 deletions(-)

New commits:
commit bee399b4e913d4f2cf0c41c23aefa3619a0c1feb
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Fix e_module-alarm to work with automake 1.10

commit d7c540e29f6d4d750b7df1a933ff42133a57ac7b
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    persistent_read fails after having already been run, so don't use ampersands at the end

commit ec366fb34fa64d8730587d616b02be62a8d1256f
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Forgot to assign the old variable from persistent_read to a new variable in PREPARE

commit 2157465a773b298bbcd782923674a1c6f732363a
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    e_module-eveil renamed to e_module-alarm

commit 4bee88d2fe144b7f1a2db1ef246d4afb71765d21
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    evas now required eet, it is no longer optional

commit 9c65645e6d12e804efff7129765551c37bf29b81
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Added optional dependency on dejavu-ttf for e17 (default E17 font)

diff --git a/ChangeLog b/ChangeLog
index ea9d4e8..d95296d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-16 Eric Sandall <eric at sandall.us>
+	* e/e_module-eveil, e/e_module-alarm: e_module-eveil renamed to
+	  e_module-alarm.
+
 2006-11-16 Treeve Jelbert <treeve at pi.be>
 	* database/pgadmin3: move spell from devel to database
 
diff --git a/e/e17/DEPENDS b/e/e17/DEPENDS
index 2a50823..4829186 100755
--- a/e/e17/DEPENDS
+++ b/e/e17/DEPENDS
@@ -1,9 +1,9 @@
 depends  automake-1.9  &&
-depends  CVS       &&
-depends  edje      &&
-depends  evas      &&
-depends  imlib2    &&
-depends  X11-LIBS  &&
+depends  CVS           &&
+depends  edje          &&
+depends  evas          &&
+depends  imlib2        &&
+depends  X11-LIBS      &&
 
 if  [  "$(get_spell_provider  $SPELL  X11-LIBS)"  ==  "xorg-server"  ];  then
   depends  libxcursor   &&
@@ -12,4 +12,12 @@ if  [  "$(get_spell_provider  $SPELL  X1
   depends  libxrandr
 fi  &&
 
-optional_depends  esound  ""  ""  "for sound support"
+optional_depends  dejavu-ttf                            \
+                  ''                                    \
+                  ''                                    \
+                  'for the Enlightenment default font'  &&
+
+optional_depends  esound               \
+                  ''                   \
+                  ''                   \
+                  'for sound support'
diff --git a/e/e17/HISTORY b/e/e17/HISTORY
index 8e1b0ed..757a1b3 100644
--- a/e/e17/HISTORY
+++ b/e/e17/HISTORY
@@ -1,3 +1,6 @@
+2006-11-16 Eric Sandall <eric at sandall.us>
+	* DEPENDS: Optionally depend on dejavu-ttf (default E17 font)
+
 2006-11-08 Eric Sandall <eric at sandall.us>
 	* starte17: Proper way to start e17 is `enlightenment_start`
 	* DETAILS: Updated PATCHLEVEL=2
diff --git a/e/e_module-alarm/CONFLICTS b/e/e_module-alarm/CONFLICTS
new file mode 100755
index 0000000..036f08e
--- /dev/null
+++ b/e/e_module-alarm/CONFLICTS
@@ -0,0 +1,2 @@
+conflicts  e_module-eveil  y
+conflicts  e_modules  y
diff --git a/e/e_module-alarm/DEPENDS b/e/e_module-alarm/DEPENDS
new file mode 100755
index 0000000..0328b88
--- /dev/null
+++ b/e/e_module-alarm/DEPENDS
@@ -0,0 +1,6 @@
+depends  ecore    &&
+depends  edje     &&
+depends  eet      &&
+depends  e17      &&
+depends  esmart   &&
+depends  evas
diff --git a/e/e_module-alarm/DETAILS b/e/e_module-alarm/DETAILS
new file mode 100755
index 0000000..778b9e1
--- /dev/null
+++ b/e/e_module-alarm/DETAILS
@@ -0,0 +1,19 @@
+           SPELL=e_module-alarm
+  if  [[  "$E_MODULE_ALARM_CVS_AUTOUPDATE"  ==  "y"  ]];  then
+         VERSION=$(date +%Y%m%d)
+  else
+         VERSION=cvs
+  fi
+          SOURCE=$SPELL-cvs.tar.bz2
+   SOURCE_URL[0]=cvs://:pserver:anonymous@anoncvs.enlightenment.org:/var/cvs/e/:${SPELL/-*/}s/${SPELL/*-/}
+   SOURCE_IGNORE=volatile
+  FORCE_DOWNLOAD="on"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
+      LICENSE[0]=BSD
+        WEB_SITE=http://get-e.org/Resources/Modules/
+        KEYWORDS="timer enlightenment"
+         ENTERED=20060830
+           SHORT='E17 reminder/timer module'
+cat << EOF
+An Enlightenment module to set reminders and timers.
+EOF
diff --git a/e/e_module-alarm/HISTORY b/e/e_module-alarm/HISTORY
new file mode 100644
index 0000000..b3ab643
--- /dev/null
+++ b/e/e_module-alarm/HISTORY
@@ -0,0 +1,9 @@
+2006-11-16 Eric Sandall <eric at sandall.us>
+	* Copied from e_module-eveil
+	  Modified to be alarm, not eveil
+	* PREPARE: Use persistent_read to use old preference for
+	  E_MODULE_EVEIL_CVS_AUTOUPDATE
+	* CONFLICTS: Auto-conflicts with e_module-eveil
+	* PRE_BUILD: Create config.rpath so ./autogen.sh stops complaining about
+	  missing this useless (for most packages) file
+
diff --git a/e/e_module-alarm/PREPARE b/e/e_module-alarm/PREPARE
new file mode 100755
index 0000000..bcd6e50
--- /dev/null
+++ b/e/e_module-alarm/PREPARE
@@ -0,0 +1,6 @@
+persistent_read  e_module-eveil  E_MODULE_EVEIL_CVS_AUTOUPDATE  \
+                                 E_MODULE_ALARM_CVS_AUTOUPDATE
+
+config_query  E_MODULE_ALARM_CVS_AUTOUPDATE                       \
+              "Automatically update $SPELL on system-update?"     \
+              ${E_MODULE_ALARM_CVS_AUTOUPDATE:-n}
diff --git a/e/e_module-alarm/PRE_BUILD b/e/e_module-alarm/PRE_BUILD
new file mode 100755
index 0000000..bab7906
--- /dev/null
+++ b/e/e_module-alarm/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build               &&
+cd  $SOURCE_DIRECTORY           &&
+#
+# No longer complaing about missing unneeded config.rpath
+#
+touch  config.rpath             &&
+NOCONFIGURE="ON"  ./autogen.sh
diff --git a/e/e_module-eveil/BUILD b/e/e_module-eveil/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/e/e_module-eveil/BUILD
@@ -0,0 +1 @@
+true
diff --git a/e/e_module-eveil/CONFLICTS b/e/e_module-eveil/CONFLICTS
deleted file mode 100755
index 4caf782..0000000
--- a/e/e_module-eveil/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts  e_modules  y
diff --git a/e/e_module-eveil/DEPENDS b/e/e_module-eveil/DEPENDS
index 0328b88..5bac05a 100755
--- a/e/e_module-eveil/DEPENDS
+++ b/e/e_module-eveil/DEPENDS
@@ -1,6 +1 @@
-depends  ecore    &&
-depends  edje     &&
-depends  eet      &&
-depends  e17      &&
-depends  esmart   &&
-depends  evas
+depends  e_module-alarm
diff --git a/e/e_module-eveil/DETAILS b/e/e_module-eveil/DETAILS
index 6a31c7c..f7a08bc 100755
--- a/e/e_module-eveil/DETAILS
+++ b/e/e_module-eveil/DETAILS
@@ -4,11 +4,7 @@
   else
          VERSION=cvs
   fi
-          SOURCE=$SPELL-cvs.tar.bz2
-   SOURCE_URL[0]=cvs://:pserver:anonymous@anoncvs.enlightenment.org:/var/cvs/e/:${SPELL/-*/}s/${SPELL/*-/}
-   SOURCE_IGNORE=volatile
-  FORCE_DOWNLOAD="on"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
+      PATCHLEVEL=1
       LICENSE[0]=BSD
         WEB_SITE=http://get-e.org/Resources/Modules/
         KEYWORDS="timer enlightenment"
diff --git a/e/e_module-eveil/EXPORTS b/e/e_module-eveil/EXPORTS
new file mode 100755
index 0000000..7c1bfc0
--- /dev/null
+++ b/e/e_module-eveil/EXPORTS
@@ -0,0 +1 @@
+E_MODULE_EVEIL_CVS_AUTOUPDATE
diff --git a/e/e_module-eveil/HISTORY b/e/e_module-eveil/HISTORY
index 22173ea..9aa7bd8 100644
--- a/e/e_module-eveil/HISTORY
+++ b/e/e_module-eveil/HISTORY
@@ -1,3 +1,6 @@
+2006-11-16 Eric Sandall <eric at sandall.us>
+	* Deprecated in favor of e_module-alarm
+
 2006-09-20 David Brown <dmlb2000 at gmail.com
 	* DETAILS: swapped out VERSION for cvs cause this doesn't
 	  work with update daily
diff --git a/e/e_module-eveil/INSTALL b/e/e_module-eveil/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/e/e_module-eveil/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/e/e_module-eveil/PREPARE b/e/e_module-eveil/PREPARE
deleted file mode 100755
index 788c708..0000000
--- a/e/e_module-eveil/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query  E_MODULE_EVEIL_CVS_AUTOUPDATE                       \
-              "Automatically update $SPELL on system-update?"  n
diff --git a/e/e_module-eveil/PRE_BUILD b/e/e_module-eveil/PRE_BUILD
index b218a4a..27ba77d 100755
--- a/e/e_module-eveil/PRE_BUILD
+++ b/e/e_module-eveil/PRE_BUILD
@@ -1,3 +1 @@
-default_pre_build               &&
-cd  $SOURCE_DIRECTORY           &&
-NOCONFIGURE="ON"  ./autogen.sh
+true
diff --git a/e/e_module-eveil/REPAIR^none^EXPORTS b/e/e_module-eveil/REPAIR^none^EXPORTS
new file mode 100755
index 0000000..7c1bfc0
--- /dev/null
+++ b/e/e_module-eveil/REPAIR^none^EXPORTS
@@ -0,0 +1 @@
+E_MODULE_EVEIL_CVS_AUTOUPDATE
diff --git a/e/e_module-eveil/TRIGGERS b/e/e_module-eveil/TRIGGERS
new file mode 100755
index 0000000..b32f616
--- /dev/null
+++ b/e/e_module-eveil/TRIGGERS
@@ -0,0 +1 @@
+on_cast  e_module-eveil  dispel_self
diff --git a/e/e_modules/DEPENDS b/e/e_modules/DEPENDS
index 917a67e..b59ab55 100755
--- a/e/e_modules/DEPENDS
+++ b/e/e_modules/DEPENDS
@@ -1,3 +1,8 @@
+optional_depends  e_module-alarm                      \
+                  ''                                  \
+                  ''                                  \
+                  'for an E17 reminder/timer module'  &&
+
 optional_depends  e_module-bling                  \
                   ''                              \
                   ''                              \
@@ -23,11 +28,6 @@ optional_depends  e_module-devian
                   ''                                                   \
                   'for an E17 module to display images and RSS feeds'  &&
 
-optional_depends  e_module-eveil                      \
-                  ''                                  \
-                  ''                                  \
-                  'for an E17 reminder/timer module'  &&
-
 optional_depends  e_module-evolume          \
                   ''                        \
                   ''                        \
diff --git a/e/e_modules/HISTORY b/e/e_modules/HISTORY
index 9e9515b..5977d31 100644
--- a/e/e_modules/HISTORY
+++ b/e/e_modules/HISTORY
@@ -1,3 +1,6 @@
+2006-11-16 Eric Sandall <eric at sandall.us>
+	* DEPENDS: e_module-eveil renamed to e_module-alarm
+
 2006-09-11 Eric Sandall <eric at sandall.us>
 	* DEPENDS: Optionally depend on new e_module-mixer
 
diff --git a/e/evas/DEPENDS b/e/evas/DEPENDS
index 2a036bb..ce2a7f2 100755
--- a/e/evas/DEPENDS
+++ b/e/evas/DEPENDS
@@ -1,5 +1,7 @@
-depends  automake  &&
-depends  libtool   &&
+depends  automake                              &&
+depends  eet       '--enable-image-loader-eet  \
+                    --enable-font-loader-eet'  &&
+depends  libtool                               &&
 
 if  [  "$EVAS_CVS"  ==  "y"  ];  then
   depends  CVS
@@ -41,13 +43,6 @@ optional_depends  jpeg
                   "--disable-image-loader-jpeg"  \
                   "for JPEG image loader"        &&
 
-optional_depends  eet                              \
-                  "--enable-image-loader-eet       \
-                   --enable-font-loader-eet"       \
-                  "--disable-image-loader-eet      \
-                   --disable-font-loader-eet"      \
-                  "for EET image and font loader"  &&
-
 optional_depends  edb                           \
                   "--enable-image-loader-edb"   \
                   "--disable-image-loader-edb"  \
diff --git a/e/evas/HISTORY b/e/evas/HISTORY
index 8c2be49..a9f00a2 100644
--- a/e/evas/HISTORY
+++ b/e/evas/HISTORY
@@ -1,3 +1,6 @@
+2006-11-16 Eric Sandall <eric at sandall.us>
+	* DEPENDS: eet is no longer optional (found by Loren Hoffman (chromex))
+
 2006-03-28 David Brown <dmlb2000 at gmail.com>
 	* PREPARE: set EVAS_CVS_AUTOUPDATE instead of EDJE's var
 



More information about the SM-Commit mailing list