Merge branch 'master' of ssh://treeve@scm.sourcemage.org/smgl/grimoire

14 files changed, 21 insertions, 6 deletions

diff --git a/database/mysql/DETAILS b/database/mysql/DETAILS
index 804fa43472..67bec8983e 100755
--- a/database/mysql/DETAILS
+++ b/database/mysql/DETAILS
@@ -3,7 +3,7 @@ if [[ $OLD == y ]]; then
          VERSION=5.0.83
   SECURITY_PATCH=3
 else
-         VERSION=5.1.35
+         VERSION=5.1.36
 fi
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index 40ae63a8ab..6a2ec2aef8 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,6 @@
+2009-07-02 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated stable to version 5.1.36
+
 2009-06-13 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 5.0.83 [old]
 
diff --git a/database/pgadmin3/DETAILS b/database/pgadmin3/DETAILS
index d0fa7ac60a..5705886242 100755
--- a/database/pgadmin3/DETAILS
+++ b/database/pgadmin3/DETAILS
@@ -1,5 +1,5 @@
            SPELL=pgadmin3
-         VERSION=1.8.4
+         VERSION=1.10.0
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/database/pgadmin3/HISTORY b/database/pgadmin3/HISTORY
index 616bd80743..fe1a02bb8f 100644
--- a/database/pgadmin3/HISTORY
+++ b/database/pgadmin3/HISTORY
@@ -1,3 +1,6 @@
+2009-07-02 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 1.10.0
+
 2008-06-12 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 1.8.4
 
diff --git a/ftp/filezilla/DETAILS b/ftp/filezilla/DETAILS
index 5547c2b58b..fcb712d57d 100755
--- a/ftp/filezilla/DETAILS
+++ b/ftp/filezilla/DETAILS
@@ -1,8 +1,8 @@
            SPELL=filezilla
-         VERSION=3.2.6
+         VERSION=3.2.6.1
           SOURCE="FileZilla_${VERSION}_src.tar.bz2"
    SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:b38f6fdf1b2a689ac85bd26463ee7733e3f10ac5b502bec0bd2bc6245fc27727bce046f5f13315cc1e70cdbd768c69dc8c36aa08f16ed15e37740cf6612e3919
+     SOURCE_HASH=sha512:0d467f1a9b2c93568d8affbe2f3fda44fdf3ebd485c249ffa1f6df67b7bd31704414bae20d58aab7a342408226f7697f06010394f961fc43a4676cf904fc610d
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://filezilla-project.org/"
       LICENSE[0]=GPL
diff --git a/ftp/filezilla/HISTORY b/ftp/filezilla/HISTORY
index 8678b9a4d8..72d5540eea 100644
--- a/ftp/filezilla/HISTORY
+++ b/ftp/filezilla/HISTORY
@@ -1,3 +1,6 @@
+2009-07-02 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 3.2.6.1
+
 2009-06-28 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 3.2.6
 
diff --git a/gnome2-apps/eog2/DETAILS b/gnome2-apps/eog2/DETAILS
index f1b5cdedd0..8393c32733 100755
--- a/gnome2-apps/eog2/DETAILS
+++ b/gnome2-apps/eog2/DETAILS
@@ -1,5 +1,5 @@
            SPELL=eog2
-         VERSION=2.26.2
+         VERSION=2.26.3
 	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=eog-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/eog-$VERSION
diff --git a/gnome2-apps/eog2/HISTORY b/gnome2-apps/eog2/HISTORY
index 46309f1a20..ebb13908cb 100644
--- a/gnome2-apps/eog2/HISTORY
+++ b/gnome2-apps/eog2/HISTORY
@@ -1,3 +1,6 @@
+2009-07-02 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 2.26.3
+
 2009-06-11 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 2.26.2, fixed WEB_SITE
 
diff --git a/gnome2-apps/eog2/eog-2.26.2.tar.bz2.sig b/gnome2-apps/eog2/eog-2.26.2.tar.bz2.sig
deleted file mode 100644
index 97c9936bf4..0000000000
--- a/gnome2-apps/eog2/eog-2.26.2.tar.bz2.sig
+++ /dev/null
diff --git a/gnome2-apps/eog2/eog-2.26.3.tar.bz2.sig b/gnome2-apps/eog2/eog-2.26.3.tar.bz2.sig
new file mode 100644
index 0000000000..467284ab30
--- /dev/null
+++ b/gnome2-apps/eog2/eog-2.26.3.tar.bz2.sig
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 1bc17d330f..56508d7bb2 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
            SPELL=imagemagick
-         VERSION=6.5.4-0
+         VERSION=6.5.4-2
   SECURITY_PATCH=1
           SOURCE=ImageMagick-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index bb63092953..1ec2fd9e63 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2009-07-02 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated to version 6.5.4-2
+
 2009-06-30 George Sherwood <gsherwood@sourcemage.org>
 	* DETAILS: Updated to version 6.5.4-0
 
diff --git a/graphics/imagemagick/ImageMagick-6.5.4-0.tar.bz2.sig b/graphics/imagemagick/ImageMagick-6.5.4-0.tar.bz2.sig
deleted file mode 100644
index 6fb07d58d6..0000000000
--- a/graphics/imagemagick/ImageMagick-6.5.4-0.tar.bz2.sig
+++ /dev/null
diff --git a/graphics/imagemagick/ImageMagick-6.5.4-2.tar.bz2.sig b/graphics/imagemagick/ImageMagick-6.5.4-2.tar.bz2.sig
new file mode 100644
index 0000000000..2a91cde74b
--- /dev/null
+++ b/graphics/imagemagick/ImageMagick-6.5.4-2.tar.bz2.sig