Merge branch 'master' into gnome

Conflicts: ChangeLog
author: Ladislav Hagara 2010-10-24 19:19:51 +0200
committer: Ladislav Hagara 2010-10-24 19:19:51 +0200
commit: 343579cdda32ba6dedd1fdc91f45e4da46230228 (patch)
tree: 7bdc8ea37a96c33e81848519337e9839101db89e
parent: 89b3031f375445d0b58f2f6471a7a5fd6e5b58da (diff)
parent: 6234a83ea67adb5b5a9e9334121b496bc3304b44 (diff)
136 files changed, 394 insertions, 159 deletions
diff --git a/ChangeLog b/ChangeLog
index ba63f9cbe2..f94b26fafc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,15 @@
 
 2010-10-22 Ladislav Hagara <hgr@vabo.cz>
 	* gnome2-libs/atkmm: new spell, C++ binding for the ATK library
+2010-10-22 George Sherwood <gsherwood@sourcemage.org>
+	* gnome2-libs/gsettings-desktop-schemas: new spell, gnome component
+
+2010-10-21 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* devel/cppcheck: new spell, a static analysis tool for C++
+
+2010-10-20 Bor Kraljič <pyrobor@ver.si>
+	* mobile/synce-dccm: spell deprecated; spell was split into 
+	  synce-odccm & synce-odccm long time ago...
 
 2010-10-17 George Sherwood <gsherwood@sourcemage.org>
 	* http/webkitgtk3: new spell, gtk+3 version of webkitgtk
diff --git a/archive/dpkg/DETAILS b/archive/dpkg/DETAILS
index d63fdbdc72..485aeb6cfe 100755
--- a/archive/dpkg/DETAILS
+++ b/archive/dpkg/DETAILS
@@ -1,9 +1,9 @@
            SPELL=dpkg
-         VERSION=1.14.25
+         VERSION=1.14.29
           SOURCE=${SPELL}_${VERSION}.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
       SOURCE_URL=http://ftp.debian.org/debian/pool/main/d/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:a87dcf1e990bc05069d52067cb4d43168fcdced1dfff3f628752b127babc742320f07de00b038fb5084b18e73b9ca9f313d402f7bd013bad211abf0ba48c6c81
+     SOURCE_HASH=sha512:c6a2fb230473e38e4487d7b1bddcdd8d280f303ed7eecb00ada73cea639069c46b8928ec63a771c919d26a31f5680588b8942682da01a6084d0fa001eac3afff
         WEB_SITE=http://packages.debian.org/testing/admin/dpkg
          ENTERED=20030725
       LICENSE[0]=GPL
diff --git a/archive/dpkg/HISTORY b/archive/dpkg/HISTORY
index c73b790730..7ef007220a 100644
--- a/archive/dpkg/HISTORY
+++ b/archive/dpkg/HISTORY
@@ -1,3 +1,6 @@
+2010-10-24 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.14.29
+
 2009-08-19 Donald Johnson <ltdonny@gmail.com>
 	* DETAILS: version 1.14.25
 	* PRE_BUILD: added sed script, removes all traces of "ncursesw/" from
diff --git a/audio-drivers/dream/BUILD b/audio-drivers/dream/BUILD
index 2506794c39..1920cc99d2 100755
--- a/audio-drivers/dream/BUILD
+++ b/audio-drivers/dream/BUILD
@@ -1,4 +1,2 @@
-[ -f bootstrap ] && sh bootstrap
-sed -i 's,$QTDIR/bin,/usr/bin,' configure &&
-./configure $OPTS --prefix=$INSTALL_ROOT/usr --with-qtdir=/usr/include/qt --without-faad2 &&
-make
+OPTS="$OPTS --with-qtdir=/usr/include/qt --disable-faad2" &&
+default_build
diff --git a/audio-drivers/dream/DETAILS b/audio-drivers/dream/DETAILS
index 2dfc6bb532..2ad5a6010d 100755
--- a/audio-drivers/dream/DETAILS
+++ b/audio-drivers/dream/DETAILS
@@ -1,9 +1,9 @@
            SPELL=dream
-         VERSION=1.6.25
-          SOURCE=drm-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/drm-$VERSION
-   SOURCE_URL[0]=${SOURCEFORGE_URL}/drm/${SOURCE}
-     SOURCE_HASH=sha512:2a815a1d308c5a7162764bd0c45774ec6e1ffd6d6e6fb8d750e767988d6f7e513c00d997197a35f10d7e92a4bf6f3401b00992e4c7b74802042a71bb159c04ac
+         VERSION=1.12b
+          SOURCE=drm-${VERSION/\./-}.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/drm
+   SOURCE_URL[0]=${SOURCEFORGE_URL}/project/drm/drm/${VERSION}/${SOURCE}
+     SOURCE_HASH=sha512:6cf6f4041f93e3cd5144b991136e03758c395e33754cdac23b435e411d015ef1bbfa75ed2f826e8b2fe9e6af74a593030a995e283278a6a674349f912119efbd
         WEB_SITE=http://drm.sourceforge.net/
          ENTERED=20041022
       LICENSE[0]=GPL
diff --git a/audio-drivers/dream/HISTORY b/audio-drivers/dream/HISTORY
index aadc7e2e22..5dd022d20d 100644
--- a/audio-drivers/dream/HISTORY
+++ b/audio-drivers/dream/HISTORY
@@ -1,3 +1,9 @@
+2010-10-21 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.12b
+	* BUILD, PRE_BUILD: moved configure sediting to PRE_BUILD
+	* BUILD: use default_build
+	* PRE_BUILD, gcc-4.5.patch: fixed build issue with gcc 4.5
+
 2006-11-13 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
 	* DETAILS: new version, new url
 	* BUILD: fix qt path and disable faad2 - needs faad2 > 2.0
diff --git a/audio-drivers/dream/PRE_BUILD b/audio-drivers/dream/PRE_BUILD
new file mode 100755
index 0000000000..15af771508
--- /dev/null
+++ b/audio-drivers/dream/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build      &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/gcc-4.5.patch &&
+[ -f bootstrap ] && sh bootstrap &&
+sed -i 's,$QTDIR/bin,/usr/bin,' configure
diff --git a/audio-drivers/dream/gcc-4.5.patch b/audio-drivers/dream/gcc-4.5.patch
new file mode 100644
index 0000000000..71c0b1248b
--- /dev/null
+++ b/audio-drivers/dream/gcc-4.5.patch
@@ -0,0 +1,10 @@
+--- drm/common/datadecoding/journaline/NML.cpp.orig	2010-10-21 11:11:34.000000000 +0200
++++ drm/common/datadecoding/journaline/NML.cpp	2010-10-21 11:12:09.000000000 +0200
+@@ -69,6 +69,7 @@
+ #include <cstdlib>
+ #include <cstring>
+ #include <zlib.h>
++#include <cstdio>
+ #include "NML.h"
+ #include "Splitter.h"
+ #include "cpplog.h"
diff --git a/audio-players/timidity-cvs/DETAILS b/audio-players/timidity-cvs/DETAILS
index d14f5c64fe..d64b864376 100755
--- a/audio-players/timidity-cvs/DETAILS
+++ b/audio-players/timidity-cvs/DETAILS
@@ -2,7 +2,7 @@
          VERSION=head
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-SOURCE_URL[0]=cvs://:pserver:anonymous@cvs.timidity.sourceforge.net:/cvsroot/timidity:timidity
+SOURCE_URL[0]=cvs://:pserver:anonymous@timidity.cvs.sourceforge.net:/cvsroot/timidity:timidity
    SOURCE_IGNORE=volatile
         WEB_SITE=http://timidity.sf.net
          ENTERED=20040125
diff --git a/audio-players/timidity-cvs/HISTORY b/audio-players/timidity-cvs/HISTORY
index 285368b84d..215e7c0c44 100644
--- a/audio-players/timidity-cvs/HISTORY
+++ b/audio-players/timidity-cvs/HISTORY
@@ -1,3 +1,6 @@
+2010-10-21 Bor Kraljič <pyrobor@ver.si>
+	* DETAILS: fixed SOURCE_URL
+
 2008-03-18 Eric Sandall <sandalle@sourcemage.org>
 	* DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 
diff --git a/chat-im/pidgin/DETAILS b/chat-im/pidgin/DETAILS
index 376e3d7a15..04a1ebd953 100755
--- a/chat-im/pidgin/DETAILS
+++ b/chat-im/pidgin/DETAILS
@@ -1,6 +1,6 @@
            SPELL=pidgin
-         VERSION=2.7.3
-  SECURITY_PATCH=5
+         VERSION=2.7.4
+  SECURITY_PATCH=6
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index 7b352b3078..1e2e51b53b 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,6 @@
+2010-10-21 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 2.7.4, SECURITY_PATCH=6
+
 2010-09-18 David C. Haley <khoralin@gmail.com>
 	* DEPENDS: optional depends on silc-toolkit for SILC protocol
 
diff --git a/chat-im/pidgin/pidgin-2.7.3.tar.bz2.sig b/chat-im/pidgin/pidgin-2.7.3.tar.bz2.sig
deleted file mode 100644
index b645761f60..0000000000
--- a/chat-im/pidgin/pidgin-2.7.3.tar.bz2.sig
+++ /dev/null
diff --git a/chat-im/pidgin/pidgin-2.7.4.tar.bz2.sig b/chat-im/pidgin/pidgin-2.7.4.tar.bz2.sig
new file mode 100644
index 0000000000..164ef93be6
--- /dev/null
+++ b/chat-im/pidgin/pidgin-2.7.4.tar.bz2.sig
diff --git a/chat-irc/bitlbee/CONFIGURE b/chat-irc/bitlbee/CONFIGURE
index 460c279e40..8a8aee5794 100755
--- a/chat-irc/bitlbee/CONFIGURE
+++ b/chat-irc/bitlbee/CONFIGURE
@@ -16,11 +16,8 @@ config_query_option BITLBEE_OPTS "Enable Oscar protocol (for ICQ or AIM)? " \
 config_query_option BITLBEE_OPTS "Enable Yahoo protocol? " y   \
                      "--yahoo=1" "--yahoo=0"
 
-#config_query AIM "Add patch with AIM improvements?" n
-
-#config_query MSN "Add patch with MSN extensions?" n
-
-#config_query JAB "Add patch to allow jabber to work with Google Talk?" n
+config_query_option BITLBEE_OPTS "Enable Twitter protocol? " y   \
+                     "--twitter=1" "--twitter=0"
 
 config_query BITLBEE_BITLBEED     \
              "Build bitlbeed (to run bitlbee without xinetd)?" n
