Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

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

 ChangeLog                           |  118 
++++++++++++++++++------------------
 FUNCTIONS                           |   12 +--
 collab/drupal/CONFIGURE             |    2 
 collab/drupal/HISTORY               |    2 
 collab/drupal/INSTALL               |    2 
 collab/drupal/drupal-6.3.tar.gz.sig |binary
 6 files changed, 72 insertions(+), 64 deletions(-)

New commits:
commit 3b7903f0eb6692c5a68ad0feab19ccb3dc2bf600
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    ChangeLog: Cleanup whitespace

commit 5fefa5afece90e7457b9121a520dd9cf24d814cf
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    drupal: Updated new to 6.3

commit 3e252e6acb33962a3302dc9481f05bd49eeed87e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    drupal: Updated old version to 5.9

commit 4992c8d6f77dc0da3fa0e6f46e2cd37250ec4b8d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    FUNCTIONS: install_www_files now installs to a versioned directory so as
    not to overwrite older versions which (may) need to go through an
    upgrade procedure first

commit 285191eef3aa1686fb82d1014312b13e52d766ce
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    drupal: Install to versioned directory to not overwrite older versions 
until they can be properly upgraded

diff --git a/ChangeLog b/ChangeLog
index 140cec9..786f8a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,11 +10,11 @@
        * science/fraqtive: new spell, Mandelbrot family fractal generator
 
 2009-12-26 Vasil Yonkov <spirtbrat AT sourcemage.org>
-        * gnome2-libs/seed: new spell, GObject JavaScriptCore bridge
-        * gnome2-libs/gnome-js-common: new spell,
-          Common modules for GNOME JavaScript interpreters
-        * gnome2-libs/gir-repository: new spell,
-          Library for handling GObject introspection data
+       * gnome2-libs/seed: new spell, GObject JavaScriptCore bridge
+       * gnome2-libs/gnome-js-common: new spell,
+         Common modules for GNOME JavaScript interpreters
+       * gnome2-libs/gir-repository: new spell,
+         Library for handling GObject introspection data
        * gnome2-libs/gjs: new spell, Javascript Bindings for GNOME
 
 2009-12-26 Vlad Glagolev <stealth AT sourcemage.org>
@@ -35,8 +35,8 @@
 
 2009-12-22 Eric Sandall <sandalle AT sourcemage.org>
        * mozilla.gpg: Added 0x6CE2996F
-       Verified 
fromhttp://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0/KEY
-       and subkeys.pgp.net
+         Verified 
fromhttp://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0/KEY
+         and subkeys.pgp.net
 
 2009-12-18 Arjan Bouter <abouter AT sourcemage.org>
        * wm-addons/sawfish-pager: new spell, sawfish's native pager
@@ -51,7 +51,7 @@
 
 2009-12-08 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
        * libs/libsvdrp: new spell, an interface library to allow C programs
-       to interact with a running VDR.
+         to interact with a running VDR.
 
 2009-12-07 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
        * e-17/eyelight: new spell, EFL based presentation tool
@@ -197,22 +197,22 @@
 
 2009-10-03 Bearcat M. Sandor <sourcemage AT feline-soul.com>
        * telephony/telepathy-stream-engine: new spell, media streaming
-       for telepathy
+         for telepathy
 
 2009-10-03 Bearcat M. Sandor <sourcemage AT feline-soul.com>
        * telephony/telepathy-feed: new spell, galago feed for telepathy
 
 2009-10-03 Bearcat M. Sandor <sourcemage AT feline-soul.com>
        * telephony/telepathy-salut: new spell, local xmpp connection
-       manager for telepathy
+         manager for telepathy
 
 2009-10-03 Bearcat M. Sandor <sourcemage AT feline-soul.com>
        * telephony/telepathy-idle: new spell, irc connection manager for
-       telepathy
+         telepathy
 
 2009-10-02 Bearcat M. Sandor <sourcemage AT feline-soul.com>
        * telephony/telepathy-farsight: new spell, farsight bindings for
-       telepathy
+         telepathy
 
 2009-10-01 Ethan Grammatikidis <eekee57 AT fastmail.fm>
        * editors/vi: new spell, the traditional vi
@@ -568,11 +568,11 @@
        * audio-soft/gnaural: Added a GTK+ programmable binaural-beat 
