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

8 files changed, 22 insertions, 13 deletions

diff --git a/audio-players/mpg123/DETAILS b/audio-players/mpg123/DETAILS
index 1fb4431033..1a0f7f7520 100755
--- a/audio-players/mpg123/DETAILS
+++ b/audio-players/mpg123/DETAILS
@@ -1,5 +1,5 @@
            SPELL=mpg123
-         VERSION=1.10.0
+         VERSION=1.10.1
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
       SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/audio-players/mpg123/HISTORY b/audio-players/mpg123/HISTORY
index b241917c3e..f0662dbc0c 100644
--- a/audio-players/mpg123/HISTORY
+++ b/audio-players/mpg123/HISTORY
@@ -1,3 +1,6 @@
+2009-02-27 Thomas Orgis <sobukus@sourcemage.org>
+	* DETAILS: bump to 1.10.1
+
 2009-12-05 Thomas Orgis <sobukus@sourcemage.org>
 	* DETAILS: bump to 1.10.0
 
diff --git a/disk/pmount/DETAILS b/disk/pmount/DETAILS
index f67dc19962..5dd04a1836 100755
--- a/disk/pmount/DETAILS
+++ b/disk/pmount/DETAILS
@@ -1,9 +1,9 @@
            SPELL=pmount
-         VERSION=0.9.19
+         VERSION=0.9.20
           SOURCE=${SPELL}_${VERSION}.orig.tar.gz
-         SOURCE2=${SPELL}_${VERSION}-1.diff.gz
-     SOURCE_HASH=sha512:dc44a3692fcc639561e9f48207613b2c57a5364f38c1f1a5650ba7f6edfdc41e601e0315ca42ee7c660cb7ec5a18e247842f64fa2b28704d5b8d59746b7164a8
-    SOURCE2_HASH=sha512:e0de57184e629fc9401d008d83db8c7ef0c574a2a94fa44bd309ae726ef09d045c91b93048c7e4270aba6d202db683542a5637f8716a3ee7c81509984ef672ae
+         SOURCE2=${SPELL}_${VERSION}-3.diff.gz
+     SOURCE_HASH=sha512:94bb65f5690605fa8857bda942728bfaa59d7dc519c2cd80fead273da8fa21945e1f4c3eac6319a00e61e9f24be2fc180420f245b5dba56eb0e87b943d9c56e3
+    SOURCE2_HASH=sha512:bc040d7e0547943f825b2c32ba10dacd2fa0c24d7f2f723eb01043cee95c1fcea5516f8cc6fe860add71176b21b83c408d510d0cc3bd0c3aa25ce83aed824eb0
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/p/pmount/$SOURCE
   SOURCE2_URL[0]=http://ftp.debian.org/debian/pool/main/p/pmount/$SOURCE2
diff --git a/disk/pmount/HISTORY b/disk/pmount/HISTORY
index f01bc89df5..18d2367c54 100644
--- a/disk/pmount/HISTORY
+++ b/disk/pmount/HISTORY
@@ -1,3 +1,6 @@
+2010-02-27 Thomas Orgis <sobukus@sourcemage.org>
+	* DETAILS: updated to 0.9.20
+
 2009-04-21 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* DETAILS: updated to 0.9.19
 
diff --git a/ruby-raa/diakonos/DEPENDS b/ruby-raa/diakonos/DEPENDS
index 257635e6a7..a003eb2cf6 100755
--- a/ruby-raa/diakonos/DEPENDS
+++ b/ruby-raa/diakonos/DEPENDS
@@ -1 +1 @@
-depends RUBY
+depends ruby-1.9
diff --git a/ruby-raa/diakonos/DETAILS b/ruby-raa/diakonos/DETAILS
index 9f7c4fa80a..8111fa32f0 100755
--- a/ruby-raa/diakonos/DETAILS
+++ b/ruby-raa/diakonos/DETAILS
@@ -1,18 +1,14 @@
            SPELL=diakonos
-         VERSION=0.8.3
+         VERSION=0.8.12
           SOURCE=${SPELL}-${VERSION}.tar.bz2
-         SOURCE2=${SOURCE}.sig
       SOURCE_URL=http://purepistos.net/${SPELL}/${SOURCE}
-     SOURCE2_URL=${SOURCE_URL}.sig
-      SOURCE_GPG=diakonos.gpg:${SOURCE}.sig:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+     SOURCE_HASH=sha512:69d1fde2bfb5532398a6bdbecb34c33e7455906703dcd97041ecfbc663a72cf843718beb1ba22b17f3e928c9232186b6aa04e0bab0e7f5e355a1689e40a8a6db
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
         WEB_SITE=http://purepistos.net/diakonos/
          ENTERED=20050418
-      LICENSE[0]=GPL
+         LICENSE=GPL
         KEYWORDS="editors"
             DOCS="home-on-save.rb diakonos.conf README CHANGELOG"
-      PATCHLEVEL=1
            SHORT="Diakonos is a customizable, usable console-based text editor."
 cat << EOF
 Diakonos is a customizable, usable console-based text editor. I made it with the intention
diff --git a/ruby-raa/diakonos/HISTORY b/ruby-raa/diakonos/HISTORY
index 188ba161d8..7951bb8018 100644
--- a/ruby-raa/diakonos/HISTORY
+++ b/ruby-raa/diakonos/HISTORY
@@ -1,3 +1,10 @@
+2010-02-27 Bor Kraljič <pyrobor@ver.si>
+	* DEPENDS: it needs ruby-1.9; it doesn't compile with ruby-1.8
+	* diakonos.gpg: removed, no longer needed
+	* DETAILS: removed SOURCE2, no longer available
+	  changed blabla
+	  updated spell to 0.8.12; fixing bug #15597
+
 2010-02-25 Remko van der Vossen <wich@sourcemage.org>
 	* DEPENDS: updated ruby dependency to RUBY provider
 
diff --git a/ruby-raa/diakonos/diakonos.gpg b/ruby-raa/diakonos/diakonos.gpg
deleted file mode 100644
index 299d6a4e94..0000000000
--- a/ruby-raa/diakonos/diakonos.gpg
+++ /dev/null