diff --git a/chat-irc/bitlbee/DETAILS b/chat-irc/bitlbee/DETAILS
index fe99686f55..bfa0852db9 100755
--- a/chat-irc/bitlbee/DETAILS
+++ b/chat-irc/bitlbee/DETAILS
@@ -1,13 +1,12 @@
            SPELL=bitlbee
-         VERSION=1.2.7
+         VERSION=3.0
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://get.bitlbee.org/src/$SOURCE
         WEB_SITE=http://www.bitlbee.org
          ENTERED=20031024
   SECURITY_PATCH=1
-     SOURCE_HASH=sha512:e9ccc425c3873fbbbaae9bc9a89513483052f73ca056136020960ba35eb35957585cacdb4ec5ba3f1444d8e468d3737e336d4bc18247ac90fc35988f52912f7c
-      # SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+     SOURCE_HASH=sha512:548414b5391aa9eb6426e3bc7f3fd5fb98e9a8c41e775288d0d58e88b02d31e0d8a26ceb46e07bc2c1846377ee61c21596b2e51072f9fd976e92dfc6781d2339
       LICENSE[0]=GPL
         KEYWORDS="irc chat"
            SHORT="bitlbee - an IRC gateway to IM chat networks"
diff --git a/chat-irc/bitlbee/HISTORY b/chat-irc/bitlbee/HISTORY
index 8fc45e09df..30cb456a81 100644
--- a/chat-irc/bitlbee/HISTORY
+++ b/chat-irc/bitlbee/HISTORY
@@ -1,3 +1,7 @@
+2010-10-22 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
+	* DETAILS: updated spell to 3.0
+	* CONFIGURE: added twitter
+
 2010-06-08 Robert Figura <template@sourcemage.org>
 	* DETAILS: Updated to 1.2.7
 
diff --git a/chat-irc/bitlbee/bitlbee-1.2.4.tar.gz.sig b/chat-irc/bitlbee/bitlbee-1.2.4.tar.gz.sig
deleted file mode 100644
index f863ef711b..0000000000
--- a/chat-irc/bitlbee/bitlbee-1.2.4.tar.gz.sig
+++ /dev/null
diff --git a/collab/cola/DETAILS b/collab/cola/DETAILS
index 77184ba2fa..ada3ef0a64 100755
--- a/collab/cola/DETAILS
+++ b/collab/cola/DETAILS
@@ -1,8 +1,8 @@
            SPELL=cola
-         VERSION=1.4.2.4
+         VERSION=1.4.2.5
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://${SPELL}.tuxfamily.org/releases/${SOURCE}
-     SOURCE_HASH=sha512:d2a6e6439ed26a755b9aadf6043ff95a3feac34da11521d23940d97ab6c3ef51600e0d1493eef1301431a95a4fd3f9439de2e84b676713d94f548fea0ef30350
+     SOURCE_HASH=sha512:f72944661953f40d0f28b5d87ecfc5bff33db63fbc0892383a0e1340c8b2aecb3bf167cad714511e8d30ed8425afd7ffb75605cac1f00ea2ff60c1663f8fba20
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://cola.tuxfamily.org"
       LICENSE[0]=GPL2
diff --git a/collab/cola/HISTORY b/collab/cola/HISTORY
index dac6a5e67e..594c2fca2f 100644
--- a/collab/cola/HISTORY
+++ b/collab/cola/HISTORY
@@ -1,3 +1,6 @@
+2010-10-21 Bor Kraljič <pyrobor@ver.si>
+	* DETAILS: updated spell to 1.4.2.5
+
 2010-09-02 Bor Kraljič <pyrobor@ver.si>
 	* DETAILS: updated spell to 1.4.2.4
 
diff --git a/devel/bisonc++/DETAILS b/devel/bisonc++/DETAILS
index 27981b79da..fdcf9e9b20 100755
--- a/devel/bisonc++/DETAILS
+++ b/devel/bisonc++/DETAILS
@@ -1,6 +1,6 @@
            SPELL=bisonc++