generator
 
 2009-07-10 Bearcat M. Sandor <sourcemage AT feline-soul.com>
-       *video/transmageddon: new spell, video converter
+       * video/transmageddon: new spell, video converter
 
 2009-07-07 Bearcat M. Sandor <sourcemage AT feline-soul.com>
-       *x11-toolkits/goocanvas: new spell, cairo canvas for gtk2+
-       *python-devel/pygoocanvas: python bindings for goocanvas
+       * x11-toolkits/goocanvas: new spell, cairo canvas for gtk2+
+       * python-devel/pygoocanvas: python bindings for goocanvas
 
 2009-07-07 Ladislav Hagara <hgr AT vabo.cz>
        * audio-libs/libtiger: new spell
@@ -607,20 +607,20 @@
 
 2009-06-27 Bearcat M. Sandor <sourcemage AT feline-soul.com>
        * utils/odt2txt: new spell, convert OpenDocument text to plain
-       text
+         text
 
 2009-06-25 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
        * video/yaydl: new spell, Yet Another Youtube Downloader
 
 2009-06-25 Ladislav Hagara <hgr AT vabo.cz>
        * libs/podsleuth: new spell, a tool to discover detailed model
-       information about an Apple (TM) iPod (TM)
+         information about an Apple (TM) iPod (TM)
        * libs/mono-zeroconf: new spell, a cross platform Zero Configuration
-       Networking library for Mono
+         Networking library for Mono
        * gnome2-libs/gnome-keyring-sharp: new spell, C# client library to
-       access the GNOME Keyring daemon
+         access the GNOME Keyring daemon
        * utils/notify-sharp: new spell, C# client implementation for Desktop
-       Notifications
+         Notifications
        * gnome2-apps/gnome-do: new spell, an intelligent launcher tool
        * gnome2-apps/gnome-do-plugins: new spell, plugins for gnome-do
 
@@ -842,7 +842,7 @@
 
 2009-04-23 Ladislav Hagara <hgr AT vabo.cz>
        * shell-term-fm/eaglemode: new spell, a zoomable user interface with
-       many plugin applications in a virtual cosmos
+         many plugin applications in a virtual cosmos
 
 2009-04-22 Treeve Jelbert <treeve AT sourcemage.org>
        * antivirus/inoclam: new spell, antivirus monitor
@@ -990,7 +990,7 @@
 
 2009-03-18 Bearcat M. Sandor <sorcery AT feline-soul.com>
        * gnome2-apps/gnome-color-chooser: new spell, a color your gtk
-       themes on the fly
+         themes on the fly
 
 2009-03-17 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * crypto/cryptmount: new spell, a utility which allows an ordinary 
user to
@@ -1757,7 +1757,7 @@
 2008-09-28 Robin Cook <rcook AT wyrms.net>
        * gnome2-lib/policykit-gnome: new spell gnome interface for policykit
        * gnome2-lib/libcanberra: new spell Implementation of the
-      XDG Sound Theme and Name Spec
+         XDG Sound Theme and Name Spec
 
 2008-09-28 Treeve Jelbert <treeve AT sourcemage.org>
        * python-pypi/bsddb3: new spell fix python support for newer db
@@ -2327,6 +2327,11 @@
          framework for KDE)
        * utils/pmtools: new spell, a collection of power management tools
 
+2008-08-09 Eric Sandall <sandalle AT sourcemage.org>
+       * FUNCTIONS: install_www_files now installs to a versioned directory 
so as
+         not to overwrite older versions which (may) need to go through an
+         upgrade procedure first.
+
 2008-08-09 Ethan Grammatikidis <eekee57 AT fastmail.fm>
        * utils/fbmodes: new spell, Modeline calculator
 
@@ -2578,7 +2583,7 @@
 
 2008-06-18 Ivan Lezhnjov Jr. <ivan.lezhnjov.jr AT sourcemage.org>
        * kde-look/qtcurve-gtk2: new spell, QT Widget style to unify GNOME/KDE
-          applications' look
+         applications' look
        * disk/bin2iso: new spell, a BIN to ISO converter
 
 2008-06-18 Arjan Bouter <abouter AT sourcemage.org>
@@ -3346,7 +3351,7 @@
        * util/ndeks-dbus-glib: new spell, required for beagle
 
 2008-01-26 Vlad Glagolev <stealth AT sourcemage.org>
