[SM-Commit] GIT changes to devel-gcc grimoire by Eric Sandall (fc89c023abdcbe82c446bf72d0c3c67258a4858d)

Eric Sandall scm at sourcemage.org
Sat May 8 23:08:51 EDT 2010


GIT changes to devel-gcc grimoire by Eric Sandall <sandalle at sourcemage.org>:

 ChangeLog                                                                  |   10 
 audio-libs/libmpdclient/DETAILS                                            |    8 
 audio-libs/libmpdclient/HISTORY                                            |    3 
 audio-players/banshee/DEPENDS                                              |    1 
 audio-players/banshee/DETAILS                                              |    2 
 audio-players/banshee/HISTORY                                              |    4 
 audio-players/banshee/banshee-1-1.6.0.tar.bz2.sig                          |    0 
 audio-players/banshee/banshee-1-1.6.1.tar.bz2.sig                          |binary
 audio-players/gimmix/DETAILS                                               |    4 
 audio-players/gimmix/HISTORY                                               |    3 
 crypto/libgpg-error/DETAILS                                                |    2 
 crypto/libgpg-error/HISTORY                                                |    3 
 dev/null                                                                   |binary
 devel/gccxml/BUILD                                                         |    1 
 devel/gccxml/DEPENDS                                                       |    1 
 devel/gccxml/DETAILS                                                       |   32 +
 devel/gccxml/HISTORY                                                       |    3 
 devel/gccxml/PREPARE                                                       |    1 
 devel/qdevelop/DETAILS                                                     |   22 -
 devel/qdevelop/HISTORY                                                     |    5 
 disk/xfsprogs/DETAILS                                                      |    2 
 disk/xfsprogs/HISTORY                                                      |    3 
 disk/xfsprogs/xfsprogs-3.1.1.tar.gz.sig                                    |    0 
 disk/xfsprogs/xfsprogs-3.1.2.tar.gz.sig                                    |binary
 editors/gawk/DETAILS                                                       |    6 
 editors/gawk/HISTORY                                                       |    3 
 gnome2-apps/gcalctool/DETAILS                                              |    2 
 gnome2-apps/gcalctool/HISTORY                                              |    3 
 gnome2-apps/gcalctool/gcalctool-5.30.0.tar.gz.sig                          |    0 
 gnome2-apps/gcalctool/gcalctool-5.30.1.tar.gz.sig                          |binary
 gnome2-libs/gnome-control-center/DETAILS                                   |    2 
 gnome2-libs/gnome-control-center/HISTORY                                   |    3 
 gnome2-libs/gnome-control-center/gnome-control-center-2.30.0.tar.bz2.sig   |    0 
 gnome2-libs/gnome-control-center/gnome-control-center-2.30.1.tar.bz2.sig   |binary
 gnome2-libs/gnome-keyring/DETAILS                                          |    1 
 gnome2-libs/gnome-keyring/HISTORY                                          |    6 
 gnome2-libs/gnome-keyring/PRE_BUILD                                        |    4 
 gnome2-libs/gnome-keyring/bug610715.patch                                  |   66 +++
 gnome2-libs/gnome-settings-daemon/DETAILS                                  |    2 
 gnome2-libs/gnome-settings-daemon/HISTORY                                  |    3 
 gnome2-libs/gnome-settings-daemon/gnome-settings-daemon-2.30.0.tar.bz2.sig |    0 
 gnome2-libs/gnome-settings-daemon/gnome-settings-daemon-2.30.1.tar.bz2.sig |binary
 gnome2-libs/nautilus2/DETAILS                                              |    2 
 gnome2-libs/nautilus2/HISTORY                                              |    3 
 gnome2-libs/nautilus2/nautilus-2.30.0.tar.bz2.sig                          |    0 
 gnome2-libs/nautilus2/nautilus-2.30.1.tar.bz2.sig                          |binary
 gnome2-libs/tracker/DETAILS                                                |   10 
 gnome2-libs/tracker/HISTORY                                                |    6 
 gnome2-libs/tracker/tracker-0.8.4.tar.bz2.sig                              |    0 
 gnome2-libs/tracker/tracker-0.8.5.tar.bz2.sig                              |binary
 graphics/imagemagick/DETAILS                                               |    4 
 graphics/imagemagick/HISTORY                                               |    3 
 http/squid/DETAILS                                                         |    4 
 http/squid/HISTORY                                                         |    3 
 http/webkitgtk/HISTORY                                                     |    3 
 http/webkitgtk/PRE_BUILD                                                   |    2 
 libs/libgdiplus/DETAILS                                                    |    2 
 libs/libgdiplus/HISTORY                                                    |    3 
 libs/libgdiplus/libgdiplus-2.6.2.tar.bz2.sig                               |    0 
 libs/libgdiplus/libgdiplus-2.6.4.tar.bz2.sig                               |binary
 lua-forge/luafilesystem/DETAILS                                            |    6 
 lua-forge/luafilesystem/HISTORY                                            |    3 
 mail/fetchmail/DETAILS                                                     |    4 
 mail/fetchmail/HISTORY                                                     |    3 
 php-pear/php-memcached/DETAILS                                             |    4 
 php-pear/php-memcached/HISTORY                                             |    3 
 printer/ghostscript/DETAILS                                                |    1 
 printer/ghostscript/HISTORY                                                |    5 
 printer/ghostscript/PRE_BUILD                                              |    3 
 printer/ghostscript/ghostscript.patch                                      |   78 ++++
 printer/system-config-printer/DETAILS                                      |    4 
 printer/system-config-printer/HISTORY                                      |    3 
 python-pypi/couchdb-python/CouchDB-0.7.tar.gz.sig                          |binary
 python-pypi/couchdb-python/DEPENDS                                         |    3 
 python-pypi/couchdb-python/DETAILS                                         |   32 +
 python-pypi/couchdb-python/HISTORY                                         |    3 
 python-pypi/desktopcouch/DEPENDS                                           |    6 
 python-pypi/desktopcouch/DETAILS                                           |    1 
 python-pypi/desktopcouch/HISTORY                                           |    6 
 python-pypi/desktopcouch/PRE_BUILD                                         |    6 
 python-pypi/desktopcouch/bug566073.patch                                   |   24 +
 python-pypi/desktopcouch/oauth2.patch                                      |   21 +
 python-pypi/pygccxml/DEPENDS                                               |    3 
 python-pypi/pygccxml/DETAILS                                               |   16 
 python-pypi/pygccxml/HISTORY                                               |    3 
 python-pypi/python-oauth2/DEPENDS                                          |    2 
 python-pypi/python-oauth2/DETAILS                                          |   27 +
 python-pypi/python-oauth2/HISTORY                                          |    7 
 python-pypi/python-oauth2/python-oauth2-1.1.3-0-g9962d31.tar.gz.sig        |binary
 ruby-raa/ruby-1.9/DETAILS                                                  |    4 
 ruby-raa/ruby-1.9/HISTORY                                                  |    3 
 utils/bluez/DETAILS                                                        |    2 
 utils/bluez/HISTORY                                                        |    3 
 x11-libs/wine/CONFIGURE                                                    |    4 
 x11-libs/wine/DETAILS                                                      |    2 
 x11-libs/wine/HISTORY                                                      |   10 
 x11-libs/wine/PRE_BUILD                                                    |    6 
 x11-libs/wine/sc2-login.diff                                               |  169 ++++++++++
 xorg-extras/xterm/DETAILS                                                  |    2 
 xorg-extras/xterm/HISTORY                                                  |    2 
 100 files changed, 683 insertions(+), 57 deletions(-)

New commits:
commit 72893eb628ad3221ec21a53013c8760db0e2583f
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    nautilus2 2.30.1

commit 70dfb9743f5d4ccb8c3db6dee98f653c614918c7
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    gnome-control-center 2.30.1

commit 41c42c5831ba2e2227f5939e990c33cf4a6e4459
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    gnome-settings-daemon 2.30.1

commit a3a424f8c92bfe86c003a0242e74e4137141ff3d
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    gcalctool 5.30.1

commit ccc74c980f7cd778e1c845d9d6729a0bd45a3246
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    bluez 4.64

commit 42bfc3d484f041ae1452e883f05d09faf82f9d00
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    banshee 1-1.6.1

commit ab105bf6dd3c2777d2343fe441222e3a88b3b28a
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    libgdiplus 2.6.4

commit 2cc23d1b17d18d047615bce50a56f8efddce445d
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    system-config-printer 1.2.2

commit 806816b3715de8137e3c0a8d64139544a6dfbbb1
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    xorg-extras/xterm: version 258

commit 075ddd051c52bfeca39c277d2fdcb2a0933ca2ad
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    qdevelop: => v0.28

commit 309116d79ba06bd1f5563e24ce6fe839d354ea26
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    ghostscript: Added upstream patch to fix Bug #15706

commit fc115ed9a2b94c9fb94ce2f859b0fd06e1d5059d
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    rub-1.9: Updated to version 1.9.1-p378

commit 56268900e13ff6bbe5a32131348451344d8c4ae2
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    squid: Updated to version 3.1.3

commit 9a29992739bdf8edaee4f6a760e07a631691f382
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    imagemagick: Updated to version 6.6.1-5

commit e3dfe50b470d4fa372e082439ac424605175bd21
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    luafilesystem: => 1.5.0

commit 08d27cc1f9d7e05162b50ff4e1c23e80bee21fb4
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xfsprogs: => 3.1.2

commit b950102f6cac0826bc3ceff8d4cac7001275b263
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    gawk: => 3.1.8

commit 652835474d066212bcc44c3245ce25839a06330e
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    php-memcached: => 1.0.2

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

    wine: Updated to 1.1.44

commit 97be2e9664c4e86a1ce6f5aed05f0b643bf57439
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    tracker: Fix long description

commit 255d557d72e89e2c05bb96f8f17a123e1429a660
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    webkitgtk: fixed icu version for the patch

commit b050087b4a00fdd3203b8b75e442a6e71123fadb
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    gimmix: => 0.5.7.1

commit 51cef7729f300853a4a6581d209ed721b72c8b2a
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    pygccxml: new spell, Python module to read GCCXML output