-         VERSION=2.5.1
-     SOURCE_HASH=sha512:370c10bfd00039e2b586e2f06e537179f29590f58708a3a62b56843da88c1033032816ef1a4c929c805c051635a6a3008e6bc04f6e5c3ad2bb794113fa14f371
+         VERSION=2.8.0
+     SOURCE_HASH=sha512:e001c4bf509f8c32c5ff807870cbc5561ef3b4206561ed6569ac15c42d6eb000bae006a1d84dac60808c5c42533b2b5b84d3a05f240cdfdc97897ec2a4580d52
           SOURCE=${SPELL}_${VERSION//-?/}.orig.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION//-?}
    SOURCE_URL[0]=$SOURCEFORGE_URL/bisoncpp/$SOURCE
diff --git a/devel/bisonc++/HISTORY b/devel/bisonc++/HISTORY
index 8d8cf51227..529f289936 100644
--- a/devel/bisonc++/HISTORY
+++ b/devel/bisonc++/HISTORY
@@ -1,3 +1,6 @@
+2010-10-21 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2.8.0
+
 2010-03-26 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 2.5.1
 
diff --git a/devel/bobcat/DETAILS b/devel/bobcat/DETAILS
index 9466179057..e1b762919f 100755
--- a/devel/bobcat/DETAILS
+++ b/devel/bobcat/DETAILS
@@ -1,6 +1,6 @@
            SPELL=bobcat
-         VERSION=2.07.02
-     SOURCE_HASH=sha512:6b6f669cc702b396208d72b448a66d9c9c2c2e30df4f1e332ace80b7508f5b0a8654dd4e8ddcb2fdc03520611c258f67d418c38fba7ee3c4d52a1d601cfe003e
+         VERSION=2.08.01
+     SOURCE_HASH=sha512:bab5016ce590854773345bce2aa78cf05d157c7b680e66a613a88ea26eefc7405993c0a1045a5a91c3461fbbf2a265d47602dcda00c92609a3ada767570ecc91
           SOURCE=${SPELL}_${VERSION}.orig.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/devel/bobcat/HISTORY b/devel/bobcat/HISTORY
index bb164ff3a8..7735244cbf 100644
--- a/devel/bobcat/HISTORY
+++ b/devel/bobcat/HISTORY
@@ -1,3 +1,6 @@
+2010-10-21 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2.08.01
+
 2010-02-24 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 2.07.02
 
diff --git a/devel/cppcheck/BUILD b/devel/cppcheck/BUILD
new file mode 100755
index 0000000000..c9dda20535
--- /dev/null
+++ b/devel/cppcheck/BUILD
@@ -0,0 +1 @@
+make PREFIX=${INSTALL_ROOT}/usr
diff --git a/devel/cppcheck/DEPENDS b/devel/cppcheck/DEPENDS
new file mode 100755
index 0000000000..fd0b0eb3e6
--- /dev/null
+++ b/devel/cppcheck/DEPENDS
@@ -0,0 +1 @@
+depends g++
diff --git a/devel/cppcheck/DETAILS b/devel/cppcheck/DETAILS
new file mode 100755
index 0000000000..222e0e5f06
--- /dev/null
+++ b/devel/cppcheck/DETAILS
@@ -0,0 +1,16 @@
+           SPELL=cppcheck
+         VERSION=1.45
+          SOURCE="${SPELL}-${VERSION}.tar.bz2"
+   SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
+     SOURCE_HASH=sha512:c0708a3b09d9a314554dc2ab766435d47826c14bda54db7fbac12531744a1449465cbab6c3078112720b0050d8851dffa99833740edfdfb0829fff2c8a507728
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://sourceforge.net/apps/mediawiki/cppcheck/index.php?title=Main_Page"
+      LICENSE[0]=GPL
+         ENTERED=20101021
+           SHORT="A tool for static C/C++ code analysis"
+cat << EOF
+Cppcheck is an analysis tool for C/C++ code. Unlike C/C++ compilers and many
+other analysis tools, we don't detect syntax errors. Cppcheck only detects
+the types of bugs that the compilers normally fail to detect.  The goal is
+no false positives.
+EOF
diff --git a/devel/cppcheck/HISTORY b/devel/cppcheck/HISTORY
new file mode 100644
index 0000000000..0d6d5bb8f6
--- /dev/null
+++ b/devel/cppcheck/HISTORY
@@ -0,0 +1,3 @@
+2010-10-21 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DETAILS, INSTALL, DEPENDS: spell created
+
diff --git a/devel/cppcheck/INSTALL b/devel/cppcheck/INSTALL
new file mode 100755
index 0000000000..621f3f869f
--- /dev/null
+++ b/devel/cppcheck/INSTALL
@@ -0,0 +1 @@
+make PREFIX=${INSTALL_ROOT}/usr install
diff --git a/devel/diffuse/DETAILS b/devel/diffuse/DETAILS
index d9c0b3b33e..26f96acda3 100755
--- a/devel/diffuse/DETAILS
+++ b/devel/diffuse/DETAILS
@@ -1,8 +1,8 @@
            SPELL=diffuse
-         VERSION=0.4.3
+         VERSION=0.4.4
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:e529d9b4babc538881e5eae374b6b0f9ea1752cc43a0a98d4d2fa3322373be52bbfaecca4c0a8a7d254e2958e72ad736f0ce59fe17c9c7bc6548e2788b9ed59f
+     SOURCE_HASH=sha512:5e783ea1259102303cf06567cfc03d0e5060a400e121493a7370bbea1ba69351bdb73e35ec7311dbbb930cc6c2839e3165f9c67619fb71688dbcf8d4d85956ec
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://diffuse.sourceforge.net/
       LICENSE[0]=GPL
diff --git a/devel/diffuse/HISTORY b/devel/diffuse/HISTORY
index f09283558e..4af1a328a8 100644
--- a/devel/diffuse/HISTORY
+++ b/devel/diffuse/HISTORY
@@ -1,3 +1,6 @@
+2010-10-22 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 0.4.4
+
 2010-04-15 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 0.4.3
 
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index 766c0c586d..b177ef61e1 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,5 +1,5 @@
            SPELL=git
-         VERSION=1.7.3.1
+         VERSION=1.7.3.2
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sign
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 5c8287e8c8..d4cdd7e40a 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2010-10-23 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 1.7.3.2
+
 2010-09-30 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 1.7.3.1
 
diff --git a/devel/icmake/DETAILS b/devel/icmake/DETAILS
index fb5d94bfae..561d6e5d41 100755
--- a/devel/icmake/DETAILS
+++ b/devel/icmake/DETAILS
@@ -1,6 +1,6 @@
            SPELL=icmake
-         VERSION=7.12.3
-     SOURCE_HASH=sha512:12635bf988231faeb5f15e0d096bb1f609496ed7dfc520d51a533837746a1faf974b3cb60883a4786d5d3fec5a3accb58c5c0a7cb1ab76a1d8c51bde7ab3b9fa
+         VERSION=7.12.5
+     SOURCE_HASH=sha512:ad0c7e0f95e0017ddb9ff36f144c00d857e3a7b3e115c451f63569e7cba9bfa104c3456e07906ba3e061ad0e4fe581356a5ec47998ea00434245d29b62ce23a5
           SOURCE=${SPELL}_${VERSION//-?}.orig.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION/-?/}
         WEB_SITE=http://sourceforge.net/projects/icmake/
diff --git a/devel/icmake/HISTORY b/devel/icmake/HISTORY
index bbd176a65b..2b1768ff28 100644
--- a/devel/icmake/HISTORY
+++ b/devel/icmake/HISTORY
@@ -1,3 +1,6 @@
+2010-10-21 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 7.12.5
+
 2009-10-19 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 7.12.3
 
diff --git a/devel/qt-creator/DETAILS b/devel/qt-creator/DETAILS
index fe1f55e3e3..8aa5e04431 100755
--- a/devel/qt-creator/DETAILS
+++ b/devel/qt-creator/DETAILS
@@ -1,7 +1,7 @@
            SPELL=qt-creator
-         VERSION=1.3.1
-     SOURCE_HASH=sha512:45872ffa2c95c32c6e24e117114d9961dfb5b49539ecf2edea6625e758702aa89ae8a824cb00bf930d104809782d102eea9f45ad24fb2e349992038cdd41f399
-          SOURCE=$SPELL-$VERSION-src.tar.gz
+         VERSION=2.0.1
+     SOURCE_HASH=sha512:13af6eab029903b23e23c8196c981823c15ca8b02a6d49a2cc412e9d59d81500cbf4deffb5c5ae2470f04f5e3f261151ae732b21eb126450953d38aa18c24791
+          SOURCE=$SPELL-$VERSION-src.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-src
         WEB_SITE=http://www.qtsoftware.com/downloads
    SOURCE_URL[0]=ftp://ftp.trolltech.com/qtcreator/$SOURCE
diff --git a/devel/qt-creator/HISTORY b/devel/qt-creator/HISTORY
index 0316f3c619..bfcf24e5cb 100644
--- a/devel/qt-creator/HISTORY
+++ b/devel/qt-creator/HISTORY
@@ -1,3 +1,6 @@
+2010-10-21 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DETAILS: version 2.0.1
+
 2010-04-08 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* DETAILS: version 1.3.1
 
diff --git a/devel/qt4pas/DETAILS b/devel/qt4pas/DETAILS
index 6372ed3dbb..398b47d0e1 100755
--- a/devel/qt4pas/DETAILS
+++ b/devel/qt4pas/DETAILS
@@ -1,6 +1,6 @@
            SPELL=qt4pas
-         VERSION=V2.2
-     SOURCE_HASH=sha512:0a45666ba626cd7d55175b151decf19a6f38aef630492c56b4a67c9928fcb4dbc02dc547f8352482b8940df4a7112f18a1c85cf0afe11390104ae0cd1c63b0ea
+         VERSION=V2.3RC
+     SOURCE_HASH=sha512:f8d27217eb340696168c7dda3e43c4bf895265017db7804c8662cca417371ae1011aaf121f0df620e3e9444fe7cb74815b48898547fc7a00b09980f567adea87
              VQT=Qt4.6.3
               VX=${VERSION}_${VQT}
           SOURCE=$SPELL-$VX.tar.gz
diff --git a/devel/qt4pas/HISTORY b/devel/qt4pas/HISTORY
index 1c23532bc5..cbaf462d80 100644
--- a/devel/qt4pas/HISTORY
+++ b/devel/qt4pas/HISTORY
@@ -1,3 +1,7 @@
+2010-10-20 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version V2.3RC
+	  previous V2.2 has been withdrawn
+
 2010-07-24 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version V2.2
 
diff --git a/disk/cdrkit/DETAILS b/disk/cdrkit/DETAILS
index c2c9f9443b..f758f9c2bc 100755
--- a/disk/cdrkit/DETAILS
+++ b/disk/cdrkit/DETAILS
@@ -1,6 +1,6 @@
            SPELL=cdrkit
-         VERSION=1.1.10
-     SOURCE_HASH=sha512:970091061f7ac6418ea93160ea2b1aabdd77fe1ab1351f45b1a198bcbcacf921b6b3c20ab23465f24dd9517f2e262590f6b6803d3207349fac55d4a523b79f82
+         VERSION=1.1.11
+     SOURCE_HASH=sha512:e5afcd2cb68d39aeff680a0d5b0a7877f94cf6de111b3cb7388261c665fbd3209ce98a20a01911875af7d6b832a156801b1fa46a4481f7c8ba60b22eac0a5b05
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://cdrkit.org/releases/$SOURCE
diff --git a/disk/cdrkit/HISTORY b/disk/cdrkit/HISTORY
index 19ea05c8d5..5cbc0ea614 100644
--- a/disk/cdrkit/HISTORY
+++ b/disk/cdrkit/HISTORY
@@ -1,3 +1,6 @@
+2010-10-23 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated to version 1.1.11
+
 2010-01-25 George Sherwood <gsherwood@sourcemage.org>
 	* DETAILS: Updated to version 1.1.10
 	* PRE_BUILD: Removed
diff --git a/disk/hdparm/DETAILS b/disk/hdparm/DETAILS
index 96cbaf0264..c9533906d0 100755
--- a/disk/hdparm/DETAILS
+++ b/disk/hdparm/DETAILS
@@ -1,6 +1,6 @@
            SPELL=hdparm
-         VERSION=9.33
-     SOURCE_HASH=sha512:ed8e6fc8374897f0c98c846efab578f8f40416b2f66f5626ba761ef5b256bd19e46417ac94ad2e755d9493d4a383a901a86af695a66436330b5ef60a643b68b4
+         VERSION=9.35
+     SOURCE_HASH=sha512:0a8160b3adcfc455b26203043468e3acdf4f976df027e3915850567873e37dc9e500f1413f4226f0867d14463fed20e25c55b2d234f347cee5bd1ef02a0e81e7
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/disk/hdparm/HISTORY b/disk/hdparm/HISTORY
index 6486917336..cebc578769 100644
--- a/disk/hdparm/HISTORY
+++ b/disk/hdparm/HISTORY
@@ -1,3 +1,6 @@
+2010-10-20 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 9.35
+
 2010-10-07 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 9.33
 
diff --git a/disk/libburn/DETAILS b/disk/libburn/DETAILS
index 2d6e06d469..b143f80bfa 100755
--- a/disk/libburn/DETAILS
+++ b/disk/libburn/DETAILS
@@ -12,8 +12,8 @@ if [[ $LIBBURN_SVN == y ]]; then
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
    SOURCE_IGNORE=volatile
 else
-         VERSION=0.8.6
-      SOURCE_HASH=sha512:2dd7abbc4efb4737fd5a758ab8b0c3b20431b4e6da9937714d09e8edae3bd389519b3588268f4902c1cdd4c424377589118046336a73d25362b1e69d9ca9ed46
+         VERSION=0.8.8
+      SOURCE_HASH=sha512:b895deb24a00ded1e2db15e3ff47dfb463674010b53f3f62718b8281196c4d6e129b72e1cd2000fde5f4ad41296e2f4ea0c272ecefd015cb8c69460ef6b9ed4c
           SOURCE=$SPELL-$VERSION.pl00.tar.gz
    SOURCE_URL[0]=http://files.libburnia-project.org/releases/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/libburn/HISTORY b/disk/libburn/HISTORY
index 1720fa55a6..f50f796790 100644
--- a/disk/libburn/HISTORY
+++ b/disk/libburn/HISTORY
@@ -1,3 +1,6 @@
+2010-10-21 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 0.8.8
+
 2010-09-18 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 0.8.6
 
diff --git a/doc/man-pages/DETAILS b/doc/man-pages/DETAILS
index 203005e617..d1765ba84f 100755
--- a/doc/man-pages/DETAILS
+++ b/doc/man-pages/DETAILS
@@ -1,5 +1,5 @@
            SPELL=man-pages
-         VERSION=3.28
+         VERSION=3.29
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sign
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/doc/man-pages/HISTORY b/doc/man-pages/HISTORY
index 129ddb604a..1927e3a621 100644
--- a/doc/man-pages/HISTORY
+++ b/doc/man-pages/HISTORY
@@ -1,3 +1,6 @@
+2010-10-20 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 3.29
+
 2010-10-04 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 3.28
 
diff --git a/doc/po4a/DETAILS b/doc/po4a/DETAILS
index a120a591de..67652e29c7 100755
--- a/doc/po4a/DETAILS
+++ b/doc/po4a/DETAILS
@@ -1,9 +1,9 @@
            SPELL=po4a
-         VERSION=0.40
+         VERSION=0.40.1
           SOURCE="${SPELL}-${VERSION}.tar.gz"
-   SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3325/${SOURCE}
-     SOURCE_HASH=sha512:d1d76a9125b1b8c50d45043925d504c2b0470ea1260e980e687042b826aaedd723e247a7c9f41df5a4ba2e27df9bec78f15a0b642ac66f7db87bdff8ee4db366
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-$VERSION"
+   SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3341/${SOURCE}
+     SOURCE_HASH=sha512:bb84d6f80599c1931c70a0063a70229e46eb2dfd14077f860059ef5546d515366378e513e7dcbc171e4c48788a9ab9bda8fbd57287f19edc8c17d79f6721a952
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-v$VERSION"
         WEB_SITE=http://alioth.debian.org/projects/po4a/
       LICENSE[0]=GPL
          ENTERED=20070104
diff --git a/doc/po4a/HISTORY b/doc/po4a/HISTORY
index c3526bd038..c5208112bc 100644
--- a/doc/po4a/HISTORY
+++ b/doc/po4a/HISTORY
@@ -1,3 +1,6 @@
+2010-10-24 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DETAILS: version 0.40.1
+
 2010-08-03 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 0.40, SOURCE_DIRECTORY updated
 	* PRE_BUILD: added
diff --git a/doc/yodl/DETAILS b/doc/yodl/DETAILS
index ca250b8670..29f03cb8d2 100755
--- a/doc/yodl/DETAILS
+++ b/doc/yodl/DETAILS
@@ -1,6 +1,6 @@
            SPELL=yodl
-         VERSION=2.15.1
-     SOURCE_HASH=sha512:f813be1bc26b1b4300a5cbf7fde30b30e11c8154d6de6e67462768d8a3f66dedfe3be4eb407aaf13a9755d7e65f6bd0190ef1ced52eba5954fd97ea5bd07274b
+         VERSION=2.15.2
+     SOURCE_HASH=sha512:8aa8ea3876c6e40b3ec73a98b409974fcf700400430fcbd7ac425b7df0fff9c365685a1f32c772086833d7b16a7b0c9b506045e4d15603de72010dc9ce24f9a0
           SOURCE=${SPELL}_${VERSION}.orig.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/doc/yodl/HISTORY b/doc/yodl/HISTORY
index a09c4f3af5..865b91e283 100644
--- a/doc/yodl/HISTORY
+++ b/doc/yodl/HISTORY
@@ -1,3 +1,6 @@
+2010-10-21 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2.15.2
+
 2009-10-19 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 2.15.1
 
diff --git a/ftp/qbittorrent/DETAILS b/ftp/qbittorrent/DETAILS
index 04356b8d5b..b57434b9fe 100755
--- a/ftp/qbittorrent/DETAILS
+++ b/ftp/qbittorrent/DETAILS
@@ -1,8 +1,8 @@
            SPELL=qbittorrent
-         VERSION=2.4.6
+         VERSION=2.4.7
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:f9f1eae32e1223b36c99e518a5829c72c8ff245cf768145b99884b7d8a2f9103eec5616e41340b4d94db90726c17f1f6c8202f37d4f769c540b2ac6536e8d635
+     SOURCE_HASH=sha512:d4d4433b85f1c7a24359a6151e65669c50f8beeb55f0c5df1441ea333c9022d7a9647d6b6053a0d8976435a1c3dee307696837b3ea46025163526172d82c4d09
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE="http://www.qbittorrent.org/"
          LICENSE=GPL
diff --git a/ftp/qbittorrent/HISTORY b/ftp/qbittorrent/HISTORY
index 9cde7838af..eadc8d7caa 100644
--- a/ftp/qbittorrent/HISTORY
+++ b/ftp/qbittorrent/HISTORY
@@ -1,3 +1,6 @@
+2010-10-23 Bor Kraljič <pyrobor@ver.si>
+	* DETAILS: updated spell to 2.4.7
+
 2010-10-18 Bor Kraljič <pyrobor@ver.si>
 	* DEPENDS: added optional_depends geoip, libnotify & removed zziplib
 	* BUILD: use flags from optional_depends in configure
diff --git a/gnome2-apps/epiphany/DEPENDS b/gnome2-apps/epiphany/DEPENDS
index 208ac014bc..81e9df2213 100755
--- a/gnome2-apps/epiphany/DEPENDS
+++ b/gnome2-apps/epiphany/DEPENDS
@@ -1,6 +1,11 @@
 depends iso-codes                &&
 depends dbus-glib                &&
-depends webkitgtk                &&
+if [[ "$EPIPHANY_DEVEL" == "n" ]]; then
+   depends webkitgtk
+else
+   depends webkitgtk3
+   depends gsettings-desktop-schemas
+fi &&
 depends startup-notification     &&
 depends libgnome-keyring         &&
 depends -sub SOUP_GNOME libsoup  &&
diff --git a/gnome2-apps/epiphany/DETAILS b/gnome2-apps/epiphany/DETAILS
index a41d7c9609..0f46aee686 100755
--- a/gnome2-apps/epiphany/DETAILS
+++ b/gnome2-apps/epiphany/DETAILS
@@ -1,6 +1,6 @@
            SPELL=epiphany
 if [[ "$EPIPHANY_DEVEL" == "y" ]]; then
-         VERSION=2.31.3
+         VERSION=2.91.1.1
 else
          VERSION=2.30.6
 fi
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index bf818497e2..f4e7a4a018 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,7 @@
+2010-10-22 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated devel to version 2.91.1.1
+	* DEPENDS: devel depends webkitgtk3, gsettings-desktop-schemas
+
 2010-09-16 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 2.30.6
 
diff --git a/gnome2-apps/epiphany/epiphany-2.31.3.tar.bz2.sig b/gnome2-apps/epiphany/epiphany-2.31.3.tar.bz2.sig
deleted file mode 100644
index 704a0e1943..0000000000
--- a/gnome2-apps/epiphany/epiphany-2.31.3.tar.bz2.sig
+++ /dev/null
diff --git a/gnome2-apps/epiphany/epiphany-2.91.1.1.tar.bz2.sig b/gnome2-apps/epiphany/epiphany-2.91.1.1.tar.bz2.sig
new file mode 100644
index 0000000000..4e995173a9
--- /dev/null
+++ b/gnome2-apps/epiphany/epiphany-2.91.1.1.tar.bz2.sig
diff --git a/gnome2-libs/gsettings-desktop-schemas/DEPENDS b/gnome2-libs/gsettings-desktop-schemas/DEPENDS
new file mode 100755
index 0000000000..6826bc7952
--- /dev/null
+++ b/gnome2-libs/gsettings-desktop-schemas/DEPENDS
@@ -0,0 +1 @@
+depends perl
diff --git a/gnome2-libs/gsettings-desktop-schemas/DETAILS b/gnome2-libs/gsettings-desktop-schemas/DETAILS
new file mode 100755
index 0000000000..1a1a0a4a24
--- /dev/null
+++ b/gnome2-libs/gsettings-desktop-schemas/DETAILS
@@ -0,0 +1,15 @@
+           SPELL=gsettings-desktop-schemas
+         VERSION=0.0.1
+          SOURCE="${SPELL}-${VERSION}.tar.bz2"
+   SOURCE_URL[0]=$GNOME_URL/sources/${SPELL}/0.0/${SOURCE}
+     SOURCE_HASH=sha512:66577fb0ea516f9048205173af53bfb8d36b2f2f68363533fd0625092018b948423e49163fa54af37b5c16714bd8f2931c9c173f50162c8b7a1878f24cf9ed01
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://www.gnome.org/"
+      LICENSE[0]="GPL"
+         ENTERED=20101022
+        KEYWORDS=""
+           SHORT="gsettings schemas for gnome"
+cat << EOF
+collection of GSettings schemas for settings shared by various 
+components of a desktop.
+EOF
diff --git a/gnome2-libs/gsettings-desktop-schemas/HISTORY b/gnome2-libs/gsettings-desktop-schemas/HISTORY
new file mode 100644
index 0000000000..f1cd7c19b4
--- /dev/null
+++ b/gnome2-libs/gsettings-desktop-schemas/HISTORY
@@ -0,0 +1,3 @@
+2010-10-22 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS, DEPENDS: spell created
+
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index fc716de1a9..ed862b35a4 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
            SPELL=imagemagick
-         VERSION=6.6.5-0
+         VERSION=6.6.5-2
   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:86c950ee816ae010a62356a2ba93d376ea80d8ab3e7e705b508f1d190e52fa22d53f64b58524af3ccdbad4dd36c7fbbb619523ce8346713400ec0c10ecb19b6f
+     SOURCE_HASH=sha512:f567fbad99af3ea456e41b5ce92e3d429ee6e943343fd13df65d9f1984b1c82b5abccbad1715b346d9e9bf14592441806f5b0f9f8df25aad27aca42c9da4ef72
           CCACHE="off"
         WEB_SITE=http://www.imagemagick.org/
          ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 59f9f0063b..902e9f5a9a 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2010-10-23 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated to version 6.6.5-2
+
 2010-10-16 George Sherwood <gsherwood@sourcemage.org>
 	* DETAILS: Updated to version 6.6.5-0
 
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index 6d36728f98..8b29de3437 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,6 @@
+2010-10-23 Vlad Glagolev <stealth@sourcemage.org>
+	* init.d/apache: added graceful reload function
+
 2010-10-18 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 2.2.17
 
diff --git a/http/apache22/init.d/apache b/http/apache22/init.d/apache
index 3cabf2373c..df0f0c4786 100755
--- a/http/apache22/init.d/apache
+++ b/http/apache22/init.d/apache
@@ -49,5 +49,7 @@ status()
 
 reload()
 {
-  run_func restart
+  echo "Gracefully reloading Apache web server..."
+  /usr/sbin/apachectl graceful
+  evaluate_retval
 }
diff --git a/http/librosprite/DETAILS b/http/librosprite/DETAILS
index c740fee3e0..9ebf6be006 100755
--- a/http/librosprite/DETAILS
+++ b/http/librosprite/DETAILS
@@ -5,11 +5,11 @@ else
          VERSION=scm
 fi
           SOURCE="${SPELL}-scm.tar.bz2"
-   SOURCE_URL[0]=svn://svn.rjek.com/jshaw/libsprite/trunk:${SPELL}-scm
+   SOURCE_URL[0]=svn://svn.netsurf-browser.org/trunk/librosprite:${SPELL}-scm
   FORCE_DOWNLOAD=on
    SOURCE_IGNORE=volatile
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
-        WEB_SITE="http://www.datumedge.co.uk/librosprite/"
+        WEB_SITE="http://www.netsurf-browser.org/projects/librosprite/"
       LICENSE[0]=MIT
          ENTERED=20090429
            SHORT="a C library that provides support for reading RISC OS sprite files"
diff --git a/http/librosprite/HISTORY b/http/librosprite/HISTORY
index b681610bda..007966a058 100644
--- a/http/librosprite/HISTORY
+++ b/http/librosprite/HISTORY
@@ -1,3 +1,6 @@
+2010-10-20 Bor Kraljič <pyrobor@ver.si>
+	* DETAILS: fixed SOURCE_URL & WEB_SITE
+
 2009-04-29 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
 	* BUILD, DETAILS, INSTALL: spell created
 
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index df654a2971..0f59fab8c8 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,12 +1,12 @@
            SPELL=seamonkey
-         VERSION=2.0.8
+         VERSION=2.0.9
           SOURCE=$SPELL-$VERSION.source.tar.bz2
-     SOURCE_HASH=sha512:222a596e846e14050fb2dfd16bc5db63d3ea1ea031ff704435c53d7a01abb051356b54e4adcab894c6f9a14c58f9d3e326cf6cca75fbfc78bc52e628e315da0f
+     SOURCE_HASH=sha512:34e74db649572d56270321042466c7eb62a77f6cacaa9a1d2bb065d31b5f765def2aeea9bb47795c9e03410dea8f343e248575929b7f55110429e84119f06254
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
       SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
    SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
         WEB_SITE=http://www.seamonkey-project.org/
-  SECURITY_PATCH=26
+  SECURITY_PATCH=27
          ENTERED=20010922
       LICENSE[0]=MPL
             DOCS="LICENSE README.txt"
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 0f0d134e51..230995e512 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,6 @@
+2010-10-21 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 2.0.9, SECURITY_PATCH=27
+
 2010-09-16 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 2.0.8
 
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index 27f4164827..d9901b790f 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,9 +1,9 @@
            SPELL=webkitgtk
 if [[ $WEBKITGTK_NIGHT == "y" ]]; then
-         VERSION=1.3.4
+         VERSION=1.3.5
           SOURCE=webkit-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
-     SOURCE_HASH=sha512:ebdd3309af6d4e6725e781bf6fb788f56e3c992ebcde8a6bd75c75db29803dd0a5f52c6b47338378b5622fa6763943081b247ea3df4265990ea9752e0c5a1a66
+     SOURCE_HASH=sha512:90b1b3ab39f58c63afbc950d906eadd436d85628d1a84f901bacb60af980c675ca66a34fff0553e2682fa6015d6f5061efba5b680f664f6236b63dfde52dcad0
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
 else
          VERSION=1.2.5
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 41b970f051..d5dda6ec25 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,6 @@
+2010-10-22 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated devel to 1.3.5
+
 2010-10-10 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 1.2.5, SECURITY_PATCH=2, #15882
 
diff --git a/http/webkitgtk3/DETAILS b/http/webkitgtk3/DETAILS
index 8e11eb1f79..a4d737049b 100755
--- a/http/webkitgtk3/DETAILS
+++ b/http/webkitgtk3/DETAILS
@@ -1,9 +1,10 @@
            SPELL=webkitgtk3
-         VERSION=r69918
-          SOURCE=WebKit-$VERSION.tar.bz2
-   SOURCE_URL[0]=http://builds.nightly.webkit.org/files/trunk/src/$SOURCE
-     SOURCE_HASH=sha512:0c2ab6267deb82eb1375df29b77b8625826e03bd85b0eca1bbf0335c317a22d7753c12c465efb09a8eeceb928fe03ee9d7cf3f4c59a9234382ef56a2379f7323
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/WebKit-$VERSION"
+         VERSION=1.3.5
+          SOURCE=webkit-$VERSION.tar.gz
+   SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
+     SOURCE_HASH=sha512:90b1b3ab39f58c63afbc950d906eadd436d85628d1a84f901bacb60af980c675ca66a34fff0553e2682fa6015d6f5061efba5b680f664f6236b63dfde52dcad0
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
+fi
         WEB_SITE=http://webkitgtk.org/
      GATHER_DOCS=off
       LICENSE[0]=GPL
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index ad9c98b342..bde47c46e7 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,2 +1,7 @@
+2010-10-22 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated to version 1.3.5. Updated SOURCE_URL & SOURCE
+	  Updated SOURCE_DIRECTORY
+	* PRE_BUILD: Removed.  Not needed for released source.
+
 2010-10-17 George Sherwood <gsherwood@sourcemage.org>
 	* All: Created spell
diff --git a/http/webkitgtk3/PRE_BUILD b/http/webkitgtk3/PRE_BUILD
deleted file mode 100755
index 1304cb3579..0000000000
--- a/http/webkitgtk3/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-
-cd $SOURCE_DIRECTORY &&
-
-./autogen.sh
diff --git a/i18n/m17n-lib/DEPENDS b/i18n/m17n-lib/DEPENDS
index b6192dc3f1..b30121980a 100755
--- a/i18n/m17n-lib/DEPENDS
+++ b/i18n/m17n-lib/DEPENDS
@@ -28,7 +28,7 @@ optional_depends anthy \
 #		"--without-libotf" \
 #		"OpenType font support" &&
 
-optional_depends -sub libxft X11-SERVER \
+optional_depends libxft \
                  "--with-x" \
                  "--without-x" \
                  "X windows and Xft support"
diff --git a/i18n/m17n-lib/HISTORY b/i18n/m17n-lib/HISTORY
index ad8a0fcc35..6d73b399be 100644
--- a/i18n/m17n-lib/HISTORY
+++ b/i18n/m17n-lib/HISTORY
@@ -1,3 +1,6 @@
+2010-10-21 Bor Kraljič <pyrobor@ver.si>
+	* DEPENDS: fixed optional_depends to libxft
+
 2009-05-24 Justin Boffemmyer <flux@sourcemage.org>
 	* DETAILS: updated to 1.5.4
 
diff --git a/kde4-support/akonadi/DETAILS b/kde4-support/akonadi/DETAILS
index 8a57ef2ade..20cdbec274 100755
--- a/kde4-support/akonadi/DETAILS
+++ b/kde4-support/akonadi/DETAILS
@@ -1,6 +1,6 @@
            SPELL=akonadi
-         VERSION=1.4.0
-     SOURCE_HASH=sha512:7de477c106b3dcc9eb04acd186507e29598db948e2845332dc741542c4bc9d52f2d9cf6f6586bb42f8409688e4b3f3e07c65ade946346a1b47e5d738ef8431e3
+         VERSION=1.4.1
+     SOURCE_HASH=sha512:ea14a29bcefd81bc9b07bad652d48c62533c9d528c7c028495364058a6e6d3f945608a8f2599f8f41ca2a688feb6be50f8959bd929b407c60eafca23601b95b5
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://download.akonadi-project.org/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/kde4-support/akonadi/HISTORY b/kde4-support/akonadi/HISTORY
index 4ca45401b1..ae6362ba95 100644
--- a/kde4-support/akonadi/HISTORY
+++ b/kde4-support/akonadi/HISTORY
@@ -1,3 +1,6 @@
+2010-10-23 Bor Kraljič <pyrobor@ver.si>
+	* DETAILS: updated spell to 1.4.1
+
 2010-08-31 Bor Kraljič <pyrobor@ver.si>
 	* DETAILS: updated spell to 1.4.0
 
diff --git a/kde4/kdepim4-runtime/DETAILS b/kde4/kdepim4-runtime/DETAILS
index 8b99ad5785..2a2c269dd5 100755
--- a/kde4/kdepim4-runtime/DETAILS
+++ b/kde4/kdepim4-runtime/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdepim4-runtime
           SPELLX=${SPELL//4}
-         VERSION=4.4.6
-     SOURCE_HASH=sha512:4e936a882118e8c841b4294e58d434f553948f7f8b7f1cb0dacc8253f8356655af1e08745494b454d0065035876459792448ca2f2ce27c445e230f518fa83ae4
+         VERSION=4.4.7
+     SOURCE_HASH=sha512:50c491b76d800d97b02280d798ecabe7534939d7500338c81286c3dd9d940565f6b0616c1199f25a46b2b82924ac4a4b6944e9ee2649781848f687277921e660
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/kdepim-$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdepim4-runtime/HISTORY b/kde4/kdepim4-runtime/HISTORY
index 348d737b55..f168d751c7 100644
--- a/kde4/kdepim4-runtime/HISTORY
+++ b/kde4/kdepim4-runtime/HISTORY
@@ -1,3 +1,6 @@
+2010-10-22 Bor Kraljič <pyrobor@ver.si>
+	* DETAILS: updated spell to 4.4.7
+
 2010-09-10 Bor Kraljič <pyrobor@ver.si>
 	* DETAILS: updated spell to 4.4.6
 	  Fixed SOURCE_URL[0]
diff --git a/kde4/kdepim4/DETAILS b/kde4/kdepim4/DETAILS
index efccb68cbb..b57766f529 100755
--- a/kde4/kdepim4/DETAILS
+++ b/kde4/kdepim4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdepim4
           SPELLX=${SPELL//4}
-         VERSION=4.4.6
-     SOURCE_HASH=sha512:90adf97f2d5fbd1f9648f7e0b7e06a3a723ce029bf81bea976a5981c81c68a89b472b9432a018b54a1aec725a495a3b8285ef5304d6b8542b689efa4dcb17377
+         VERSION=4.4.7
+     SOURCE_HASH=sha512:b38a20ce609bf7bd44377c0a0e2906122741ce365b76f00236328371a9a9987c2c441fe587df88c5b96dfbbe9650442a2e701004e4d994f0ddac1bac41a58d8b
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/$SPELLX-$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdepim4/HISTORY b/kde4/kdepim4/HISTORY
index bfcaf78d97..f7ad8be248 100644
--- a/kde4/kdepim4/HISTORY
+++ b/kde4/kdepim4/HISTORY
@@ -1,3 +1,6 @@
+2010-10-22 Bor Kraljič <pyrobor@ver.si>
+	* DETAILS: updated spell to 4.4.7
+
 2010-09-10 Bor Kraljič <pyrobor@ver.si>
 	* DETAILS: updated spell to 4.4.6
 	  Fixed SOURCE_URL[0]
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index a4cad3f873..373e125be8 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,9 @@
+2010-10-21 Ladislav Hagara <hgr@vabo.cz>
+	* latest.defaults: 2.6.36
+	* info/kernels/2.6.36: added
+	* info/patches/PRE_2_6/patch-2.6.36: added
+	* info/patches/maintenance_patches/patch-2.6.36: added
+
 2010-10-02 Ladislav Hagara <hgr@vabo.cz>
 	* info/patches/maintenance_patches/patch-2.6.32.24: added
 
diff --git a/kernels/linux/info/kernels/2.6.36 b/kernels/linux/info/kernels/2.6.36
new file mode 100755
index 0000000000..cc0bee3375
--- /dev/null
+++ b/kernels/linux/info/kernels/2.6.36
@@ -0,0 +1,3 @@
+version="2.6.36"
+source="linux-${version}.tar.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
diff --git a/kernels/linux/info/patches/PRE_2_6/patch-2.6.36 b/kernels/linux/info/patches/PRE_2_6/patch-2.6.36
new file mode 100755
index 0000000000..391b554541
--- /dev/null
+++ b/kernels/linux/info/patches/PRE_2_6/patch-2.6.36
@@ -0,0 +1,5 @@
+patchversion="2.6.36"
+source=""
+source_url=""
+appliedkernels="2.6.36"
+md5sum=""
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.36 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.36
new file mode 100755
index 0000000000..391b554541
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.36
@@ -0,0 +1,5 @@
+patchversion="2.6.36"
+source=""
+source_url=""
+appliedkernels="2.6.36"
+md5sum=""
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 3243c95ede..dfd19457b6 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,6 +1,6 @@
-LATEST_2_6=2.6.35
-LATEST_PRE_2_6=patch-2.6.35
-LATEST_maintenance_patches=patch-2.6.35.7
+LATEST_2_6=2.6.36
+LATEST_PRE_2_6=patch-2.6.36
+LATEST_maintenance_patches=patch-2.6.36
 LATEST_git_patches=patch-2.6.25-rc6-git7
 LATEST_2_4=2.4.37.9
 LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/libs/pyqt4/DETAILS b/libs/pyqt4/DETAILS
index 380853c01e..2579e30151 100755
--- a/libs/pyqt4/DETAILS
+++ b/libs/pyqt4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=pyqt4
           SPELLX=PyQt-x11-gpl
-         VERSION=4.7.7
-     SOURCE_HASH=sha512:e839ca7999deea2875e132308190fc84db7454431b78395d9b5b5d0feae90ba9f711679d774fe08ab7c909ba11afef901770312a0cd102732b2a6176aae95431
+         VERSION=4.8
+     SOURCE_HASH=sha512:89c108a8d4e3f5899ba3915ad1bfb2ce15cc6b0415b5803a9bd45a71736e26d84200f50f14179e22946a9290e212674ba6d174bdb17b534b76257a89089d19f3
              URI=PyQt4
           SOURCE=$SPELLX-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/libs/pyqt4/HISTORY b/libs/pyqt4/HISTORY
index 10e9a675cc..570fb6f16e 100644
--- a/libs/pyqt4/HISTORY
+++ b/libs/pyqt4/HISTORY
@@ -1,3 +1,7 @@
+2010-10-23 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 4.8
+	* PRE_BUILD, fix-kdebindings-4.5.2.patch: deleted, now included upstream
+
 2010-10-07 Bor Kraljič <pyrobor@ver.si>
 	* fix-kdebindings-4.5.2.patch: added to fix kdebindings4 compile error
 
diff --git a/libs/pyqt4/PRE_BUILD b/libs/pyqt4/PRE_BUILD
deleted file mode 100755
index 89d70e8aed..0000000000
--- a/libs/pyqt4/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-mk_source_dir $SOURCE_DIRECTORY &&
- unpack_file &&
-patch -p0 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/fix-kdebindings-4.5.2.patch
diff --git a/libs/pyqt4/fix-kdebindings-4.5.2.patch b/libs/pyqt4/fix-kdebindings-4.5.2.patch
deleted file mode 100644
index 49a915f095..0000000000
--- a/libs/pyqt4/fix-kdebindings-4.5.2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- sip/QtCore/qglobal.sip~	2010-09-20 15:10:28.000000000 +0200
-+++ sip/QtCore/qglobal.sip	2010-09-30 15:00:13.804577344 +0200
-@@ -312,12 +312,12 @@ public:
-     // Qt.Alignment class.
-     QFlags operator|(int f);
- %MethodCode
--        sipRes = new QFlags(*a0 | (ENUM(a1)));
-+        sipRes = new QFlags(*a0 | a1);
- %End
- 
-     QFlags operator^(int f);
- %MethodCode
--        sipRes = new QFlags(*a0 ^ (ENUM(a1)));
-+        sipRes = new QFlags(*a0 ^ a1);
- %End
- 
-     // These are necessary to prevent Python comparing object IDs.
diff --git a/libs/sip/DETAILS b/libs/sip/DETAILS
index 9a88f24f2b..121530dad8 100755
--- a/libs/sip/DETAILS
+++ b/libs/sip/DETAILS
@@ -1,6 +1,6 @@
            SPELL=sip
-         VERSION=4.11.1
-     SOURCE_HASH=sha512:f90b5e9ef5adfcf611140fb9c170a6dc627d12cf6b9d9e6bb84bf90f6fcbbda4b54bc8d9a76495f41d53cc3c9ed296fd14e8d3c9a286755106c4feaaeb45cba6
+         VERSION=4.11.2
+     SOURCE_HASH=sha512:2a5c5164b259e731f4ed44b42c3c9d1aa36baa78842d35491dabda29f286ebf86b842a4f7256cc71560bab6fc2e934ac1a8a21caa93bb4ff898a9f8190f96653
              URI=sip4
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/sip/HISTORY b/libs/sip/HISTORY
index de4014db85..aa760361d7 100644
--- a/libs/sip/HISTORY
+++ b/libs/sip/HISTORY
@@ -1,3 +1,6 @@
+2010-10-23 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 4.11.2
+
 2010-09-08 Bor Kraljič <pyrobor@ver.si>
 	* DETAILS: updated spell to 4.11.1
 
diff --git a/mobile/msynctool/DETAILS b/mobile/msynctool/DETAILS
index fb07c59525..29039a4d32 100755
--- a/mobile/msynctool/DETAILS
+++ b/mobile/msynctool/DETAILS
@@ -1,8 +1,8 @@
            SPELL=msynctool
          VERSION=0.22
      SOURCE_HASH=sha512:69bc7e38f8d35e3eaebfb307832eab5e6a47a14197433482c8e1c9ccf6fc05070b0931e4063ad0511909b8a310237fc4bdf838acbd93877c55579499f754027f
-          SOURCE="$SPELL-$VERSION.tar.bz2?rev=&format=raw"
-   SOURCE_URL[0]=http://www.opensync.org/attachment/wiki/download/$SOURCE
+          SOURCE="$SPELL-$VERSION.tar.bz2"
+   SOURCE_URL[0]=http://www.opensync.org/download/releases/$VERSION/$SOURCE
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
         WEB_SITE=http://www.opensync.org/
       LICENSE[0]=LGPL
diff --git a/mobile/msynctool/HISTORY b/mobile/msynctool/HISTORY
index a55c6ce89d..1953137106 100644
--- a/mobile/msynctool/HISTORY
+++ b/mobile/msynctool/HISTORY
@@ -1,9 +1,13 @@
+2010-10-21 Bor Kraljič <pyrobor@ver.si>
+	* DETAILS: fixed SOURCE & SOURCE_URL
+	* HISTORY: fixed typo
+
 2007-05-12 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 0.22
 
 2006-11-10 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
 	* DETAILS: updated spell
 
-2006=10-24 Treeve Jelbert <treeve@sourcemage.org>
+2006-10-24 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 0.19
 	  spell created.
diff --git a/mobile/synce-dccm/BUILD b/mobile/synce-dccm/BUILD
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/mobile/synce-dccm/BUILD
@@ -0,0 +1 @@
+true
diff --git a/mobile/synce-dccm/DETAILS b/mobile/synce-dccm/DETAILS
index 2e6d3596d0..c5ac0818b9 100755
--- a/mobile/synce-dccm/DETAILS
+++ b/mobile/synce-dccm/DETAILS
@@ -1,15 +1,7 @@
-           SPELL=synce-dccm
-         VERSION=0
-     SOURCE_HASH=sha512:
-          SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=$SOURCEFORGE_URL/synce/$SOURCE
-        WEB_SITE=http://synce.sourceforge.net/
-         ENTERED=20050524
-        KEYWORDS="mobile"
-           SHORT='SynCE provides communication with Windows Mobile devices'
-cat << EOF
-The purpose of the SynCE project is to provide a means of communication with a
-Windows CE device from a computer running Linux, FreeBSD or a similar operating
-system.
-EOF
+          SPELL=synce-dccm
+        VERSION=0
+     PATCHLEVEL=9999
+          SHORT="deprecated"
+  cat << EOF
+    deprecated spell [spell was split into synce-odccm & synce-odccm]
+  EOF
diff --git a/mobile/synce-dccm/DOWNLOAD b/mobile/synce-dccm/DOWNLOAD
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/mobile/synce-dccm/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/mobile/synce-dccm/HISTORY b/mobile/synce-dccm/HISTORY
index 454d88bbf0..ea6313af0b 100644
--- a/mobile/synce-dccm/HISTORY
+++ b/mobile/synce-dccm/HISTORY
@@ -1,3 +1,8 @@
+2010-10-20 Bor Kraljič <pyrobor@ver.si>
+	* spell deprecated [spell was split into synce-odccm & synce-odccm]
+	* PATCHLEVEL=9999 version=0
+	* TRIGGERS: on_cast synce-dccm dispel_self
+
 2004-10-24 Arjan Bouter <abouter@sourcemage.org>
 	* DETAILS: version 0.10.0
 
diff --git a/mobile/synce-dccm/INSTALL b/mobile/synce-dccm/INSTALL
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/mobile/synce-dccm/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/mobile/synce-dccm/PRE_BUILD b/mobile/synce-dccm/PRE_BUILD
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/mobile/synce-dccm/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/mobile/synce-dccm/TRIGGERS b/mobile/synce-dccm/TRIGGERS
new file mode 100755
index 0000000000..d632c8faa2
--- /dev/null
+++ b/mobile/synce-dccm/TRIGGERS
@@ -0,0 +1 @@
+on_cast synce-dccm dispel_self
diff --git a/mobile/synce-odccm/CONFLICTS b/mobile/synce-odccm/CONFLICTS
new file mode 100755
index 0000000000..12691e7f6e
--- /dev/null
+++ b/mobile/synce-odccm/CONFLICTS
@@ -0,0 +1 @@
+conflicts synce-dccm y
diff --git a/mobile/synce-odccm/HISTORY b/mobile/synce-odccm/HISTORY
index 7d68158916..d255e3dd33 100644
--- a/mobile/synce-odccm/HISTORY
+++ b/mobile/synce-odccm/HISTORY
@@ -1,3 +1,7 @@
+2010-10-20 Bor Kraljič <pyrobor@ver.si>
+	* PROVIDES: adding missing file
+	* CONFLICTS: added synce-dccm
+
 2007-10-24 Arjan Bouter <abouter@sourcemage.org>
 	* DETAILS: version 0.10.0
 	* synce-dccm split into odccm and vdccm
diff --git a/mobile/synce-odccm/PROVIDES b/mobile/synce-odccm/PROVIDES
new file mode 100755
index 0000000000..ac103acb7f
--- /dev/null
+++ b/mobile/synce-odccm/PROVIDES
@@ -0,0 +1 @@
+SYNCE_DCCM
diff --git a/mobile/synce-vdccm/CONFLICTS b/mobile/synce-vdccm/CONFLICTS
new file mode 100755
index 0000000000..12691e7f6e
--- /dev/null
+++ b/mobile/synce-vdccm/CONFLICTS
@@ -0,0 +1 @@
+conflicts synce-dccm y
diff --git a/mobile/synce-vdccm/HISTORY b/mobile/synce-vdccm/HISTORY
index 790cbdfcf2..cbb57e71bc 100644
--- a/mobile/synce-vdccm/HISTORY
+++ b/mobile/synce-vdccm/HISTORY
@@ -1,3 +1,7 @@
+2010-10-20 Bor Kraljič <pyrobor@ver.si>
+	* CONFLICTS: added synce-dccm
+	* PROVIDES: added missing file
+
 2007-10-24 Arjan Bouter <abouter@sourcemage.org>
 	* DETAILS: version 0.10.0
 	* synce-dccm split into odccm and vdccm
diff --git a/mobile/synce-vdccm/PROVIDES b/mobile/synce-vdccm/PROVIDES
new file mode 100755
index 0000000000..ac103acb7f
--- /dev/null
+++ b/mobile/synce-vdccm/PROVIDES
@@ -0,0 +1 @@
+SYNCE_DCCM
diff --git a/net/cacti/DETAILS b/net/cacti/DETAILS
index 0ae9773dd5..9648da46f8 100755
--- a/net/cacti/DETAILS
+++ b/net/cacti/DETAILS
@@ -1,5 +1,5 @@
            SPELL=cacti
-         VERSION=0.8.7f
+         VERSION=0.8.7g
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
 if [[ $CACTI_PA == y ]]; then
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY2="$BUILD_DIRECTORY/$SPELL-PA-${VERSION_PA}"
 fi
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.cacti.net/downloads/$SOURCE
-     SOURCE_HASH=sha512:79d3915ff12d5a16b5fe7709b169e426ddd45a7ebd7bdbb7ed999e7dbfe2907b54b9c6e20a587726c8ef21ec1bd5a97381988d07cb29bf750f24e272e69fdab5
+     SOURCE_HASH=sha512:b934b7dea515c80ed7b24f3d300e3fed42d39e53917d1f21dfccc24ee09f41255eafa506c8e31ee9735511d65cf66248dcacd99fbb5a0c6c21c7f5fa4505b7a1
       LICENSE[0]=GPL
         WEB_SITE=http://www.cacti.net/
          ENTERED=20060131
diff --git a/net/cacti/HISTORY b/net/cacti/HISTORY
index 8f75db2773..7422e6529a 100644
--- a/net/cacti/HISTORY
+++ b/net/cacti/HISTORY
@@ -1,3 +1,6 @@
+2010-10-20 Bor Kraljič <pyrobor@ver.si>
+	* DETAILS: updated spell to 0.8.7g
+
 2010-05-21 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 0.8.7f; Plugin Arch -- to 2.7
 	* PRE_BUILD: apply patches only if they exist
diff --git a/net/libnemesi/DETAILS b/net/libnemesi/DETAILS
index a45808d17a..8a2be2e6af 100755
--- a/net/libnemesi/DETAILS
+++ b/net/libnemesi/DETAILS
@@ -1,9 +1,8 @@
            SPELL=libnemesi
-         VERSION=0.6.9
-          BRANCH=${VERSION%.9}
+         VERSION=git
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=git://git.lscube.org/libnemesi:$SPELL-$VERSION:origin/${BRANCH}
+   SOURCE_URL[0]=git://git.lscube.org/libnemesi:$SPELL-$VERSION
    SOURCE_IGNORE=volatile
         WEB_SITE=http://lscube.org/projects/libnemesi/
       LICENSE[0]=LGPL
diff --git a/net/libnemesi/HISTORY b/net/libnemesi/HISTORY
index 5419c01616..3e6d944ba4 100644
--- a/net/libnemesi/HISTORY
+++ b/net/libnemesi/HISTORY
@@ -1,3 +1,6 @@
+2010-10-21 Bor Kraljič <pyrobor@ver.si>
+	* DETAILS: use git source without a branch
+
 2009-08-30 Quentin Reameau <quinq@sourcemage.org>
 	* DETAILS: updated to version 0.6.9 (now uses git), urls updated
 	* DEPENDS: added dependencies for git, autoconf, automake
diff --git a/net/vidalia/DETAILS b/net/vidalia/DETAILS
index 42d847ee0c..f415065253 100755
--- a/net/vidalia/DETAILS
+++ b/net/vidalia/DETAILS
@@ -1,5 +1,5 @@
            SPELL=vidalia
-         VERSION=0.2.8
+         VERSION=0.2.10
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://www.torproject.org/${SPELL}/dist/${SOURCE}
          SOURCE2=$SOURCE.asc
@@ -7,7 +7,7 @@
       SOURCE_GPG=tor.gpg:$SOURCE2:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-        WEB_SITE="http://www.torproject.org/vidalia/index.html.en"
+        WEB_SITE="https://www.torproject.org/projects/vidalia"
       LICENSE[0]=GPL
          ENTERED=20090915
            SHORT="QT tor GUI"
diff --git a/net/vidalia/HISTORY b/net/vidalia/HISTORY
index 23be53d2b1..9eabe61337 100644
--- a/net/vidalia/HISTORY
+++ b/net/vidalia/HISTORY
@@ -1,3 +1,7 @@
+2010-10-20 Bor Kraljič <pyrobor@ver.si>
+	* DETAILS: updated spell to 0.2.10
+	  fixed WEB_SITE
+
 2010-05-12 Ismael Luceno <ismael@sourcemage.org>
 	* BUILD: Fixed building with QT4
 	* HISTORY: Updated to 0.2.8
diff --git a/python-pypi/pykickstart/DEPENDS b/python-pypi/pykickstart/DEPENDS
index 6e84a0e417..af13f36cf5 100755
--- a/python-pypi/pykickstart/DEPENDS
+++ b/python-pypi/pykickstart/DEPENDS
@@ -1 +1,2 @@
-depends python 
+depends python &&
+depends rpm2targz
diff --git a/python-pypi/pykickstart/DETAILS b/python-pypi/pykickstart/DETAILS
index 4852500fc7..cff2f0a4ba 100755
--- a/python-pypi/pykickstart/DETAILS
+++ b/python-pypi/pykickstart/DETAILS
@@ -1,8 +1,8 @@
            SPELL=pykickstart
-         VERSION=1.72
-          SOURCE="${SPELL}-${VERSION}-1.fc14.src.rpm"
+         VERSION=1.78
+          SOURCE="${SPELL}-${VERSION}-1.fc15.src.rpm"
    SOURCE_URL[0]=http://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/${SOURCE}
-     SOURCE_HASH=sha512:fdcc0d8a633c03ba608a82b87b9491fa4171c0e3dee6d6284ee6fac804b16d07a0c2b685697d69d43c02eadc14ad745f9694f1ab79081cad55c7a78216ee6b7c
+     SOURCE_HASH=sha512:b60da227b662f5c218b81c6a7a9d74115d86b08f64a6aad03a3dbaf8b0ceac8fd2309bd919813f6c26e7f49af2144ccdf3b22e13d07c4d387e85fb6a4bc5eeea
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://fedoraproject.org/wiki/Pykickstart"
       LICENSE[0]="LGPL"
diff --git a/python-pypi/pykickstart/HISTORY b/python-pypi/pykickstart/HISTORY
index 102ad2911d..a1304d866c 100644
--- a/python-pypi/pykickstart/HISTORY
+++ b/python-pypi/pykickstart/HISTORY
@@ -1,3 +1,8 @@
+2010-10-21 Bor Kraljič <pyrobor@ver.si>
+	* DETAILS: updated spell to 1.78
+	* DEPENDS: added rpm2targz
+	* PRE_BUILD: modified to use rpm2tar
+
 2010-05-31 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
 	* DEPENDS, DETAILS: spell created
 
diff --git a/python-pypi/pykickstart/PRE_BUILD b/python-pypi/pykickstart/PRE_BUILD
index 274b5c941e..0a18fd9557 100755
--- a/python-pypi/pykickstart/PRE_BUILD
+++ b/python-pypi/pykickstart/PRE_BUILD
@@ -1,5 +1,7 @@
 mk_source_dir $SOURCE_DIRECTORY &&
 cd $SOURCE_DIRECTORY &&
-unpack_file '' &&
-tar -zxvf $SPELL-$VERSION.tar.gz
-cd $SPELL-$VERSION
+verify_file &&
+rpm2tar $SOURCE_CACHE/$SOURCE &&
+tar xf ${SOURCE/rpm/tar} &&
+rm ${SOURCE/rpm/tar} &&
+tar zxf $SPELL-$VERSION.tar.gz
diff --git a/python-pypi/trac-graphvizplugin/DETAILS b/python-pypi/trac-graphvizplugin/DETAILS
index b7b7c452cf..edd5487e88 100755
--- a/python-pypi/trac-graphvizplugin/DETAILS
+++ b/python-pypi/trac-graphvizplugin/DETAILS
@@ -8,10 +8,10 @@ fi
    SOURCE_IGNORE='volatile'
           SOURCE="$TRAC_PLUGIN-cvs.tar.bz2"
     TRAC_VERSION=0.9
-   SOURCE_URL[0]="svn://trac-hacks.swapoff.org/svn/$TRAC_PLUGIN/$TRAC_VERSION/:$SPELL-$VERSION"
+   SOURCE_URL[0]="svn://trac-hacks.org/svn/$TRAC_PLUGIN/$TRAC_VERSION/:$SPELL-$VERSION"
     SOURCE_HINTS=old_svn_compat
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$TRAC_PLUGIN-$VERSION"
-        WEB_SITE='http://trac-hacks.swapoff.org/wiki/GraphvizPlugin'
+        WEB_SITE='http://trac-hacks.org/wiki/GraphvizPlugin'
       LICENSE[0]='?'
          UPDATED=20051215
         KEYWORDS="graph python devel"
diff --git a/python-pypi/trac-graphvizplugin/HISTORY b/python-pypi/trac-graphvizplugin/HISTORY
index 5282a934b2..613de959c1 100644
--- a/python-pypi/trac-graphvizplugin/HISTORY
+++ b/python-pypi/trac-graphvizplugin/HISTORY
@@ -1,3 +1,6 @@
+2010-10-20 Bor Kraljič <pyrobor@ver.si>
+	* DETAILS: fixed SOURCE_URL & WEB_SITE
+
 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/utils/rsyslog/CONFIGURE b/utils/rsyslog/CONFIGURE
index 11604b8533..80b01298d3 100755
--- a/utils/rsyslog/CONFIGURE
+++ b/utils/rsyslog/CONFIGURE
@@ -13,4 +13,5 @@ config_query_option RSYSLOG_OPTS 'Enable diagnostic tools?' n \
                                  '--disable-diagtools' &&
 config_query_option RSYSLOG_TOPS 'Compile text input module (provides the ability to convert any standard text file into a syslog message)?' n \
                                  '--enable-imfile' \
-                                 '--disable-imfile'
+                                 '--disable-imfile' &&
+config_query RSYSLOG_CONF "Install a default rsyslog.conf?" n
diff --git a/utils/rsyslog/FINAL b/utils/rsyslog/FINAL
new file mode 100755
index 0000000000..5859df2ed5
--- /dev/null
+++ b/utils/rsyslog/FINAL
@@ -0,0 +1,5 @@
+# if they're letting us install a config file, also make sure the sysconfig
+# file enables the right compatability level
+if [ "${RSYSLOG_CONF}" == "y" ]; then
+  sedit "s/^#COMPAT/COMPAT/" ${INSTALL_ROOT}/etc/sysconfig/rsyslog
+fi
diff --git a/utils/rsyslog/HISTORY b/utils/rsyslog/HISTORY
index 90a9b5bc2b..8344732a72 100644
--- a/utils/rsyslog/HISTORY
+++ b/utils/rsyslog/HISTORY
@@ -1,3 +1,8 @@
+2010-10-20 Jeremy Blosser <jblosser-smgl@firinn.org>
+	* CONFIGURE, INSTALL, FINAL, init.d/rsyslog{,.conf}: Match upstream
+	  install; ask before installing a default config, and don't add
+	  runtime args by default.
+
 2010-08-25 Peng Chang (Charles) <chp@sourcemage.org>
 	* DETAILS: Fixed SOURCE_URL[0]
 	  updated RSYSLOG_BRANCH=v4stable to 4.6.4
diff --git a/utils/rsyslog/INSTALL b/utils/rsyslog/INSTALL
index d7d111ded0..5f75bd4aef 100755
--- a/utils/rsyslog/INSTALL
+++ b/utils/rsyslog/INSTALL
@@ -1,2 +1,5 @@
 default_install &&
-install_config_file ${SPELL_DIRECTORY}/rsyslog.conf /etc/rsyslog.conf
+
+if [ "${RSYSLOG_CONF}" == "y" ]; then
+  install_config_file ${SPELL_DIRECTORY}/rsyslog.conf /etc/rsyslog.conf
+fi
diff --git a/utils/rsyslog/init.d/rsyslog b/utils/rsyslog/init.d/rsyslog
index 2900757d07..115ab0e884 100644
--- a/utils/rsyslog/init.d/rsyslog
+++ b/utils/rsyslog/init.d/rsyslog
@@ -4,13 +4,11 @@
 
 PIDFILE=/var/run/rsyslogd.pid
 PROGRAM=/usr/sbin/rsyslogd
-ARGS="-c${COMPAT}"
+[ -n "${COMPAT}" ] && ARGS="-c${COMPAT}"
 RUNLEVEL=S
 NEEDS="+local_fs"
 PROVIDES=syslog
 
-if ! [[ -z ${RSYSLOG_CONFIG} ]]; then
-  ARGS="${ARGS} -f ${RSYSLOG_CONFIG}"
-fi
+[ -n "${RSYSLOG_CONFIG}" ] && ARGS="${ARGS} -f ${RSYSLOG_CONFIG}"
 
 . /etc/init.d/smgl_init
diff --git a/utils/rsyslog/init.d/rsyslog.conf b/utils/rsyslog/init.d/rsyslog.conf
index b6e37de781..8f0fd784a7 100644
--- a/utils/rsyslog/init.d/rsyslog.conf
+++ b/utils/rsyslog/init.d/rsyslog.conf
@@ -1,6 +1,6 @@
 # Configuration compatibility
-VERSION=$(/usr/sbin/rsyslogd -v | head -n1 | gawk '{print $2}' | sed -e 's/,//')
-COMPAT=${VERSION:0:1}
+#COMPAT_VERSION=$(/usr/sbin/rsyslogd -v | head -n1 | gawk '{print $2}' | sed -e 's/,//')
+#COMPAT=${COMPAT_VERSION:0:1}
 
 # Full path to configuration file (and its filename)
-RSYSLOG_CONFIG="/etc/rsyslog.conf"
+#RSYSLOG_CONFIG="/etc/rsyslog.conf"
diff --git a/video/handbrake/DEPENDS b/video/handbrake/DEPENDS
index 3bbc29524f..37b33171cf 100755
--- a/video/handbrake/DEPENDS
+++ b/video/handbrake/DEPENDS
@@ -1,6 +1,9 @@
 depends  $HANDBRAKE_FETCH  "--fetch=$HANDBRAKE_FETCH" &&
 depends  python &&
 depends  hal    &&
+depends  gstreamer &&
+depends  gst-plugins-base &&
+depends  webkitgtk &&
 
 optional_depends  'gtk+2'  \
                   '--enable-gtk'  \
diff --git a/video/handbrake/HISTORY b/video/handbrake/HISTORY
index 79174cc51a..103f0ada72 100644
--- a/video/handbrake/HISTORY
+++ b/video/handbrake/HISTORY
@@ -1,3 +1,6 @@
+2010-10-24 Jeremy Blosser <jblosser-smgl@firinn.org>
+	* DEPENDS: Needs gstreamer, gst-plugins-base, and webkit to build.
+
 2010-06-27 Eric Sandall <sandalle@sourcemage.org>
 	* DEPENDS: Suggest libdvdcss for decrypting DVDs
 
diff --git a/video/miro/BUILD b/video/miro/BUILD
index 950180d1aa..ba2e3ab7dc 100755
--- a/video/miro/BUILD
+++ b/video/miro/BUILD
@@ -1,2 +1,2 @@
-cd ${SOURCE_DIRECTORY}/platform/gtk-x11 &&
+cd ${SOURCE_DIRECTORY}/linux &&
 python setup.py build
diff --git a/video/miro/DETAILS b/video/miro/DETAILS
index b9a025323c..c8dcbdb510 100755
--- a/video/miro/DETAILS
+++ b/video/miro/DETAILS
@@ -1,9 +1,9 @@
            SPELL=miro
-         VERSION=3.0.3
+         VERSION=3.5
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://ftp.osuosl.org/pub/pculture.org/miro/src/$SOURCE
-     SOURCE_HASH=sha512:ce58d7b9013c020189a6cc91843f0a93e8b889a1ab1c10fe9595e5a3ca4c50854fd80be79df270252dcf9eaab33a1608e3a3c8ae4a3c5dbbb10bcdce08436450
+     SOURCE_HASH=sha512:155709e694738831949a7cbf131a967090e5c09b8b262b09e1afff15e1fe6edc1d2adea94ad0fa109ee08a6449e01006ffcd53ec32c9fa76ccca4894bb04d93f
         WEB_SITE=http://www.getmiro.com/
          ENTERED=20090804
       LICENSE[0]=GPL
diff --git a/video/miro/HISTORY b/video/miro/HISTORY
index 6b79c7672b..fdaa1c14cc 100644
--- a/video/miro/HISTORY
+++ b/video/miro/HISTORY
@@ -1,3 +1,7 @@
+2010-10-23 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 3.5
+	* BUILD, INSTALL: platform/gtk-x11 -> linux
+
 2010-07-27 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 3.0.3
 
diff --git a/video/miro/INSTALL b/video/miro/INSTALL
index f5f02b3688..92d09e3249 100755
--- a/video/miro/INSTALL
+++ b/video/miro/INSTALL
@@ -1,2 +1,2 @@
-cd ${SOURCE_DIRECTORY}/platform/gtk-x11 &&
+cd ${SOURCE_DIRECTORY}/linux &&
 python setup.py install
diff --git a/wm-addons/cairo-dock-plugins/DETAILS b/wm-addons/cairo-dock-plugins/DETAILS
index 0506daf9db..2ff349cbce 100755
--- a/wm-addons/cairo-dock-plugins/DETAILS
+++ b/wm-addons/cairo-dock-plugins/DETAILS
@@ -1,8 +1,8 @@
            SPELL=cairo-dock-plugins
-         VERSION=2.1.3-8
+         VERSION=2.1.3-9
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://launchpad.net/cairo-dock-plug-ins/${VERSION:0:3}/${VERSION:0:5}/+download/$SOURCE
-     SOURCE_HASH=sha512:f31c99d72fb644ded22d0902cd962ebe67b62c8619eae653e182fee451a365e7cbbbec2d87a595204d0112808fc16e776d443a1dd753daf30225393f8e3b26ae
+     SOURCE_HASH=sha512:77a0210cc14e5ba888ca7b25141b12350639b3a7b6b1d84821a321c05a1f03c3961c4e324a2cee7eb53b0ca3305fd72af0c44136070df428dde6cedbfb569c86
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE=http://glx-dock.org/
       LICENSE[0]=GPL
diff --git a/wm-addons/cairo-dock-plugins/HISTORY b/wm-addons/cairo-dock-plugins/HISTORY
index c6e4a3ec9f..8e3e92eedf 100644
--- a/wm-addons/cairo-dock-plugins/HISTORY
+++ b/wm-addons/cairo-dock-plugins/HISTORY
@@ -1,3 +1,6 @@
+2010-10-20 Bor Kraljič <pyrobor@ver.si>
+	* DETAILS: updated spell to 2.1.3-9
+
 2010-04-10 Mark Bainter <mbainter@sourcemage.org>
 	* DETAILS: updated spell to 2.1.3-8, updated WEB_SITE
 
diff --git a/wm-addons/cairo-dock/DEPENDS b/wm-addons/cairo-dock/DEPENDS
index 6a81004377..54198f2a6a 100755
--- a/wm-addons/cairo-dock/DEPENDS
+++ b/wm-addons/cairo-dock/DEPENDS
@@ -1,5 +1,5 @@
 depends OPENGL  &&
 depends cairo &&
-depends librsvg &&
+depends librsvg2 &&
 depends gtkglext &&
 depends gtk+2
diff --git a/wm-addons/cairo-dock/HISTORY b/wm-addons/cairo-dock/HISTORY
index 20261574db..e8c3f42581 100644
--- a/wm-addons/cairo-dock/HISTORY
+++ b/wm-addons/cairo-dock/HISTORY
@@ -1,3 +1,6 @@
+2010-10-20 Bor Kraljič <pyrobor@ver.si>
+	* DEPENDS: librsvg -> librsvg2
+
 2010-04-10 Mark Bainter <mbainter@sourcemage.org>
 	* DETAILS: updated spell to 2.1.3-8, updated WEB_SITE
author	Ladislav Hagara	2010-10-24 19:19:51 +0200
committer	Ladislav Hagara	2010-10-24 19:19:51 +0200
commit	343579cdda32ba6dedd1fdc91f45e4da46230228 (patch)
tree	7bdc8ea37a96c33e81848519337e9839101db89e
parent	89b3031f375445d0b58f2f6471a7a5fd6e5b58da (diff)
parent	6234a83ea67adb5b5a9e9334121b496bc3304b44 (diff)