-        * lua-forge/luaposix: new spell, POSIX library for Lua
+       * lua-forge/luaposix: new spell, POSIX library for Lua
        * lua-forge/lua-imlib2: new spell, binding to the imlib2 image library
 
 2008-01-24 Eric Sandall <sandalle AT sourcemage.org>
@@ -4555,9 +4560,9 @@
 
 2007-06-05 Eric Sandall <sandalle AT sourcemage.org>
        * fonts/redhat.gpg: RedHat's GPG key, verified via
-       https://www.redhat.com/security/37017186.txt,
-       https://www.redhat.com/security/team/key/#package, and
-       
http://keyserv.nic-se.se:11371/pks/lookup?op=get&search=0x5326810137017186
+         https://www.redhat.com/security/37017186.txt,
+         https://www.redhat.com/security/team/key/#package, and
+         
http://keyserv.nic-se.se:11371/pks/lookup?op=get&search=0x5326810137017186
        * fonts/liberation-fonts-ttf: RedHat's GPL'd Liberation font sets
 
 2007-06-06 Pol Vinogradov <vin.public AT gmail.com>
@@ -4584,7 +4589,7 @@
 
 2007-05-31 Remko van der Vossen <wich AT stack.nl>
        * printer/paps: New spell
-       UTF-8 to postscript converter with a Pango backend.
+         UTF-8 to postscript converter with a Pango backend.
 
 2007-05-30 Juuso Alasuutari <iuso AT sourcemage.org>
        * security/polgen: New spell, SELinux policy generation toolkit.
@@ -5421,7 +5426,7 @@
 
 2007-01-08 David Brown <dmlb2000 AT gmail.com>
        * kernels/linux-initramfs: new spell for adding initial ramdisks to
-       linux spell
+         linux spell
 
 2007-01-04 Thomas Orgis <sobukus AT sourcemage.org>
        * doc/po4a: new spell, gettext for documentation...
@@ -6365,14 +6370,14 @@
 
 2006-06-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * i18n/scim-chinese: move from z-rejected, was renamed to scim-pinyin
-                            and relicensed to GPL, 12717
+         and relicensed to GPL, 12717
        * i18n/anthy: new spell; a Kanji conversion system for Japanese input
          methods
        * scim-anthy: new spell; scim Anthy back-end
        * graphics/ipe: new spell; editor for creating figures in PDF or 
Postscript
        * shell-term-fm/mlterm: new spell; a multilingual terminal emulator
        * audio-players/snd123: new spell; libvlc-based command line audio 
player
-       new spells curtesy of Remko van der Vossen (wich), thanks!
+         new spells curtesy of Remko van der Vossen (wich), thanks!
 
 2006-06-28 Pieter Lenaerts <e-type AT sourcemage.org>
        * perl-cpan/file-desktopentry: new spell, find XDG files and dirs
@@ -7094,30 +7099,30 @@
 
 2005-11-30 Pieter Lenaerts <e-type AT sourcemage.org>
        * spells from editors to new section spelling:aspell aspell-af
-       aspell-am aspell-az aspell-be aspell-bg aspell-bn aspell-br aspell-ca
-       aspell-cs aspell-cy aspell-da aspell-de aspell-de-alt aspell-el
-       aspell-en aspell-eo aspell-es aspell-et aspell-fa aspell-fo aspell-fr
-       aspell-ga aspell-gd aspell-gl aspell-gv aspell-he aspell-hi aspell-hr
-       aspell-hsb aspell-hu aspell-ia aspell-id aspell-is aspell-it aspell-ku
-       aspell-la aspell-lt aspell-lv aspell-mg aspell-mi aspell-mk aspell-mn
-       aspell-mr aspell-ms aspell-mt aspell-nb aspell-nds aspell-nl aspell-nn
-       aspell-no aspell-ny aspell-pl aspell-pt aspell-ro aspell-ru aspell-rw
-       aspell-sc aspell-sk aspell-sl aspell-sv aspell-sw aspell-ta aspell-tet
-       aspell-tl aspell-tn aspell-tr aspell-uk aspell-uz aspell-vi aspell-wa
-       aspell-yi aspell-zu babydics babytrans hunspell ispell ispell-czech
-       ispell-english ooodi pspell spellutils
+         aspell-am aspell-az aspell-be aspell-bg aspell-bn aspell-br 
aspell-ca
+         aspell-cs aspell-cy aspell-da aspell-de aspell-de-alt aspell-el
+         aspell-en aspell-eo aspell-es aspell-et aspell-fa aspell-fo 
aspell-fr
+         aspell-ga aspell-gd aspell-gl aspell-gv aspell-he aspell-hi 
aspell-hr
+         aspell-hsb aspell-hu aspell-ia aspell-id aspell-is aspell-it 
aspell-ku
+         aspell-la aspell-lt aspell-lv aspell-mg aspell-mi aspell-mk 
aspell-mn
+         aspell-mr aspell-ms aspell-mt aspell-nb aspell-nds aspell-nl 
aspell-nn
+         aspell-no aspell-ny aspell-pl aspell-pt aspell-ro aspell-ru 
aspell-rw
+         aspell-sc aspell-sk aspell-sl aspell-sv aspell-sw aspell-ta 
aspell-tet
+         aspell-tl aspell-tn aspell-tr aspell-uk aspell-uz aspell-vi 
aspell-wa
+         aspell-yi aspell-zu babydics babytrans hunspell ispell ispell-czech
+         ispell-english ooodi pspell spellutils
        * spells from windowmanagers to wm-addons:alarm-applet allin1 asclock
