summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndraž Levstik2010-10-02 17:41:23 +0200
committerAndraž Levstik2010-10-02 17:41:23 +0200
commitf3a24a1f2023ef789085e371be571b08b8d8752d (patch)
treebe0933693ae69e219fda88dfeca14dcdaa54861b
parent3b8ad39b7545b0a2d26ebbea66c7ca5179dba4ae (diff)
parentafd46ef63683a2fc1de9126ef1a3996aea07b548 (diff)
Merge branch 'master' of git+ssh://scm.sourcemage.org/smgl/grimoire
-rwxr-xr-xgnome2-apps/gnumeric/DEPENDS13
-rwxr-xr-xgnome2-apps/gnumeric/DETAILS4
-rw-r--r--gnome2-apps/gnumeric/HISTORY4
-rw-r--r--gnome2-apps/gnumeric/gnumeric-1.10.10.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-apps/gnumeric/gnumeric-1.10.11.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-libs/goffice/DETAILS2
-rw-r--r--gnome2-libs/goffice/HISTORY3
-rw-r--r--gnome2-libs/goffice/goffice-0.8.10.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/goffice/goffice-0.8.11.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-libs/libgsf/DETAILS2
-rw-r--r--gnome2-libs/libgsf/HISTORY3
-rw-r--r--gnome2-libs/libgsf/libgsf-1.14.18.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/libgsf/libgsf-1.14.19.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xlibs/icu/DETAILS8
-rw-r--r--libs/icu/HISTORY3
-rwxr-xr-xpython-pypi/mercurial/DETAILS4
-rw-r--r--python-pypi/mercurial/HISTORY3
-rwxr-xr-xutils/kexec-tools/DETAILS11
-rw-r--r--utils/kexec-tools/HISTORY4
-rw-r--r--utils/kexec-tools/kexec-tools-2.0.1.tar.bz2.sigbin287 -> 0 bytes
20 files changed, 41 insertions, 23 deletions
diff --git a/gnome2-apps/gnumeric/DEPENDS b/gnome2-apps/gnumeric/DEPENDS
index acaf32c09f..727c2746c9 100755
--- a/gnome2-apps/gnumeric/DEPENDS
+++ b/gnome2-apps/gnumeric/DEPENDS
@@ -1,18 +1,13 @@
depends libole2-2 &&
depends libgsf &&
-if [[ $GNUMERIC_DEVEL == y ]]; then
- depends goffice-dev &&
- depends rarian
-else
- depends goffice &&
- if spell_ok goffice && [[ $(installed_version goffice) < 0.8.5 ]]; then
- force_depends goffice
- fi
+depends goffice &&
+
+if spell_ok goffice && [[ $(installed_version goffice) < 0.8.11 ]]; then
+ force_depends goffice
fi &&
depends libxml2 &&
-
depends cairo &&
depends -sub SVG cairo &&
diff --git a/gnome2-apps/gnumeric/DETAILS b/gnome2-apps/gnumeric/DETAILS
index e65473b948..5bff34ca0e 100755
--- a/gnome2-apps/gnumeric/DETAILS
+++ b/gnome2-apps/gnumeric/DETAILS
@@ -1,11 +1,11 @@
SPELL=gnumeric
if [[ $GNUMERIC_DEVEL == y ]]; then
- VERSION=1.10.10
+ VERSION=1.10.11
# SOURCE_HASH=sha512:e2f7984f869dbfaf9a5fdeee0aae544a0070c1e4edac3ffb085fb196ef1fb1e40df6f922bc9ec1eeb67ee3d2dd0b28aaf9ec2731e7120c1d485617bd0ad4d7ce
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG=gurus.gpg:$SOURCE.sig
else
- VERSION=1.10.10
+ VERSION=1.10.11
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG=gurus.gpg:$SOURCE.sig
fi
diff --git a/gnome2-apps/gnumeric/HISTORY b/gnome2-apps/gnumeric/HISTORY
index 7d0108d28c..80da7b3c32 100644
--- a/gnome2-apps/gnumeric/HISTORY
+++ b/gnome2-apps/gnumeric/HISTORY
@@ -1,3 +1,7 @@
+2010-10-02 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.10.11
+ * DEPENDS: removed useless checks for devel branch
+
2010-09-05 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 1.10.10
diff --git a/gnome2-apps/gnumeric/gnumeric-1.10.10.tar.bz2.sig b/gnome2-apps/gnumeric/gnumeric-1.10.10.tar.bz2.sig
deleted file mode 100644
index 24bc17fab6..0000000000
--- a/gnome2-apps/gnumeric/gnumeric-1.10.10.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-apps/gnumeric/gnumeric-1.10.11.tar.bz2.sig b/gnome2-apps/gnumeric/gnumeric-1.10.11.tar.bz2.sig
new file mode 100644
index 0000000000..7dd0534628
--- /dev/null
+++ b/gnome2-apps/gnumeric/gnumeric-1.10.11.tar.bz2.sig
Binary files differ
diff --git a/gnome2-libs/goffice/DETAILS b/gnome2-libs/goffice/DETAILS
index 02daf3df4c..e8a59df6ce 100755
--- a/gnome2-libs/goffice/DETAILS
+++ b/gnome2-libs/goffice/DETAILS
@@ -1,5 +1,5 @@
SPELL=goffice
- VERSION=0.8.10
+ VERSION=0.8.11
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/goffice/HISTORY b/gnome2-libs/goffice/HISTORY
index e3e082a214..a5af17f5b7 100644
--- a/gnome2-libs/goffice/HISTORY
+++ b/gnome2-libs/goffice/HISTORY
@@ -1,3 +1,6 @@
+2010-10-02 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 0.8.11
+
2010-09-05 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 0.8.10
diff --git a/gnome2-libs/goffice/goffice-0.8.10.tar.bz2.sig b/gnome2-libs/goffice/goffice-0.8.10.tar.bz2.sig
deleted file mode 100644
index c40d3f88bd..0000000000
--- a/gnome2-libs/goffice/goffice-0.8.10.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/goffice/goffice-0.8.11.tar.bz2.sig b/gnome2-libs/goffice/goffice-0.8.11.tar.bz2.sig
new file mode 100644
index 0000000000..a81f699ab9
--- /dev/null
+++ b/gnome2-libs/goffice/goffice-0.8.11.tar.bz2.sig
Binary files differ
diff --git a/gnome2-libs/libgsf/DETAILS b/gnome2-libs/libgsf/DETAILS
index 63a9e629a8..96f5c63fb3 100755
--- a/gnome2-libs/libgsf/DETAILS
+++ b/gnome2-libs/libgsf/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgsf
- VERSION=1.14.18
+ VERSION=1.14.19
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/libgsf/HISTORY b/gnome2-libs/libgsf/HISTORY
index ebd378e8a2..b7fec891b0 100644
--- a/gnome2-libs/libgsf/HISTORY
+++ b/gnome2-libs/libgsf/HISTORY
@@ -1,3 +1,6 @@
+2010-10-02 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.14.19
+
2010-07-06 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: added python dep
diff --git a/gnome2-libs/libgsf/libgsf-1.14.18.tar.bz2.sig b/gnome2-libs/libgsf/libgsf-1.14.18.tar.bz2.sig
deleted file mode 100644
index 3cbc843a44..0000000000
--- a/gnome2-libs/libgsf/libgsf-1.14.18.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/libgsf/libgsf-1.14.19.tar.bz2.sig b/gnome2-libs/libgsf/libgsf-1.14.19.tar.bz2.sig
new file mode 100644
index 0000000000..a28d767db6
--- /dev/null
+++ b/gnome2-libs/libgsf/libgsf-1.14.19.tar.bz2.sig
Binary files differ
diff --git a/libs/icu/DETAILS b/libs/icu/DETAILS
index f09ffec52d..fbe97919eb 100755
--- a/libs/icu/DETAILS
+++ b/libs/icu/DETAILS
@@ -1,12 +1,12 @@
SPELL=icu
if [[ "$ICU_DEV" == 'y' ]]; then
- VERSION=4.4.1
- SOURCE_HASH=sha512:0e623de080f28bcc3c352ab4eb28ad0b0f6e3b1d78800bf909f6debfec45198531792979d4bc17dc12464bfef97331d1bf35feb572104b900998e1b03d9a8bae
+ VERSION=4.4.2
+ SOURCE_HASH=sha512:01a3009a2e625a7ba64ac771aea9e0dbb7df67a5f8070809e62a8d8d91657bee44e8fe2dff88f024dc5e916ee8af9e8185b201f90e7114a01316db7859ac5d35
VX=${VERSION//.r/r}
else
- VERSION=4.2.1
+ VERSION=4.4.2
VX=$VERSION
- SOURCE_HASH=sha512:c2ec0edbdb9a5790e88f7b09c96b31f9b2120bed0c1a575cdabbcc1f9281e6cb137b44707d0ad44f794e6c9abde64c6b76d8cf4818d51459d3fb11c2e10e01dc
+ SOURCE_HASH=sha512:01a3009a2e625a7ba64ac771aea9e0dbb7df67a5f8070809e62a8d8d91657bee44e8fe2dff88f024dc5e916ee8af9e8185b201f90e7114a01316db7859ac5d35
fi
SPELLX=icu4c
VERSIONX=${VERSION//./_}
diff --git a/libs/icu/HISTORY b/libs/icu/HISTORY
index e6ebf40fb8..27b75a3bcc 100644
--- a/libs/icu/HISTORY
+++ b/libs/icu/HISTORY
@@ -1,3 +1,6 @@
+2010-10-02 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 4.4.2 (both)
+
2010-06-13 Robin Cook <rcook@wyrms.net>
* DETAILS: added missing SOURCE2_URL[0]
diff --git a/python-pypi/mercurial/DETAILS b/python-pypi/mercurial/DETAILS
index 6b00e1528e..562cf58c0a 100755
--- a/python-pypi/mercurial/DETAILS
+++ b/python-pypi/mercurial/DETAILS
@@ -1,6 +1,6 @@
SPELL=mercurial
- VERSION=1.6.3
- SOURCE_HASH=sha512:7574759f269cf84b5ef5b52cad19f80ca53c0594e1068737156d029f4c63c38fc367f3b1000e1a98a18ccc219029a65842b67c2a853601c33509216f9d051092
+ VERSION=1.6.4
+ SOURCE_HASH=sha512:59259ee516313ceb1b0b932459d0c463005426b985d59100d100f71f453ffcb23da04eefebf4597ecb0c726091a2c77c09b842f60a5bc932ea696197fe825364
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.selenic.com/mercurial/release/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/mercurial/HISTORY b/python-pypi/mercurial/HISTORY
index 3fd92e7eba..9d1fa1a0ad 100644
--- a/python-pypi/mercurial/HISTORY
+++ b/python-pypi/mercurial/HISTORY
@@ -1,3 +1,6 @@
+2010-10-02 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: updated to 1.6.4
+
2010-08-29 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 1.6.3
diff --git a/utils/kexec-tools/DETAILS b/utils/kexec-tools/DETAILS
index 8871634184..c1c4135adc 100755
--- a/utils/kexec-tools/DETAILS
+++ b/utils/kexec-tools/DETAILS
@@ -1,10 +1,13 @@
SPELL=kexec-tools
- VERSION=2.0.1
+ VERSION=2.0.2
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL=$KERNEL_URL/pub/linux/kernel/people/horms/kexec-tools/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE2=$SOURCE.sign
+ SOURCE_URL=$KERNEL_URL/pub/linux/utils/kernel/kexec/$SOURCE
+ SOURCE2_URL[0]=$SOURCE_URL.sign
+ SOURCE_GPG=kernel.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- WEB_SITE=http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
+ WEB_SITE=http://www.kernel.org/pub/linux/utils/kernel/kexec/
ENTERED=20050724
LICENCE=GPL2
KEYWORDS="utils"
diff --git a/utils/kexec-tools/HISTORY b/utils/kexec-tools/HISTORY
index dc8d13f288..65446ee319 100644
--- a/utils/kexec-tools/HISTORY
+++ b/utils/kexec-tools/HISTORY
@@ -1,3 +1,7 @@
+2010-10-02 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 2.0.2; fixed source url, website
+ converted to upstream signature checking
+
2009-09-10 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 2.0.1; quoting paths
diff --git a/utils/kexec-tools/kexec-tools-2.0.1.tar.bz2.sig b/utils/kexec-tools/kexec-tools-2.0.1.tar.bz2.sig
deleted file mode 100644
index e4c3dd95ae..0000000000
--- a/utils/kexec-tools/kexec-tools-2.0.1.tar.bz2.sig
+++ /dev/null
Binary files differ