commit e835c16e82da9c57dbad093608c8633a4455d9d5
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    gccxml: new spell, XML output for GCC

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

    desktopcouch: Applying patch to use up-to-date oauth2
    PATCHLEVEL++
    Runtime depends on python-oauth2
    
    python-oauth (as seen http://oauth.googlecode.com/svn/code/python/)
    hasn't seen a real update since around 2007, much less a real release
    (just a SVN checkout).
    
    http://oauth.net/code/ also says:
    Joe Stump (SimpleGeo) maintains the python-oauth2 library on GitHub, and
    is considered the most up-to-date and unit-tested implementation of
    OAuth for Python 2.4+.

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

    python-oauth2: Added an open protocol to allow API authentication

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

    ChangeLog: Fix date for entry

commit da40c54083220d3df885696ee506977f0903f259
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    libgpg-error 1.8

commit a027ea1243a92cbdf1b243f990b3b9a7ab7f9ad1
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    fetchmail 6.3.17, SECURITY_PATCH=7, fetchmail-SA-2010-02.txt

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

    desktopcouch: Fix couchdb-python API change
    https://bugs.launchpad.net/desktopcouch/+bug/566073

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

    couchdb-python: couchdb-python: Added a Python library for working with
    CouchDB

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

    gnome-keyring: Fix GNOME Bug #610715
    Configures gnome-keyring to start for all DEs, not just GNOME or LXDE
    PATCHLEVEL++

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

    Revert "gnome-keyring: Fix GNOME Bug #525434"
    
    This reverts commit 39ac6cfc0e8a2f797cd04783bdd86e9dbeb46d3e.
    
    Refers to the wrong bug# (that's the
    https://bugs.launchpad.net/ubuntu/+source/gnome-keyring/+bug/525434 bug)

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

    gnome-keyring: Fix GNOME Bug #525434
    Configures gnome-keyring to start for all DEs, not just GNOME or LXDE

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

    wine: Optionally apply StarCraft II login bug patch
    See:
    	http://appdb.winehq.org/objectManager.php?sClass=version&iId=19376
    	http://www.winehq.org/pipermail/wine-patches/2010-March/085817.html

commit aaf2e0415f465d7ce6f48e8175583ab52cc0f024
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    tracker 0.8.5

commit 85441ceb9979d9c7cb9eadb7f0425cba4ad73913
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    libmpdclient: => 2.2

diff --git a/ChangeLog b/ChangeLog
index d36ef8f..2036c95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-05-07 Ismael Luceno <ismael at sourcemage.org>
+	* devel/gccxml: new spell, XML output for GCC
+	* python-pypi/pygccxml: new spell, Python module to read GCCXML output
+
+2010-05-07 Eric Sandall <sandalle at sourcemage.org>
+	* python-pypi/couchdb-python: Added a Python library for working with
+	  CouchDB
+	* python-pypi/python-oauth2: Added an open protocol to allow API
+	  authentication
+
 2010-05-06 Vlad Glagolev <stealth at sourcemage.org>
 	* audio-libs/opencore-amr: new spell, OpenCORE libraries for AMR-NB and
 	  AMR-WB [en|de]coding
diff --git a/audio-libs/libmpdclient/DETAILS b/audio-libs/libmpdclient/DETAILS
index d1bdc27..ff7f9fe 100755
--- a/audio-libs/libmpdclient/DETAILS
+++ b/audio-libs/libmpdclient/DETAILS
@@ -1,13 +1,13 @@
            SPELL=libmpdclient
-         VERSION=2.1
+         VERSION=2.2
           SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/musicpd/$SOURCE
-     SOURCE_HASH=sha512:1dcfdd055e4897e2be4d0e8ff8680952ee8de94a1dee23615941dab230d8bdb2a995836a9d4d1f91db3912146b892cadaeb7a9102df574d3cfd4bcecd57812fd
+     SOURCE_HASH=sha512:cb0ce203bd265ff866690906f77ea2a8572ef45c2ee6a6d7d8243ad07cfc1c926969c3933a0d89b1d5a917b49bd02b9904c55f9f65a4663cade654eb58377414
         WEB_SITE=http://mpd.wikia.com/wiki/ClientLib:libmpdclient
          ENTERED=20091231
       LICENSE[0]=GPL
-           SHORT="a library for interfacing Music Player Daemon (MPD)"
+           SHORT="library for interfacing Music Player Daemon (MPD)"
 cat << EOF
 This is a library for interfacing Music Player Daemon (MPD).
 EOF
diff --git a/audio-libs/libmpdclient/HISTORY b/audio-libs/libmpdclient/HISTORY
index 69e1ea2..426ef58 100644
--- a/audio-libs/libmpdclient/HISTORY
+++ b/audio-libs/libmpdclient/HISTORY
@@ -1,2 +1,5 @@
+2010-05-07 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 2.2
+
 2009-12-31 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: created this spell, version 2.1
diff --git a/audio-players/banshee/DEPENDS b/audio-players/banshee/DEPENDS
index f0dc32d..87357af 100755
--- a/audio-players/banshee/DEPENDS
+++ b/audio-players/banshee/DEPENDS
@@ -7,7 +7,6 @@ depends hal                                       &&
 depends dbus-mono                                 &&
 depends libmusicbrainz                            &&
 depends libmtp                                    &&
-depends nautilus-cd-burner                        &&
 depends sqlite                                    &&
 depends gtk-sharp-2                               &&
 depends gstreamer                                 &&
diff --git a/audio-players/banshee/DETAILS b/audio-players/banshee/DETAILS
index 49ee80b..9049d19 100755
--- a/audio-players/banshee/DETAILS
+++ b/audio-players/banshee/DETAILS
@@ -1,5 +1,5 @@
            SPELL=banshee
-         VERSION=1-1.6.0
+         VERSION=1-1.6.1
           SOURCE=${SPELL}-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
       SOURCE_URL=http://download.banshee-project.org/banshee/$SOURCE
diff --git a/audio-players/banshee/HISTORY b/audio-players/banshee/HISTORY
index 15527e5..a02d47e 100644
--- a/audio-players/banshee/HISTORY
+++ b/audio-players/banshee/HISTORY
@@ -1,3 +1,7 @@
+2010-05-08 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1-1.6.1
+	* DEPENDS: removed deprecated nautilus-cd-burner
+
 2010-04-01 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1-1.6.0
 
diff --git a/audio-players/banshee/banshee-1-1.6.0.tar.bz2.sig b/audio-players/banshee/banshee-1-1.6.0.tar.bz2.sig
deleted file mode 100644
index dc5f152..0000000
Binary files a/audio-players/banshee/banshee-1-1.6.0.tar.bz2.sig and /dev/null differ
diff --git a/audio-players/banshee/banshee-1-1.6.1.tar.bz2.sig b/audio-players/banshee/banshee-1-1.6.1.tar.bz2.sig
new file mode 100644
index 0000000..c299c3d
Binary files /dev/null and b/audio-players/banshee/banshee-1-1.6.1.tar.bz2.sig differ
diff --git a/audio-players/gimmix/DETAILS b/audio-players/gimmix/DETAILS
index 75b84e1..94ee239 100755
--- a/audio-players/gimmix/DETAILS
+++ b/audio-players/gimmix/DETAILS
@@ -1,8 +1,8 @@
            SPELL=gimmix
-         VERSION=0.4.3
+         VERSION=0.5.7.1
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://download.berlios.de/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:270f7d0d722c7ff2d6b6c5e75a71d870e4ea377d20af58b8e1f67f7dc04b968e5189ccbd1316052558449978a6789b19b91c9f37d8bf609f8fff0ddf6a1276f1
+     SOURCE_HASH=sha512:03187d423afc97e9eec014603518a35795ac3d240e68c888a39c97a790be1cf5a838cd70d71df2ee455e5f437bc74689e5fd2cf3695e0e1d805fde60d9b0e26b
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://gimmix.berlios.de/
       LICENSE[0]=GPL
diff --git a/audio-players/gimmix/HISTORY b/audio-players/gimmix/HISTORY
index ad8e742..885455b 100644
--- a/audio-players/gimmix/HISTORY
+++ b/audio-players/gimmix/HISTORY
@@ -1,2 +1,5 @@
+2010-05-07 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 0.5.7.1
+
 2008-04-13 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS, DETAILS: spell created
diff --git a/crypto/libgpg-error/DETAILS b/crypto/libgpg-error/DETAILS
index a4e2bf1..1ac02df 100755
--- a/crypto/libgpg-error/DETAILS
+++ b/crypto/libgpg-error/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libgpg-error
-         VERSION=1.7
+         VERSION=1.8
 
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/libgpg-error/$SOURCE
diff --git a/crypto/libgpg-error/HISTORY b/crypto/libgpg-error/HISTORY
index a95c472..10acd84 100644
--- a/crypto/libgpg-error/HISTORY
+++ b/crypto/libgpg-error/HISTORY
@@ -1,3 +1,6 @@
+2010-05-07 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.8
+
 2008-11-28 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.7
 
diff --git a/devel/gccxml/BUILD b/devel/gccxml/BUILD
new file mode 100755
index 0000000..e013b8d
--- /dev/null
+++ b/devel/gccxml/BUILD
@@ -0,0 +1 @@
+cmake_build
diff --git a/devel/gccxml/DEPENDS b/devel/gccxml/DEPENDS
new file mode 100755
index 0000000..f36acc9
--- /dev/null
+++ b/devel/gccxml/DEPENDS
@@ -0,0 +1 @@
+depends cmake 
diff --git a/devel/gccxml/DETAILS b/devel/gccxml/DETAILS
new file mode 100755
index 0000000..599376e
--- /dev/null
+++ b/devel/gccxml/DETAILS
@@ -0,0 +1,32 @@
+           SPELL=gccxml
+if [[ "$GCCXML_AUTOUPDATE" == y ]]; then
+         VERSION=$(date +%Y%m%d)
+else
+         VERSION=cvs
+fi
+          SOURCE=$SPELL-cvs.tar.bz2
+   SOURCE_URL[0]=cvs://:pserver:anoncvs@www.gccxml.org:/cvsroot/GCC_XML:${SPELL}
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+   SOURCE_IGNORE=volatile
+  FORCE_DOWNLOAD=on
+        WEB_SITE="http://www.gccxml.org/"
+      LICENSE[0]=BSD
+         ENTERED=20100507
+           SHORT="XML output for GCC"
+cat << EOF
+Development tools that work with programming languages benefit from their
+ability to understand the code with which they work at a level comparable
+to a compiler.
+
+C++ has become a popular and powerful language, but parsing it is a very
+challenging problem. This has discouraged the development of tools meant to
+work directly with the language.
+
+There is one open-source C++ parser, the C++ front-end to GCC, which is
+currently able to deal with the language in its entirety. The purpose of
+the GCC-XML extension is to generate an XML description of a C++ program
+from GCC's internal representation.
+
+Since XML is easy to parse, other development tools will be able to work
+with C++ programs without the burden of a complicated C++ parser.
+EOF
diff --git a/devel/gccxml/HISTORY b/devel/gccxml/HISTORY
new file mode 100644
index 0000000..078501e
--- /dev/null
+++ b/devel/gccxml/HISTORY
@@ -0,0 +1,3 @@
+2010-05-07 Ismael Luceno <ismael at sourcemage.org>
+	* BUILD, DEPENDS, DETAILS: spell created
+
diff --git a/devel/gccxml/PREPARE b/devel/gccxml/PREPARE
new file mode 100755
index 0000000..94dfeb6
--- /dev/null
+++ b/devel/gccxml/PREPARE
@@ -0,0 +1 @@
+config_query GCCXML_AUTOUPDATE "Automatically update on every system update?" n
diff --git a/devel/qdevelop/DETAILS b/devel/qdevelop/DETAILS
index 2f3f41b..0a9ec50 100755
--- a/devel/qdevelop/DETAILS
+++ b/devel/qdevelop/DETAILS
@@ -1,17 +1,17 @@
            SPELL=qdevelop
-if [[ $QD_VER == stable ]];then
-         VERSION=0.27.4
-     SOURCE_HASH=sha512:fb44f06e82d20b354a7e01fe3a0776cd954222597b3ff41a9679165b249a1172da745be8a00c4f4726b1a0eacf14b4001b85a4f44210da866b316e2b9f4d04ff
+        WEB_SITE=http://biord-software.org
+#if [[ $QD_VER == stable ]];then
+         VERSION=v0.28
+     SOURCE_HASH=sha512:daff4dc8b164eebcca1fce8ed32ef743ce0f34ac211a3cbaa292100da2179c8cbb8f44439f2130da79697de289a5a996ee0727908446299db3ad3d91e246ed5d
           SOURCE=$SPELL-$VERSION.tar.gz
-   SOURCE_URL[0]=$WEB_SITE/public/release/$SOURCE
-else
-         VERSION=0.28.0~svn445-src
-     SOURCE_HASH=sha512:f3220b7241c82f641fc53b32c2324c76cdbf1ce85c7b0df0a23b68795e0410e5e594a0e566f87df15a0dd74336dc98765bc7d22758ec701c1099377e6994d2a9
-          SOURCE=$SPELL-$VERSION.tar.bz2
-   SOURCE_URL[0]=http://qdevelop.googlecode.com/files/$SOURCE
-fi
+   SOURCE_URL[0]=$WEB_SITE/downloads/$SOURCE
+#else
+#         VERSION=
+#     SOURCE_HASH=sha512:
+#          SOURCE=$SPELL-$VERSION.tar.bz2
+#   SOURCE_URL[0]=http://qdevelop.googlecode.com/files/$SOURCE
+#fi
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=http://qdevelop.org/
       LICENSE[0]=GPL
          ENTERED=20090227
         KEYWORDS="qt4 devel"
diff --git a/devel/qdevelop/HISTORY b/devel/qdevelop/HISTORY
index 503e9b0..299e421 100644
--- a/devel/qdevelop/HISTORY
+++ b/devel/qdevelop/HISTORY
@@ -1,3 +1,8 @@
+2010-05-08 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.28 (stable)
+	  new website & url
+	  disable obsolete unstable version
+
 2009-03-29 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.28.0~svn445 (unstable)
 	* PREPARE: added, support unstable version
diff --git a/disk/xfsprogs/DETAILS b/disk/xfsprogs/DETAILS
index 586f536..75d356f 100755
--- a/disk/xfsprogs/DETAILS
+++ b/disk/xfsprogs/DETAILS
@@ -1,5 +1,5 @@
            SPELL=xfsprogs
-         VERSION=3.1.1
+         VERSION=3.1.2
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=ftp://oss.sgi.com/projects/xfs/cmd_tars/$SOURCE
diff --git a/disk/xfsprogs/HISTORY b/disk/xfsprogs/HISTORY
index 45a7bd1..e5c00a2 100644
--- a/disk/xfsprogs/HISTORY
+++ b/disk/xfsprogs/HISTORY
@@ -1,3 +1,6 @@
+2010-05-08 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 3.1.2
+
 2010-01-30 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 3.1.1
 
diff --git a/disk/xfsprogs/xfsprogs-3.1.1.tar.gz.sig b/disk/xfsprogs/xfsprogs-3.1.1.tar.gz.sig
deleted file mode 100644
index 90e81ed..0000000
Binary files a/disk/xfsprogs/xfsprogs-3.1.1.tar.gz.sig and /dev/null differ
diff --git a/disk/xfsprogs/xfsprogs-3.1.2.tar.gz.sig b/disk/xfsprogs/xfsprogs-3.1.2.tar.gz.sig
new file mode 100644
index 0000000..6552775
Binary files /dev/null and b/disk/xfsprogs/xfsprogs-3.1.2.tar.gz.sig differ
diff --git a/editors/gawk/DETAILS b/editors/gawk/DETAILS
index 59b7be7..18386f4 100755
--- a/editors/gawk/DETAILS
+++ b/editors/gawk/DETAILS
@@ -1,8 +1,8 @@
            SPELL=gawk
-         VERSION=3.1.7
+         VERSION=3.1.8
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
   SOURCE2_URL[0]=$GNU_URL/$SPELL/$SOURCE2
       SOURCE_GPG=gnu.gpg:$SOURCE2
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
       LICENSE[0]=GPL
          ENTERED=20010922
         KEYWORDS="editors"
-           SHORT="gawk is a free version of awk."
+           SHORT="free version of awk"
 cat << EOF
 gawk - Free version of awk
 gawk performs simple data reformatting tasks, such as making changes in
diff --git a/editors/gawk/HISTORY b/editors/gawk/HISTORY
index 6fcc20d..50a5319 100644
--- a/editors/gawk/HISTORY
+++ b/editors/gawk/HISTORY
@@ -1,3 +1,6 @@
+2010-05-08 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 3.1.8; quoting paths
+
 2009-08-06 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 3.1.7
 
diff --git a/gnome2-apps/gcalctool/DETAILS b/gnome2-apps/gcalctool/DETAILS
index 1e1df98..d89f6a5 100755
--- a/gnome2-apps/gcalctool/DETAILS
+++ b/gnome2-apps/gcalctool/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gcalctool
-         VERSION=5.30.0
+         VERSION=5.30.1
           BRANCH=`echo $VERSION | cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/gcalctool/HISTORY b/gnome2-apps/gcalctool/HISTORY
index 05a0198..e640666 100644
--- a/gnome2-apps/gcalctool/HISTORY
+++ b/gnome2-apps/gcalctool/HISTORY
@@ -1,3 +1,6 @@
+2010-05-09 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 5.30.1
+
 2010-03-30 Vasil Yonkov <spirtbrat at sourcemage.org>
 	* DETAILS: updated spell to 5.30.0
 
diff --git a/gnome2-apps/gcalctool/gcalctool-5.30.0.tar.gz.sig b/gnome2-apps/gcalctool/gcalctool-5.30.0.tar.gz.sig
deleted file mode 100644
index a064739..0000000
Binary files a/gnome2-apps/gcalctool/gcalctool-5.30.0.tar.gz.sig and /dev/null differ
diff --git a/gnome2-apps/gcalctool/gcalctool-5.30.1.tar.gz.sig b/gnome2-apps/gcalctool/gcalctool-5.30.1.tar.gz.sig
new file mode 100644
index 0000000..33477d0
Binary files /dev/null and b/gnome2-apps/gcalctool/gcalctool-5.30.1.tar.gz.sig differ
diff --git a/gnome2-libs/gnome-control-center/DETAILS b/gnome2-libs/gnome-control-center/DETAILS
index a3b9436..b4ccf9f 100755
--- a/gnome2-libs/gnome-control-center/DETAILS
+++ b/gnome2-libs/gnome-control-center/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gnome-control-center
-         VERSION=2.30.0
+         VERSION=2.30.1
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-control-center/HISTORY b/gnome2-libs/gnome-control-center/HISTORY
index 4edb928..af1ad6a 100644
--- a/gnome2-libs/gnome-control-center/HISTORY
+++ b/gnome2-libs/gnome-control-center/HISTORY
@@ -1,3 +1,6 @@
+2010-05-09 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.30.1
+
 2010-04-06 Vasil Yonkov <spirtbrat at sourcemage.org>
 	* DEPENDS: removed eel2, gnome-panel, added libxext,
 	  need libcanberra with GTK
diff --git a/gnome2-libs/gnome-control-center/gnome-control-center-2.30.0.tar.bz2.sig b/gnome2-libs/gnome-control-center/gnome-control-center-2.30.0.tar.bz2.sig
deleted file mode 100644
index 1094201..0000000
Binary files a/gnome2-libs/gnome-control-center/gnome-control-center-2.30.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/gnome-control-center/gnome-control-center-2.30.1.tar.bz2.sig b/gnome2-libs/gnome-control-center/gnome-control-center-2.30.1.tar.bz2.sig
new file mode 100644
index 0000000..ae55613
Binary files /dev/null and b/gnome2-libs/gnome-control-center/gnome-control-center-2.30.1.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-keyring/DETAILS b/gnome2-libs/gnome-keyring/DETAILS
index 4731d27..9f0cacb 100755
--- a/gnome2-libs/gnome-keyring/DETAILS
+++ b/gnome2-libs/gnome-keyring/DETAILS
@@ -6,6 +6,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
       SOURCE_GPG=gurus.gpg:$SOURCE.sig
       LICENSE[0]=LGPL
+      PATCHLEVEL=1
         WEB_SITE=http://live.gnome.org/GnomeKeyring
          ENTERED=20020505
         KEYWORDS="gnome2 libs"
diff --git a/gnome2-libs/gnome-keyring/HISTORY b/gnome2-libs/gnome-keyring/HISTORY
index da0b474..acd03ee 100644
--- a/gnome2-libs/gnome-keyring/HISTORY
+++ b/gnome2-libs/gnome-keyring/HISTORY
@@ -1,3 +1,9 @@
+2010-05-06 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: PATCHLEVEL++
+	* PRE_BUILD: Apply bug610715.patch
+	* bug610715.patch: Fix GNOME Bug #610715
+	  Configures gnome-keyring to start for all DEs, not just GNOME or LXDE
+
 2010-05-03 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.30.1
 
diff --git a/gnome2-libs/gnome-keyring/PRE_BUILD b/gnome2-libs/gnome-keyring/PRE_BUILD
new file mode 100755
index 0000000..6e35c28
--- /dev/null
+++ b/gnome2-libs/gnome-keyring/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+message "${MESSAGE_COLOR}Apply patch for GNOME Bug #610715...${DEFAULT_COLOR}" &&
+patch -p1 < $SPELL_DIRECTORY/bug610715.patch
diff --git a/gnome2-libs/gnome-keyring/bug610715.patch b/gnome2-libs/gnome-keyring/bug610715.patch
new file mode 100644
index 0000000..c09fffc
--- /dev/null
+++ b/gnome2-libs/gnome-keyring/bug610715.patch
@@ -0,0 +1,66 @@
+diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-pkcs11.desktop.in gnome-keyring-2.30.1/daemon/gnome-keyring-pkcs11.desktop.in
+--- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-pkcs11.desktop.in	2010-05-07 00:27:39.792857884 -0700
++++ gnome-keyring-2.30.1/daemon/gnome-keyring-pkcs11.desktop.in	2010-05-07 00:32:08.503107570 -0700
+@@ -3,7 +3,6 @@
+ _Name=Certificate and Key Storage
+ _Comment=GNOME Keyring: PKCS#11 Component
+ Exec= gnome-keyring-daemon --start --components=pkcs11
+-OnlyShowIn=GNOME;LXDE;
+ AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/pkcs11
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false
+diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-pkcs11.desktop.in.in gnome-keyring-2.30.1/daemon/gnome-keyring-pkcs11.desktop.in.in
+--- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-pkcs11.desktop.in.in	2010-05-07 00:27:39.791857675 -0700
++++ gnome-keyring-2.30.1/daemon/gnome-keyring-pkcs11.desktop.in.in	2010-05-07 00:32:10.361857745 -0700
+@@ -3,7 +3,6 @@
+ _Name=Certificate and Key Storage
+ _Comment=GNOME Keyring: PKCS#11 Component
+ Exec=@VALGRIND_RUN@ gnome-keyring-daemon --start --components=pkcs11
+-OnlyShowIn=GNOME;LXDE;
+ AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/pkcs11
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false
+diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-secrets.desktop.in gnome-keyring-2.30.1/daemon/gnome-keyring-secrets.desktop.in
+--- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-secrets.desktop.in	2010-05-07 00:27:39.792857884 -0700
++++ gnome-keyring-2.30.1/daemon/gnome-keyring-secrets.desktop.in	2010-05-07 00:27:52.119857815 -0700
+@@ -3,7 +3,6 @@
+ _Name=Secret Storage Service
+ _Comment=GNOME Keyring: Secret Service
+ Exec= gnome-keyring-daemon --start --components=secrets
+-OnlyShowIn=GNOME;LXDE;
+ AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/secrets
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false
+diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-secrets.desktop.in.in gnome-keyring-2.30.1/daemon/gnome-keyring-secrets.desktop.in.in
+--- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-secrets.desktop.in.in	2010-05-07 00:27:39.791857675 -0700
++++ gnome-keyring-2.30.1/daemon/gnome-keyring-secrets.desktop.in.in	2010-05-07 00:27:48.458857814 -0700
+@@ -3,7 +3,6 @@
+ _Name=Secret Storage Service
+ _Comment=GNOME Keyring: Secret Service
+ Exec=@VALGRIND_RUN@ gnome-keyring-daemon --start --components=secrets
+-OnlyShowIn=GNOME;LXDE;
+ AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/secrets
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false
+diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-ssh.desktop.in gnome-keyring-2.30.1/daemon/gnome-keyring-ssh.desktop.in
+--- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-ssh.desktop.in	2010-05-07 00:27:39.792857884 -0700
++++ gnome-keyring-2.30.1/daemon/gnome-keyring-ssh.desktop.in	2010-05-07 00:32:14.603857675 -0700
+@@ -3,7 +3,6 @@
+ _Name=SSH Key Agent
+ _Comment=GNOME Keyring: SSH Agent
+ Exec= gnome-keyring-daemon --start --components=ssh
+-OnlyShowIn=GNOME;LXDE;
+ AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/ssh
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false
+diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-ssh.desktop.in.in gnome-keyring-2.30.1/daemon/gnome-keyring-ssh.desktop.in.in
+--- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-ssh.desktop.in.in	2010-05-07 00:27:39.790857884 -0700
++++ gnome-keyring-2.30.1/daemon/gnome-keyring-ssh.desktop.in.in	2010-05-07 00:32:16.422857745 -0700
+@@ -3,7 +3,6 @@
+ _Name=SSH Key Agent
+ _Comment=GNOME Keyring: SSH Agent
+ Exec=@VALGRIND_RUN@ gnome-keyring-daemon --start --components=ssh
+-OnlyShowIn=GNOME;LXDE;
+ AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/ssh
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false
diff --git a/gnome2-libs/gnome-settings-daemon/DETAILS b/gnome2-libs/gnome-settings-daemon/DETAILS
index 776a3ad..4d68489 100755
--- a/gnome2-libs/gnome-settings-daemon/DETAILS
+++ b/gnome2-libs/gnome-settings-daemon/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gnome-settings-daemon
-         VERSION=2.30.0
+         VERSION=2.30.1
 	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-settings-daemon/HISTORY b/gnome2-libs/gnome-settings-daemon/HISTORY
index c6ad43a..d0674b8 100644
--- a/gnome2-libs/gnome-settings-daemon/HISTORY
+++ b/gnome2-libs/gnome-settings-daemon/HISTORY
@@ -1,3 +1,6 @@
+2010-05-09 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.30.1
+
 2010-03-30 Vasil Yonkov <spirtbrat at sourcemage.org>
 	* DETAILS: updated spell to 2.30.0
 
diff --git a/gnome2-libs/gnome-settings-daemon/gnome-settings-daemon-2.30.0.tar.bz2.sig b/gnome2-libs/gnome-settings-daemon/gnome-settings-daemon-2.30.0.tar.bz2.sig
deleted file mode 100644
index 41e746f..0000000
Binary files a/gnome2-libs/gnome-settings-daemon/gnome-settings-daemon-2.30.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/gnome-settings-daemon/gnome-settings-daemon-2.30.1.tar.bz2.sig b/gnome2-libs/gnome-settings-daemon/gnome-settings-daemon-2.30.1.tar.bz2.sig
new file mode 100644
index 0000000..66e39bc
Binary files /dev/null and b/gnome2-libs/gnome-settings-daemon/gnome-settings-daemon-2.30.1.tar.bz2.sig differ
diff --git a/gnome2-libs/nautilus2/DETAILS b/gnome2-libs/nautilus2/DETAILS
index 7578a24..2aae355 100755
--- a/gnome2-libs/nautilus2/DETAILS
+++ b/gnome2-libs/nautilus2/DETAILS
@@ -1,5 +1,5 @@
            SPELL=nautilus2
-         VERSION=2.30.0
+         VERSION=2.30.1
 	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=nautilus-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/nautilus-$VERSION
diff --git a/gnome2-libs/nautilus2/HISTORY b/gnome2-libs/nautilus2/HISTORY
index 3edaa48..ceb4c0a 100644
--- a/gnome2-libs/nautilus2/HISTORY
+++ b/gnome2-libs/nautilus2/HISTORY
@@ -1,3 +1,6 @@
+2010-05-09 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.30.1
+
 2010-04-12 Vasil Yonkov <spirtbrat at sourcemage.org>
 	* DEPENDS: added pango, glib2, libxml2, dbus-glib, intltool
 	  removed gnome-icon-theme, gnome-themes, beagle, tracker
diff --git a/gnome2-libs/nautilus2/nautilus-2.30.0.tar.bz2.sig b/gnome2-libs/nautilus2/nautilus-2.30.0.tar.bz2.sig
deleted file mode 100644
index 041998c..0000000
Binary files a/gnome2-libs/nautilus2/nautilus-2.30.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/nautilus2/nautilus-2.30.1.tar.bz2.sig b/gnome2-libs/nautilus2/nautilus-2.30.1.tar.bz2.sig
new file mode 100644
index 0000000..4bd453b
Binary files /dev/null and b/gnome2-libs/nautilus2/nautilus-2.30.1.tar.bz2.sig differ
diff --git a/gnome2-libs/tracker/DETAILS b/gnome2-libs/tracker/DETAILS
index efc6279..09d6076 100755
--- a/gnome2-libs/tracker/DETAILS
+++ b/gnome2-libs/tracker/DETAILS
@@ -2,7 +2,7 @@
 if [[ "$TRACKER_DEVEL" == "y" ]]; then
          VERSION=0.9.2
 else
-         VERSION=0.8.4
+         VERSION=0.8.5
 fi
           BRANCH=${VERSION:0:3}
           SOURCE=$SPELL-$VERSION.tar.bz2
@@ -18,9 +18,8 @@ cat << EOF
 Tracker is a powerful desktop-neutral first class object database, tag/metadata
 database, search tool and indexer.
 
-Tracker is also extremely fast and super efficient with your systems
-memory when
-compared with some other competing frameworks
+Tracker is also extremely fast and super efficient with your systems memory
+when compared with some other competing frameworks.
 
 It consists of a common object database that allows entities to have an almost
 infinte number of properties, metadata (both embedded/harvested as well as user
@@ -28,8 +27,7 @@ definable), a comprehensive database of keywords/tags and links to other
 entities.
 
 It provides additional features for file based objects including context
-linking
-and audit trails for a file object.
+linking and audit trails for a file object.
 
 It has the ability to index, store, harvest metadata. retrieve and search all
 types of files and other first class objects.
diff --git a/gnome2-libs/tracker/HISTORY b/gnome2-libs/tracker/HISTORY
index 4538e6d..6bcd005 100644
--- a/gnome2-libs/tracker/HISTORY
+++ b/gnome2-libs/tracker/HISTORY
@@ -1,3 +1,9 @@
+2010-05-07 Ismael Luceno <ismael at sourcemage.rog>
+	* DETAILS: Fixed long description
+
+2010-05-07 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.8.5
+
 2010-05-03 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.8.4
 
diff --git a/gnome2-libs/tracker/tracker-0.8.4.tar.bz2.sig b/gnome2-libs/tracker/tracker-0.8.4.tar.bz2.sig
deleted file mode 100644
index 3e76a0d..0000000
Binary files a/gnome2-libs/tracker/tracker-0.8.4.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/tracker/tracker-0.8.5.tar.bz2.sig b/gnome2-libs/tracker/tracker-0.8.5.tar.bz2.sig
new file mode 100644
index 0000000..8b5236f
Binary files /dev/null and b/gnome2-libs/tracker/tracker-0.8.5.tar.bz2.sig differ
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 062f3fd..ee6ecbf 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
            SPELL=imagemagick
-         VERSION=6.6.1-4
+         VERSION=6.6.1-5
   SECURITY_PATCH=1
           SOURCE=ImageMagick-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
    SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE
    SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE
 #     SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-     SOURCE_HASH=sha512:e6633009cb6d28576e7d9c9ad8d3714854ee66b94341785a1f12af85f7c7cbfd3f2edff5b75f66b1c7fc4e574b6d6754390b042b103e0166cd9d21fb70293dbd
+     SOURCE_HASH=sha512:784aa2c72519a0c65cbf17577f6ff2fc2bad90deeb89554d2e9d9bf835c2942a3c10c1b90c7c84d79ae8a81f733e15dab7448b675fb18ccf7dc4f4202ff5ee2c
           CCACHE="off"
         WEB_SITE=http://www.imagemagick.org/
          ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index a084385..e40a39a 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2010-05-08 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 6.6.1-5
+
 2010-04-23 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS: version 6.6.1-4
 	* DEPENDS: removed optional dependency on POSTSCRIPT-INTERPRETER
diff --git a/http/squid/DETAILS b/http/squid/DETAILS
index 291872f..d519989 100755
--- a/http/squid/DETAILS
+++ b/http/squid/DETAILS
@@ -1,12 +1,12 @@
            SPELL=squid
-         VERSION=3.1.1
+         VERSION=3.1.3
           SOURCE=$SPELL-$VERSION.tar.bz2
 #        SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
       SOURCE_URL=http://www.squid-cache.org/Versions/v${VERSION%%\.*}/${VERSION%\.*}/$SOURCE
 #    SOURCE2_URL=http://www.squid-cache.org/Versions/v${VERSION%%\.*}/${VERSION%\.*}/$SOURCE2
 #     SOURCE_GPG=squid.gpg:$SOURCE2
-     SOURCE_HASH=sha512:83fc3332ce9b1cfdad6d44c8b9561d0fd9079b56d66172c5119856b937c72ff39271be14e0a6e5bc954a906d50599b9befc7e5bb74e8d74fa489daf165c13326
+     SOURCE_HASH=sha512:44a36edcc84d523cdf0d564df9553a4701f8f8c7460111f45138becdddc0b8e5edcd3bbb43a79e08631823d0d1157a9135bbeb2aeb530f4e3360e5f5edfe7259
         WEB_SITE=http://www.squid-cache.org/
          ENTERED=20011214
   SECURITY_PATCH=1
diff --git a/http/squid/HISTORY b/http/squid/HISTORY
index e6935d2..70ffb84 100644
--- a/http/squid/HISTORY
+++ b/http/squid/HISTORY
@@ -1,3 +1,6 @@
+2010-05-08 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 3.1.3
+
 2010-04-03 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 3.1.1
 
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index d5e5e06..a40c9fd 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,6 @@
+2010-05-07 Arjan Bouter <abouter at sourcemage.org>
+	* PRE_BUILD: fixed icu-dev version patch
+
 2010-04-24 George Sherwood <gsherwood at sourcemage.org>
 	* DEPENDS: Added depends gir-repository if optional depends
 	  gobject-introspection
diff --git a/http/webkitgtk/PRE_BUILD b/http/webkitgtk/PRE_BUILD
index f7ec6ef..6c1afc9 100755
--- a/http/webkitgtk/PRE_BUILD
+++ b/http/webkitgtk/PRE_BUILD
@@ -1,5 +1,5 @@
 default_pre_build &&
 cd "${SOURCE_DIRECTORY}" &&
-if [ "$(installed_version icu)" == '4.4' ]; then
+if [ "$(installed_version icu)" = '4.4.1' ]; then
   patch -p1 < "${SCRIPT_DIRECTORY}/webkit-icu44.patch"
 fi
diff --git a/libs/libgdiplus/DETAILS b/libs/libgdiplus/DETAILS
index 66e78bb..6f7de63 100755
--- a/libs/libgdiplus/DETAILS
+++ b/libs/libgdiplus/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libgdiplus
-         VERSION=2.6.2
+         VERSION=2.6.4
       PATCHLEVEL=0
          BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/libs/libgdiplus/HISTORY b/libs/libgdiplus/HISTORY
index 5bb0d68..d2447fe 100644
--- a/libs/libgdiplus/HISTORY
+++ b/libs/libgdiplus/HISTORY
@@ -1,3 +1,6 @@
+2010-05-08 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.6.4
+
 2010-03-16 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.6.2
 
diff --git a/libs/libgdiplus/libgdiplus-2.6.2.tar.bz2.sig b/libs/libgdiplus/libgdiplus-2.6.2.tar.bz2.sig
deleted file mode 100644
index 480306c..0000000
Binary files a/libs/libgdiplus/libgdiplus-2.6.2.tar.bz2.sig and /dev/null differ
diff --git a/libs/libgdiplus/libgdiplus-2.6.4.tar.bz2.sig b/libs/libgdiplus/libgdiplus-2.6.4.tar.bz2.sig
new file mode 100644
index 0000000..5113c92
Binary files /dev/null and b/libs/libgdiplus/libgdiplus-2.6.4.tar.bz2.sig differ
diff --git a/lua-forge/luafilesystem/DETAILS b/lua-forge/luafilesystem/DETAILS
index bae19bf..4bbf5dd 100755
--- a/lua-forge/luafilesystem/DETAILS
+++ b/lua-forge/luafilesystem/DETAILS
@@ -1,8 +1,8 @@
            SPELL=luafilesystem
-         VERSION=1.4.2
+         VERSION=1.5.0
           SOURCE=$SPELL-$VERSION.tar.gz
-   SOURCE_URL[0]=http://luaforge.net/frs/download.php/3931/$SOURCE
-     SOURCE_HASH=sha512:a03ea5cb406bccd3a173fc465b536a8e922d4c1fc1b82f1a1661c656b789cdb4df106cd30e8f8aaeb77731a8ac4c728f1f7f46c546d22e3ccd22de9bc605f50a
+   SOURCE_URL[0]=http://github.com/downloads/keplerproject/$SPELL/$SOURCE
+     SOURCE_HASH=sha512:79e767be5b923424c2f3c0025e050b6a5b15550cf96d153072f817b0f94757032feeaa579e4d73cc009a5954d38a30079db1c1c15545a45e9f13c0c776080aac
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://www.keplerproject.org/luafilesystem/
       LICENSE[0]=MIT
diff --git a/lua-forge/luafilesystem/HISTORY b/lua-forge/luafilesystem/HISTORY
index 39f6893..47e0681 100644
--- a/lua-forge/luafilesystem/HISTORY
+++ b/lua-forge/luafilesystem/HISTORY
@@ -1,3 +1,6 @@
+2010-05-08 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.5.0; renewed source url
+
 2009-03-08 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.4.2
 
diff --git a/mail/fetchmail/DETAILS b/mail/fetchmail/DETAILS
index 9aa63ed..b7a61b6 100755
--- a/mail/fetchmail/DETAILS
+++ b/mail/fetchmail/DETAILS
@@ -1,6 +1,6 @@
            SPELL=fetchmail
-         VERSION=6.3.16
-  SECURITY_PATCH=6
+         VERSION=6.3.17
+  SECURITY_PATCH=7
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.asc
   SOURCE2_IGNORE=signature
diff --git a/mail/fetchmail/HISTORY b/mail/fetchmail/HISTORY
index 30ae22e..3deab65 100644
--- a/mail/fetchmail/HISTORY
+++ b/mail/fetchmail/HISTORY
@@ -1,3 +1,6 @@
+2010-05-07 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 6.3.17, SECURITY_PATCH=7, fetchmail-SA-2010-02.txt
+
 2010-04-11 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 6.3.16
 
diff --git a/php-pear/php-memcached/DETAILS b/php-pear/php-memcached/DETAILS
index f686b16..9fabd11 100755
--- a/php-pear/php-memcached/DETAILS
+++ b/php-pear/php-memcached/DETAILS
@@ -1,8 +1,8 @@
            SPELL=php-memcached
-         VERSION=1.0.0
+         VERSION=1.0.2
           SOURCE=memcached-$VERSION.tgz
    SOURCE_URL[0]=http://pecl.php.net/get/$SOURCE
-     SOURCE_HASH=sha512:9a0a5df9dfc07f96457b2194633884b7074709021d4eaafb8503fa938b4589091c05c78fff4aa514d813f40dae63eaa7a59e16a84974c93d2b247ccd9eb86d38
+     SOURCE_HASH=sha512:02ccd76a540b86fbd392fcdb0bb632fa3d715b702ee90a10bd7a0330d9b181c7c4f1420bc60ffbcd1e0315fd602382a93b0d50aa8c7d1d9b9152868b60f595b3
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/memcached-$VERSION"
         WEB_SITE=http://github.com/andreiz/php-memcached
       LICENSE[0]=PHP
diff --git a/php-pear/php-memcached/HISTORY b/php-pear/php-memcached/HISTORY
index f0e5ba3..c7f1e3f 100644
--- a/php-pear/php-memcached/HISTORY
+++ b/php-pear/php-memcached/HISTORY
@@ -1,2 +1,5 @@
+2010-05-08 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.0.2
+
 2009-11-23 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS, DETAILS, PRE_BUILD: spell created
diff --git a/printer/ghostscript/DETAILS b/printer/ghostscript/DETAILS
index c10ecc5..ba0845e 100755
--- a/printer/ghostscript/DETAILS
+++ b/printer/ghostscript/DETAILS
@@ -6,6 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://ghostscript.com/releases/$SOURCE
         WEB_SITE=http://www.ghostscript.com/awki
       LICENSE[0]=GPL
+      PATCHLEVEL=1
          ENTERED=20010922
         KEYWORDS="interpreter postscript printer"
            SHORT="interpreter for the PostScript language"
diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY
index 57b8084..0f9bb05 100644
--- a/printer/ghostscript/HISTORY
+++ b/printer/ghostscript/HISTORY
@@ -1,3 +1,8 @@
+2010-05-08 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: PATCHLEVEL++
+	* PRE_BUILD: Added to patch
+	* ghostscript.patch: Added upstream patch.  Bug #15706
+
 2010-02-11 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 8.71
 
diff --git a/printer/ghostscript/PRE_BUILD b/printer/ghostscript/PRE_BUILD
new file mode 100755
index 0000000..b22a0de
--- /dev/null
+++ b/printer/ghostscript/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/ghostscript.patch
diff --git a/printer/ghostscript/ghostscript.patch b/printer/ghostscript/ghostscript.patch
new file mode 100644
index 0000000..826c029
--- /dev/null
+++ b/printer/ghostscript/ghostscript.patch
@@ -0,0 +1,78 @@
+diff --git a/cups/gdevcups.c b/cups/gdevcups.c
+index 551b806..4000abf 100644
+--- a/cups/gdevcups.c
++++ b/cups/gdevcups.c
+@@ -975,7 +975,8 @@ cups_map_cmyk(gx_device *pdev,		/* I - Device info */
+ 	      frac      k,		/* I - Black value */
+ 	      frac      *out)		/* O - Device colors */
+ {
+-  int	c0, c1, c2, c3;			/* Temporary color values */
++  int	c0 = 0, c1 = 0,
++        c2 = 0, c3 = 0;			/* Temporary color values */
+   float	rr, rg, rb,			/* Real RGB colors */
+ 	ciex, ciey, ciez,		/* CIE XYZ colors */
+ 	ciey_yn,			/* Normalized luminance */
+@@ -2703,9 +2704,13 @@ cups_put_params(gx_device     *pdev,	/* I - Device info */
+   int			color_set;	/* Were the color attrs set? */
+   gdev_prn_space_params	sp;		/* Space parameter data */
+   int			width,		/* New width of page */
+-                        height;		/* New height of page */
++                        height,		/* New height of page */
++                        colorspace,     /* New color space */
++                        bitspercolor;   /* New bits per color */
+   static int            width_old = 0,  /* Previous width */
+-                        height_old = 0; /* Previous height */
++                        height_old = 0, /* Previous height */
++                        colorspace_old = 0,/* Previous color space */
++                        bitspercolor_old = 0;/* Previous bits per color */
+   ppd_attr_t            *backside = NULL,
+                         *backsiderequiresflippedmargins = NULL;
+   float                 swap;
+@@ -2800,9 +2805,10 @@ cups_put_params(gx_device     *pdev,	/* I - Device info */
+   else if (code == 0) \
+   { \
+     dprintf1("DEBUG: Setting %s to", sname); \
+-    for (i = 0; i < count; i ++) \
+-      dprintf1(" %d", (unsigned)(arrayval.data[i]));	 \
+-      cups->header.name[i] = (unsigned)arrayval.data[i]; \
++    for (i = 0; i < count; i ++) { \
++      dprintf1(" %d", (unsigned)(arrayval.data[i])); \
++      cups->header.name[i] = (unsigned)(arrayval.data[i]); \
++    } \
+     dprintf("...\n"); \
+   }
+ 
+@@ -3243,23 +3249,31 @@ cups_put_params(gx_device     *pdev,	/* I - Device info */
+     }
+ #endif /* CUPS_RASTER_SYNCv1 */
+ 
++    colorspace = cups->header.cupsColorSpace;
++    bitspercolor = cups->header.cupsBitsPerColor;
++
+    /*
+     * Don't reallocate memory unless the device has been opened...
+     * Also reallocate only if the size has actually changed...
+     */
+ 
+-    if (pdev->is_open && (width != width_old || height != height_old))
++    if (pdev->is_open &&
++	(width != width_old || height != height_old ||
++	 colorspace != colorspace_old || bitspercolor != bitspercolor_old))
+     {
+ 
+       width_old = width;
+       height_old = height;
++      colorspace_old = colorspace;
++      bitspercolor_old = bitspercolor;
+ 
+      /*
+       * Device is open and size has changed, so reallocate...
+       */
+ 
+-      dprintf4("DEBUG2: Reallocating memory, [%.0f %.0f] = %dx%d pixels...\n",
+-	       pdev->MediaSize[0], pdev->MediaSize[1], width, height);
++      dprintf6("DEBUG2: Reallocating memory, [%.0f %.0f] = %dx%d pixels, color space: %d, bits per color: %d...\n",
++	       pdev->MediaSize[0], pdev->MediaSize[1], width, height,
++	       colorspace, bitspercolor);
+ 
+       sp = ((gx_device_printer *)pdev)->space_params;
diff --git a/printer/system-config-printer/DETAILS b/printer/system-config-printer/DETAILS
index 68dd8e7..7ba6976 100755
--- a/printer/system-config-printer/DETAILS
+++ b/printer/system-config-printer/DETAILS
@@ -1,6 +1,6 @@
            SPELL=system-config-printer
-         VERSION=1.2.1
-    SOURCE_HASH=sha512:5c3a427604f004c4ce6d86e43c3d6b68ed3badfc317f93d38a109261efa1cc327a1ce9429ab472db8398327115f9f8dcdb7153f37713e30b12829e5a5c9b3ec9
+         VERSION=1.2.2
+    SOURCE_HASH=sha512:2a6a8513d12130e1ed9b7d946e3cc80e2c5d8df4bb3c0260c5cb3a228858500046f417b669a145ace22b4bb4c9b783fdcdb788b7086fff4fe6b679c02365ebc8
           SOURCE=$SPELL-$VERSION.tar.bz2
 #         SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/printer/system-config-printer/HISTORY b/printer/system-config-printer/HISTORY
index b55a3c6..ed8075d 100644
--- a/printer/system-config-printer/HISTORY
+++ b/printer/system-config-printer/HISTORY
@@ -1,3 +1,6 @@
+2010-05-08 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.2.2
+
 2010-04-15 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.2.1
 
diff --git a/python-pypi/couchdb-python/CouchDB-0.7.tar.gz.sig b/python-pypi/couchdb-python/CouchDB-0.7.tar.gz.sig
new file mode 100644
index 0000000..c9b0d7d
Binary files /dev/null and b/python-pypi/couchdb-python/CouchDB-0.7.tar.gz.sig differ
diff --git a/python-pypi/couchdb-python/DEPENDS b/python-pypi/couchdb-python/DEPENDS
new file mode 100755
index 0000000..6c4f0ca
--- /dev/null
+++ b/python-pypi/couchdb-python/DEPENDS
@@ -0,0 +1,3 @@
+depends couchdb &&
+depends python &&
+depends setuptools
diff --git a/python-pypi/couchdb-python/DETAILS b/python-pypi/couchdb-python/DETAILS
new file mode 100755
index 0000000..b6f57c6
--- /dev/null
+++ b/python-pypi/couchdb-python/DETAILS
@@ -0,0 +1,32 @@
+           SPELL=couchdb-python
+         VERSION=0.7
+          SOURCE="CouchDB-$VERSION.tar.gz"
+      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+   SOURCE_URL[0]="http://pypi.python.org/packages/source/C/CouchDB/$SOURCE"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/CouchDB-$VERSION"
+        WEB_SITE=http://code.google.com/p/couchdb-python/
+      LICENSE[0]=BSD
+         ENTERED=20100505
+           SHORT="Python library for working with CouchDB"
+cat << EOF
+This package currently encompasses four primary modules:
+  couchdb.client: the basic client library
+
+  couchdb.design: management of design documents
+
+  couchdb.mapping: a higher-level API for mapping between CouchDB documents
+  and Python objects
+
+  couchdb.view: a CouchDB view server that allows writing view functions in
+  Python
+
+It also provides a couple of command-line tools:
+  couchdb-dump: Writes a snapshot of a CouchDB database (including documents,
+  attachments, and design documents) to MIME multipart file
+
+  couchdb-load: Reads a MIME multipart file as generated by couchdb-dump and
+  loads all the documents, attachments, and design documents into a CouchDB database.
+
+  couchdb-replicate: Can be used as an update-notification script to trigger
+  replication between databases when data is changed.
+EOF
diff --git a/python-pypi/couchdb-python/HISTORY b/python-pypi/couchdb-python/HISTORY
new file mode 100644
index 0000000..d8a704c
--- /dev/null
+++ b/python-pypi/couchdb-python/HISTORY
@@ -0,0 +1,3 @@
+2010-05-05 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS, DEPENDS: Created
+
diff --git a/python-pypi/desktopcouch/DEPENDS b/python-pypi/desktopcouch/DEPENDS
index 6c4f0ca..a5dd115 100755
--- a/python-pypi/desktopcouch/DEPENDS
+++ b/python-pypi/desktopcouch/DEPENDS
@@ -1,3 +1,5 @@
-depends couchdb &&
 depends python &&
-depends setuptools
+depends setuptools &&
+
+runtime_depends couchdb &&
+runtime_depends python-oauth2
diff --git a/python-pypi/desktopcouch/DETAILS b/python-pypi/desktopcouch/DETAILS
index 701d3db..a2cc467 100755
--- a/python-pypi/desktopcouch/DETAILS
+++ b/python-pypi/desktopcouch/DETAILS
@@ -4,6 +4,7 @@
       SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
    SOURCE_URL[0]="http://launchpad.net/$SPELL/trunk/$VERSION/+download/$SOURCE"
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+      PATCHLEVEL=2
         WEB_SITE=https://launchpad.net/desktopcouch
       LICENSE[0]=GPLv3
          ENTERED=20100505
diff --git a/python-pypi/desktopcouch/HISTORY b/python-pypi/desktopcouch/HISTORY
index d8a704c..0427b80 100644
--- a/python-pypi/desktopcouch/HISTORY
+++ b/python-pypi/desktopcouch/HISTORY
@@ -1,3 +1,9 @@
 2010-05-05 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS, DEPENDS: Created
+	* DETAILS: PATCHLEVEL++
+	  PATCHLEVEL++ for oauth2.patch
+	* DEPENDS: Runtime depends on python-oauth2
+	* PRE_BUILD: Apply bug566073.patch
+	* bug566073.patch: Fix couchdb-python API change
+	  https://bugs.launchpad.net/desktopcouch/+bug/566073
 
diff --git a/python-pypi/desktopcouch/PRE_BUILD b/python-pypi/desktopcouch/PRE_BUILD
new file mode 100755
index 0000000..7b122bf
--- /dev/null
+++ b/python-pypi/desktopcouch/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+message "${MESSAGE_COLOR}Applying Launchpad Bug #566073 patch...${DEFAULT_COLOR}" &&
+patch -p1 < $SPELL_DIRECTORY/bug566073.patch &&
+message "${MESSAGE_COLOR}Applying patch to use up-to-date oauth2...${DEFAULT_COLOR}" &&
+patch -p1 < $SPELL_DIRECTORY/oauth2.patch
diff --git a/python-pypi/desktopcouch/bug566073.patch b/python-pypi/desktopcouch/bug566073.patch
new file mode 100644
index 0000000..916d8c6
--- /dev/null
+++ b/python-pypi/desktopcouch/bug566073.patch
@@ -0,0 +1,24 @@
+diff -Naur desktopcouch-0.6.4.orig/desktopcouch/records/server.py desktopcouch-0.6.4/desktopcouch/records/server.py
+--- desktopcouch-0.6.4.orig/desktopcouch/records/server.py	2010-05-07 02:01:04.308859356 -0700
++++ desktopcouch-0.6.4/desktopcouch/records/server.py	2010-05-07 02:02:06.355867612 -0700
+@@ -22,7 +22,7 @@
+ """The Desktop Couch Records API."""
+  
+ from couchdb import Server
+-from couchdb.client import Resource
++from couchdb.http import Resource
+ import desktopcouch
+ from desktopcouch.records import server_base
+ import urlparse
+diff -Naur desktopcouch-0.6.4.orig/desktopcouch/records/server_base.py desktopcouch-0.6.4/desktopcouch/records/server_base.py
+--- desktopcouch-0.6.4.orig/desktopcouch/records/server_base.py	2010-05-07 02:01:04.308859356 -0700
++++ desktopcouch-0.6.4/desktopcouch/records/server_base.py	2010-05-07 02:01:53.851940948 -0700
+@@ -39,7 +39,7 @@
+ from oauth import oauth
+ 
+ from couchdb import Server
+-from couchdb.client import ResourceNotFound, ResourceConflict, uri as couchdburi
++from couchdb.http import ResourceNotFound, ResourceConflict, uri as couchdburi
+ from couchdb.design import ViewDefinition
+ from record import Record
+ 
diff --git a/python-pypi/desktopcouch/oauth2.patch b/python-pypi/desktopcouch/oauth2.patch
new file mode 100644
index 0000000..5c5e9a4
--- /dev/null
+++ b/python-pypi/desktopcouch/oauth2.patch
@@ -0,0 +1,21 @@
+diff -Naur desktopcouch-0.6.4.orig/desktopcouch/records/server_base.py desktopcouch-0.6.4/desktopcouch/records/server_base.py
+--- desktopcouch-0.6.4.orig/desktopcouch/records/server_base.py	2010-05-07 02:01:04.308859356 -0700
++++ desktopcouch-0.6.4/desktopcouch/records/server_base.py	2010-05-07 02:50:55.242862656 -0700
+@@ -36,7 +36,7 @@
+     import json
+ # pylint: enable-msg=F0401
+ 
+-from oauth import oauth
++import oauth2 as oauth
+ 
+ from couchdb import Server
+ from couchdb.client import ResourceNotFound, ResourceConflict, uri as couchdburi
+diff -Naur desktopcouch-0.6.4.orig/desktopcouch/replication_services/ubuntuone.py desktopcouch-0.6.4/desktopcouch/replication_services/ubuntuone.py
+--- desktopcouch-0.6.4.orig/desktopcouch/replication_services/ubuntuone.py	2010-05-07 02:01:04.307859496 -0700
++++ desktopcouch-0.6.4/desktopcouch/replication_services/ubuntuone.py	2010-05-07 02:50:46.389139860 -0700
+@@ -1,4 +1,4 @@
+-from oauth import oauth
++import oauth2 as oauth
+ import logging
+ import httplib2
+ import gnomekeyring
diff --git a/python-pypi/pygccxml/DEPENDS b/python-pypi/pygccxml/DEPENDS
new file mode 100755
index 0000000..029557c
--- /dev/null
+++ b/python-pypi/pygccxml/DEPENDS
@@ -0,0 +1,3 @@
+depends zip &&
+depends gccxml &&
+depends python
diff --git a/python-pypi/pygccxml/DETAILS b/python-pypi/pygccxml/DETAILS
new file mode 100755
index 0000000..be3791c
--- /dev/null
+++ b/python-pypi/pygccxml/DETAILS
@@ -0,0 +1,16 @@
+           SPELL=pygccxml
+         VERSION=1.0.0
+          SOURCE=$SPELL-$VERSION.zip
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+     SOURCE_HASH=sha512:d2a96b5bb27c3620527839051e43fa1eee8884692707a347c76863ff44a04502dcff35fe18b95a35c32fb8a4935ed8d5d91bf41eb98aee74f6df08c48ddc0b67
+        WEB_SITE=http://www.language-binding.net/pygccxml/pygccxml.html
+         ENTERED=20100507
+      LICENSE[0]=http://www.boost.org/LICENSE_1_0.txt
+        KEYWORDS="gcc xml python devel"
+           SHORT="Python module to read GCCXML output"
+cat << EOF
+Specialized XML reader that reads the output from GCCXML.
+
+For examples and tutorials see the web site.
+EOF
diff --git a/python-pypi/pygccxml/HISTORY b/python-pypi/pygccxml/HISTORY
new file mode 100644
index 0000000..594550d
--- /dev/null
+++ b/python-pypi/pygccxml/HISTORY
@@ -0,0 +1,3 @@
+2010-05-07 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS, DETAILS: spell created
+
diff --git a/python-pypi/python-oauth2/DEPENDS b/python-pypi/python-oauth2/DEPENDS
new file mode 100755
index 0000000..bc66e00
--- /dev/null
+++ b/python-pypi/python-oauth2/DEPENDS
@@ -0,0 +1,2 @@
+depends python &&
+depends setuptools
diff --git a/python-pypi/python-oauth2/DETAILS b/python-pypi/python-oauth2/DETAILS
new file mode 100755
index 0000000..856d57a
--- /dev/null
+++ b/python-pypi/python-oauth2/DETAILS
@@ -0,0 +1,27 @@
+           SPELL=python-oauth2
+         VERSION=1.1.3-0-g9962d31
+          SOURCE="$SPELL-$VERSION.tar.gz"
+      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+   SOURCE_URL[0]="http://download.github.com/simplegeo-$SOURCE"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/simplegeo-$SPELL-${VERSION/*g/}"
+      LICENSE[0]=MIT
+        WEB_SITE=http://github.com/simplegeo/python-oauth2
+         ENTERED=20100506
+           SHORT="An open protocol to allow API authentication"
+cat << EOF
+This code was originally forked from Leah Culver and Andy Smith's oauth.py
+code. Some of the tests come from a fork by Vic Fryzel, while a revamped
+Request class and more tests were merged in from Mark Paschal's fork. A number
+of notable differences exist between this code and its forefathers:
+
+ * 100% unit test coverage.
+ * The DataStore object has been completely ripped out. While creating unit
+   tests for the library I found several substantial bugs with the
+   implementation and confirmed with Andy Smith that it was never fully baked.
+ * Classes are no longer prefixed with OAuth.
+ * The Request class now extends from dict.
+ * The library is likely no longer compatible with Python 2.3.
+ * The Client class works and extends from httplib2. It's a thin wrapper that
+   handles automatically signing any normal HTTP request you might wish to
+   make.
+EOF
diff --git a/python-pypi/python-oauth2/HISTORY b/python-pypi/python-oauth2/HISTORY
new file mode 100644
index 0000000..47907cf
--- /dev/null
+++ b/python-pypi/python-oauth2/HISTORY
@@ -0,0 +1,7 @@
+2010-05-05 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS, DEPENDS: Created
+	* DETAILS: PATCHLEVEL++
+	* PRE_BUILD: Apply bug566073.patch
+	* bug566073.patch: Fix couchdb-python API change
+	  https://bugs.launchpad.net/desktopcouch/+bug/566073
+
diff --git a/python-pypi/python-oauth2/python-oauth2-1.1.3-0-g9962d31.tar.gz.sig b/python-pypi/python-oauth2/python-oauth2-1.1.3-0-g9962d31.tar.gz.sig
new file mode 100644
index 0000000..94f8d0a
Binary files /dev/null and b/python-pypi/python-oauth2/python-oauth2-1.1.3-0-g9962d31.tar.gz.sig differ
diff --git a/ruby-raa/ruby-1.9/DETAILS b/ruby-raa/ruby-1.9/DETAILS
index 9bb7996..e8f5b14 100755
--- a/ruby-raa/ruby-1.9/DETAILS
+++ b/ruby-raa/ruby-1.9/DETAILS
@@ -1,7 +1,7 @@
            SPELL=ruby-1.9
          PACKAGE=ruby
-         VERSION=1.9.1-p376
-     SOURCE_HASH=sha512:63bc1814ba10de95b70733b14e77dcf12351540f6d484b7aaf98408f1eb13496b06e1c37562eb1c67cb9121d5c3b46e70dee012bb8dcd251a06339eff0b6d325
+         VERSION=1.9.1-p378
+     SOURCE_HASH=sha512:bf63563dd810a35ff2603d8000eacd70fe7b684a697e6b6ce8768f3e3c62bfb5c00b0dd674672b2dad9f9bb6c3807efb6035fc39c41d7f9b08418ebbb903972a
           SOURCE=$PACKAGE-$VERSION.tar.gz
   SECURITY_PATCH=1
    SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/ruby/1.9/$SOURCE
diff --git a/ruby-raa/ruby-1.9/HISTORY b/ruby-raa/ruby-1.9/HISTORY
index 7ba3941..847f7e1 100644
--- a/ruby-raa/ruby-1.9/HISTORY
+++ b/ruby-raa/ruby-1.9/HISTORY
@@ -1,3 +1,6 @@
+2010-05-08 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 1.9.1-p378
+
 2010-04-01 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* PRE_BUILD, ruby-1.9.2pre1-openssl1-patch:
 	  added patch to fix build issue with openssl 1.0.0
diff --git a/utils/bluez/DETAILS b/utils/bluez/DETAILS
index 35184f0..55c6ddd 100755
--- a/utils/bluez/DETAILS
+++ b/utils/bluez/DETAILS
@@ -1,5 +1,5 @@
            SPELL=bluez
-         VERSION=4.61
+         VERSION=4.64
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sign
   SOURCE2_IGNORE=signature
diff --git a/utils/bluez/HISTORY b/utils/bluez/HISTORY
index f67b3a4..c3e6408 100644
--- a/utils/bluez/HISTORY
+++ b/utils/bluez/HISTORY
@@ -1,3 +1,6 @@
+2010-05-08 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 4.64
+
 2010-02-15 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 4.61
 
diff --git a/x11-libs/wine/CONFIGURE b/x11-libs/wine/CONFIGURE
index a881b15..281dd93 100755
--- a/x11-libs/wine/CONFIGURE
+++ b/x11-libs/wine/CONFIGURE
@@ -5,4 +5,6 @@ if [[ "${ARCH}" = 'x86_64' ]]; then
   message "an attempt will be made to build a 32bit Wine, which will fail if you" &&
   message "do not have a multilib system." &&
   config_query_option WINE64 'Build a 64bit Wine?' n '--enable-win64 --enable-maintainer-mode' ''
-fi
+fi &&
+
+config_query WINE_SC2_LOGIN "Apply StarCraft II login bug patch?" n
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index dff28b5..aaa86b2 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
   FORCE_DOWNLOAD=1
 else
   if [[ $WINE_DEVEL == y ]]; then
-         VERSION=1.1.43
+         VERSION=1.1.44
   else
          VERSION=1.0.1
   fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 29301f2..11e959d 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,13 @@
+2010-05-07 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to 1.1.44
+
+2010-05-06 Eric Sandall <sandalle at sourcemage.org>
+	* CONFIGURE: Query to apply StarCraft II login bug patch
+	* PRE_BUILD: Apply sc2-login.diff
+	* sc2-login.diff: StarCraft II login bug patch
+	  See http://appdb.winehq.org/objectManager.php?sClass=version&iId=19376
+	  http://www.winehq.org/pipermail/wine-patches/2010-March/085817.html
+
 2010-04-26 Eric Sandall <sandalle at sourcemage.org>
 	* BUILD: Possibly better fix allowing '-mfpmath=sse'
 
diff --git a/x11-libs/wine/PRE_BUILD b/x11-libs/wine/PRE_BUILD
index 7f2eb2d..010d598 100755
--- a/x11-libs/wine/PRE_BUILD
+++ b/x11-libs/wine/PRE_BUILD
@@ -15,4 +15,10 @@ if test "$WINE_VCS" == y -o "$WINE_DEVEL" == y  &&
     patch -Np1 < "$SCRIPT_DIRECTORY/wine-git-mpg123_64.diff"
   fi &&
   autoreconf -iv
+fi &&
+
+if [[ "$WINE_SC2_LOGIN" == "y" ]]; then
+  message "${MESSAGE_COLOR}Applying StarCraft II login bug patch...${DEFAULT_COLOR}" &&
+  cd $SOURCE_DIRECTORY &&
+  patch -p1 < $SPELL_DIRECTORY/sc2-login.diff
 fi
diff --git a/x11-libs/wine/sc2-login.diff b/x11-libs/wine/sc2-login.diff
new file mode 100644
index 0000000..3c78df8
--- /dev/null
+++ b/x11-libs/wine/sc2-login.diff
@@ -0,0 +1,169 @@
+# http://appdb.winehq.org/objectManager.php?sClass=version&iId=19376
+# http://www.winehq.org/pipermail/wine-patches/2010-March/085817.html
+---
+ dlls/kernel32/tests/debugger.c |   98 +++++++++++++++++++++++++++++++++++++++-
+ dlls/ntdll/loader.c            |    7 ++-
+ 2 files changed, 101 insertions(+), 4 deletions(-)
+
+diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c
+index 057b977..f9b3889 100644
+--- a/dlls/kernel32/tests/debugger.c
++++ b/dlls/kernel32/tests/debugger.c
+@@ -555,8 +555,10 @@ static void doChild(int argc, char **argv)
+ static void test_debug_loop(int argc, char **argv)
+ {
+     const char *arguments = " debugger child ";
++    IMAGE_DATA_DIRECTORY import_dir = {0};
+     struct child_blackbox blackbox;
+     char blackbox_file[MAX_PATH];
++    const char *base = NULL;
+     PROCESS_INFORMATION pi;
+     STARTUPINFOA si;
+     BOOL debug;
+@@ -597,13 +599,107 @@ static void test_debug_loop(int argc, char **argv)
+         ok(ret, "WaitForDebugEvent failed, last error %#x.\n", GetLastError());
+         if (!ret) break;
+ 
+-        if (ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break;
++        switch (ev.dwDebugEventCode)
++        {
++            case CREATE_PROCESS_DEBUG_EVENT:
++            {
++                IMAGE_THUNK_DATA *imports, *thunks;
++                IMAGE_IMPORT_DESCRIPTOR *desc;
++                IMAGE_DOS_HEADER dos;
++                IMAGE_NT_HEADERS nt;
++                unsigned int i, j;
++                char *data;
++
++                base = ev.u.CreateProcessInfo.lpBaseOfImage;
++
++                ret = ReadProcessMemory(pi.hProcess, base, &dos, sizeof(dos), NULL);
++                ok(ret, "ReadProcessMemory failed, last error %#x.\n", GetLastError());
++                ok(dos.e_magic == IMAGE_DOS_SIGNATURE, "Wrong DOS signature %#x.\n", dos.e_magic);
++
++                ret = ReadProcessMemory(pi.hProcess, base + dos.e_lfanew, &nt, sizeof(nt), NULL);
++                ok(ret, "ReadProcessMemory failed, last error %#x.\n", GetLastError());
++                ok(nt.Signature == IMAGE_NT_SIGNATURE, "Wrong NT signature %#x.\n", nt.Signature);
++
++                import_dir = nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT];
++
++                data = HeapAlloc(GetProcessHeap(), 0, import_dir.Size);
++                ret = ReadProcessMemory(pi.hProcess, base + import_dir.VirtualAddress, data, import_dir.Size, NULL);
++                ok(ret, "ReadProcessMemory failed, last error %#x.\n", GetLastError());
++                desc = (IMAGE_IMPORT_DESCRIPTOR *)data;
++
++                i = 0;
++                while (desc[i].Name && desc[i].FirstThunk)
++                {
++                    thunks = (IMAGE_THUNK_DATA *)(data + (desc[i].FirstThunk - import_dir.VirtualAddress));
++                    imports = (IMAGE_THUNK_DATA *)(data + (U(desc[i]).OriginalFirstThunk - import_dir.VirtualAddress));
++
++                    j = 0;
++                    while (imports[j].u1.Ordinal)
++                    {
++                        ok(!thunks[j].u1.Function || thunks[j].u1.Function == imports[j].u1.Function,
++                                "desc %u, import %u is already resolved, %#x -> %#x.\n",
++                                i, j, imports[j].u1.Function, thunks[j].u1.Function);
++                        ++j;
++                    }
++                    ++i;
++                }
++
++                HeapFree(GetProcessHeap(), 0, data);
++                break;
++            }
++
++            case EXCEPTION_DEBUG_EVENT:
++            {
++                IMAGE_THUNK_DATA *imports, *thunks;
++                IMAGE_IMPORT_DESCRIPTOR *desc;
++                unsigned int i, j;
++                char *data;
++
++                if (ev.u.Exception.ExceptionRecord.ExceptionCode != EXCEPTION_BREAKPOINT)
++                {
++                    ok(0, "Received unexpected exception %#x.\n", ev.u.Exception.ExceptionRecord.ExceptionCode);
++                    break;
++                }
++
++                data = HeapAlloc(GetProcessHeap(), 0, import_dir.Size);
++                ret = ReadProcessMemory(pi.hProcess, base + import_dir.VirtualAddress, data, import_dir.Size, NULL);
++                ok(ret, "ReadProcessMemory failed, last error %#x.\n", GetLastError());
++                desc = (IMAGE_IMPORT_DESCRIPTOR *)data;
++
++                i = 0;
++                while (desc[i].Name && desc[i].FirstThunk)
++                {
++                    thunks = (IMAGE_THUNK_DATA *)(data + (desc[i].FirstThunk - import_dir.VirtualAddress));
++                    imports = (IMAGE_THUNK_DATA *)(data + (U(desc[i]).OriginalFirstThunk - import_dir.VirtualAddress));
++
++                    j = 0;
++                    while (imports[j].u1.Ordinal)
++                    {
++                        ok(thunks[j].u1.Function && thunks[j].u1.Function != imports[j].u1.Function,
++                                "desc %u, import %u isn't resolved yet, %#x -> %#x.\n",
++                                i, j, imports[j].u1.Function, thunks[j].u1.Function);
++                        ++j;
++                    }
++                    ++i;
++                }
++
++                HeapFree(GetProcessHeap(), 0, data);
++                break;
++            }
++
++            case EXIT_PROCESS_DEBUG_EVENT:
++                goto done;
++
++            default:
++                break;
++        }
+ 
+         ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE);
+         ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError());
+         if (!ret) break;
+     }
+ 
++done:
+     ret = CloseHandle(pi.hThread);
+     ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError());
+     ret = CloseHandle(pi.hProcess);
+diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
+index 1723f18..fbdda00 100644
+--- a/dlls/ntdll/loader.c
++++ b/dlls/ntdll/loader.c
+@@ -2533,10 +2533,14 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule)
+  */
+ static NTSTATUS attach_process_dlls( void *wm )
+ {
++    LPCWSTR load_path;
+     NTSTATUS status;
+ 
+     pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL );
+ 
++    load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer;
++    if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) return status;
++
+     RtlEnterCriticalSection( &loader_section );
+     if ((status = process_attach( wm, (LPVOID)1 )) != STATUS_SUCCESS)
+     {
+@@ -2622,7 +2626,6 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2,
+     static const WCHAR globalflagW[] = {'G','l','o','b','a','l','F','l','a','g',0};
+     NTSTATUS status;
+     WINE_MODREF *wm;
+-    LPCWSTR load_path;
+     PEB *peb = NtCurrentTeb()->Peb;
+     IMAGE_NT_HEADERS *nt = RtlImageNtHeader( peb->ImageBaseAddress );
+ 
+@@ -2652,8 +2655,6 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2,
+     if ((status = server_init_process_done()) != STATUS_SUCCESS) goto error;
+ 
+     actctx_init();
+-    load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer;
+-    if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) goto error;
+     if ((status = alloc_process_tls()) != STATUS_SUCCESS) goto error;
+     if ((status = alloc_thread_tls()) != STATUS_SUCCESS) goto error;
+     heap_set_debug_flags( GetProcessHeap() );
+-- 
+1.6.4.4
diff --git a/xorg-extras/xterm/DETAILS b/xorg-extras/xterm/DETAILS
index 1fccd04..d2e667c 100755
--- a/xorg-extras/xterm/DETAILS
+++ b/xorg-extras/xterm/DETAILS
@@ -1,5 +1,5 @@
            SPELL=xterm
-         VERSION=257
+         VERSION=258
           SOURCE=$SPELL-$VERSION.tgz
          SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=ftp://invisible-island.net/xterm/$SOURCE
diff --git a/xorg-extras/xterm/HISTORY b/xorg-extras/xterm/HISTORY
index 5669116..6d0e8e4 100644
--- a/xorg-extras/xterm/HISTORY
+++ b/xorg-extras/xterm/HISTORY
@@ -1,3 +1,5 @@
+2010-05-08 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 258
 2010-04-22 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 257
 



More information about the SM-Commit mailing list