-       asmixer astime bbconf bbdate bbkeys bbmail bbpager bbppp bbrun bbsload
-       bbsmount bbtime bubblemon-dockapp desklaunch deskmenu devilspie docker
-       fbdesk fbpager fspanel iceme icewmconf idesk keylaunch libdockapp
-       libdockapp4 menumaker mixer.app obconf ratpoison rootclock rootmem
-       skippy ticker.app tpager twin vdesk volume volume2 wdm
-       windowmaker-extra wmacpimon wmakerconf wmalbum wmapmload wmappl
-       wmbatteries wmbiff wmbinclock wmcalclock wmclockmon wmclockmon
-       wmcpuload wmcpuload wmctrl wmdrawer wmessage wmgtemp wmifinfo wmii
-       wmix wmjmail wmjstock wmlongrun wmmaiload wmmemload wmmemmon
-       wmmoonclock wmnd wmnetload wmpasman wmpop3 wmsensormon wmstock wmtop
-       wmupmon wmusic wmwave wmweather wmweather+ wmwifi wmwork xp
+         asmixer astime bbconf bbdate bbkeys bbmail bbpager bbppp bbrun 
bbsload
+         bbsmount bbtime bubblemon-dockapp desklaunch deskmenu devilspie 
docker
+         fbdesk fbpager fspanel iceme icewmconf idesk keylaunch libdockapp
+         libdockapp4 menumaker mixer.app obconf ratpoison rootclock rootmem
+         skippy ticker.app tpager twin vdesk volume volume2 wdm
+         windowmaker-extra wmacpimon wmakerconf wmalbum wmapmload wmappl
+         wmbatteries wmbiff wmbinclock wmcalclock wmclockmon wmclockmon
+         wmcpuload wmcpuload wmctrl wmdrawer wmessage wmgtemp wmifinfo wmii
+         wmix wmjmail wmjstock wmlongrun wmmaiload wmmemload wmmemmon
+         wmmoonclock wmnd wmnetload wmpasman wmpop3 wmsensormon wmstock wmtop
+         wmupmon wmusic wmwave wmweather wmweather+ wmwifi wmwork xp
 
 2005-11-29 Ladislav Hagara <hgr AT vabo.cz>
        * e/e_module-eloquence, e/e_module-screenshot: new E17 modules
@@ -8285,7 +8290,7 @@
 
 2004-03-14 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * utils/banshee-linux: removed banshee-linux spell, project is dead 
and
-        vanished from the net
+         vanished from the net
 
 2004-03-12 Eric Sandall <sandalle AT sourcemage.org>
        * java/jaf,jms,jmx,jdmk,jndi,java_xml_pack,javamail,jdbc-optional,jta:
@@ -8335,3 +8340,4 @@
          full use of xfree86-devel or xfree86-libs or xdirectfb spells to
          provide x11-{libs,server}.  THE CATCH IS YOU MUST USE DEVEL SORCERY
          OR YOU WILL GET NOTHING BUT ERRORS DURING CAST.
+
diff --git a/FUNCTIONS b/FUNCTIONS
index c18ebc3..adbf3cf 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -219,7 +219,7 @@ function get_install_www_files_dir ()
 ## @param Directory with files we might want to install
 ## @param Destination directory (optional)
 ##
-## Installs files to WWW_DEST ($INSTALL_ROOT/usr/share/www/$SPELL) and
+## Installs files to WWW_DEST ($INSTALL_ROOT/usr/share/www/$SPELL-$VERSION) 
and
 ## sets up proper www-data permissions
 ## Optionally the second parameter will override WWW_DATA (and make
 ## sure INSTALL_ROOT exists only once in the WWW_DATA)
@@ -232,7 +232,7 @@ function  install_www_files ()
     #
     local  WWW_DEST="$INSTALL_ROOT/${2/\$INSTALL_ROOT/}"
   else
-    local  WWW_DEST="$INSTALL_ROOT$(get_install_www_files_dir)$SPELL"
+    local  
WWW_DEST="$INSTALL_ROOT$(get_install_www_files_dir)$SPELL-$VERSION"
   fi  &&
 
   #
@@ -244,10 +244,10 @@ function  install_www_files ()
   # Make sure WWW_DEST exists
   #
   if  [  !  -d  "$WWW_DEST"  ];  then
-    if  [  !  -d  "${WWW_DEST/\/$SPELL/}"  ];  then
-      mkdir  -p  "${WWW_DEST/\/$SPELL/}"                   &&
-      chmod  0755                 "${WWW_DEST/\/$SPELL/}"  &&
-      chown  www-data:www-data    "${WWW_DEST/\/$SPELL/}"
+    if  [  !  -d  "${WWW_DEST/\/$SPELL-$VERSION/}"  ];  then
+      mkdir  -p  "${WWW_DEST/\/$SPELL-$VERSION/}"                   &&
+      chmod  0755                 "${WWW_DEST/\/$SPELL-$VERSION/}"  &&
+      chown  www-data:www-data    "${WWW_DEST/\/$SPELL-$VERSION/}"
     fi  &&
 
     mkdir  -p  "$WWW_DEST"                   &&
diff --git a/collab/drupal/CONFIGURE b/collab/drupal/CONFIGURE
index 93ccf42..d2acac2 100755
--- a/collab/drupal/CONFIGURE
+++ b/collab/drupal/CONFIGURE
@@ -1,6 +1,6 @@
 .  $GRIMOIRE/FUNCTIONS                                                       
                                    &&
 config_query_string  DRUPAL_INSTALL_PATH                                     
                                    \
-                     "What path do you wish to use for installation (the 
spell name will be added at the end)?"  \
+                     "What path do you wish to use for installation (the 
spell name and version will be added at the end)?"  \
                      "usr/share/www"                                         
                                    &&
 
 config_query_list  DRUPAL_DATABASE_ENGINE                                    
                                    \
diff --git a/collab/drupal/HISTORY b/collab/drupal/HISTORY
index 899b18f..54dae05 100644
--- a/collab/drupal/HISTORY
+++ b/collab/drupal/HISTORY
@@ -8,6 +8,8 @@
 2008-08-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS, PREPARE: Updated old version to 5.9
          Updated new version to 6.3
+       * CONFIGURE, INSTALL: Install to versioned directory to not overwrite 
older
+         versions until they can be properly upgraded
 
 2007-03-19 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 4.7.6 (Security update)
diff --git a/collab/drupal/INSTALL b/collab/drupal/INSTALL
index 21b52fa..99af46e 100755
--- a/collab/drupal/INSTALL
+++ b/collab/drupal/INSTALL
@@ -1,4 +1,4 @@
-install_www_files  ./  ${INSTALL_ROOT}${DRUPAL_INSTALL_PATH}/${SPELL}        
                                  &&
+install_www_files  ./  
${INSTALL_ROOT}${DRUPAL_INSTALL_PATH}/${SPELL}-${VERSION}                     
          &&
 
 if  [  "${DRUPAL_INSTALLED}"  ==  "n"  ];  then
   if  [  "${DRUPAL_CREATEDB}"  ==  "y"  ];  then
diff --git a/collab/drupal/drupal-6.3.tar.gz.sig 
b/collab/drupal/drupal-6.3.tar.gz.sig
new file mode 100644
index 0000000..122475e
Binary files /dev/null and b/collab/drupal/drupal-6.3.tar.gz.sig differ