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

10 files changed, 14 insertions, 3 deletions

diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 73fc36ff6c..1ead3b29f9 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.35
+         VERSION=1.1.36
   else
          VERSION=1.0.1
   fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 0a512854dd..6f3120f1ea 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2010-01-08 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Updated to 1.1.36
+
 2009-12-18 Eric Sandall <sandalle@sourcemage.org>
 	* DETAILS: Updated to 1.1.35
 
diff --git a/xorg-proto/dri2proto/DETAILS b/xorg-proto/dri2proto/DETAILS
index 07755b40b4..59423c489a 100755
--- a/xorg-proto/dri2proto/DETAILS
+++ b/xorg-proto/dri2proto/DETAILS
@@ -1,5 +1,5 @@
            SPELL=dri2proto
-         VERSION=2.1
+         VERSION=2.2
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/proto/${SOURCE}
 #     SOURCE_HASH=sha512:8262f3b45a0759680c3b71302a597ac08ccd5597e0be828781b9928351b3c4c4c6b1f590a3194845d9213e074bcdefd0d42f66b36c74e7e57463dfed9b4b78b1
diff --git a/xorg-proto/dri2proto/HISTORY b/xorg-proto/dri2proto/HISTORY
index bddd917d9b..edb0978d16 100644
--- a/xorg-proto/dri2proto/HISTORY
+++ b/xorg-proto/dri2proto/HISTORY
@@ -1,3 +1,7 @@
+2010-01-08 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Updated to 2.2
+	  SOURCE matches upstream posted SHA1
+
 2009-10-10 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
 	* DEPENDS: added
 
diff --git a/xorg-proto/dri2proto/dri2proto-2.1.tar.bz2.sig b/xorg-proto/dri2proto/dri2proto-2.1.tar.bz2.sig
deleted file mode 100644
index c1b14ce796..0000000000
--- a/xorg-proto/dri2proto/dri2proto-2.1.tar.bz2.sig
+++ /dev/null
diff --git a/xorg-proto/dri2proto/dri2proto-2.2.tar.bz2.sig b/xorg-proto/dri2proto/dri2proto-2.2.tar.bz2.sig
new file mode 100644
index 0000000000..e199fa5d68
--- /dev/null
+++ b/xorg-proto/dri2proto/dri2proto-2.2.tar.bz2.sig
diff --git a/xorg-proto/glproto/DETAILS b/xorg-proto/glproto/DETAILS
index 661c44c3bf..9281a9882c 100755
--- a/xorg-proto/glproto/DETAILS
+++ b/xorg-proto/glproto/DETAILS
@@ -1,5 +1,5 @@
           SPELL=glproto
-         VERSION=1.4.10
+         VERSION=1.4.11
           SOURCE=${SPELL}-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
    SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/proto/${SOURCE}
diff --git a/xorg-proto/glproto/HISTORY b/xorg-proto/glproto/HISTORY
index 15e52f6da3..956fa44d1c 100644
--- a/xorg-proto/glproto/HISTORY
+++ b/xorg-proto/glproto/HISTORY
@@ -1,3 +1,7 @@
+2010-01-08 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Updated to 1.4.11
+	  SOURCE matches upstream posted SHA1
+
 2009-05-27 Eric Sandall <sandalle@sourcemage.org>
 	* DETAILS: Updated to 1.4.10
 	  SOURCE matches upstream posted MD5
diff --git a/xorg-proto/glproto/glproto-1.4.10.tar.bz2.sig b/xorg-proto/glproto/glproto-1.4.10.tar.bz2.sig
deleted file mode 100644
index b7e4a43d46..0000000000
--- a/xorg-proto/glproto/glproto-1.4.10.tar.bz2.sig
+++ /dev/null
diff --git a/xorg-proto/glproto/glproto-1.4.11.tar.bz2.sig b/xorg-proto/glproto/glproto-1.4.11.tar.bz2.sig
new file mode 100644
index 0000000000..3f65bcf84d
--- /dev/null
+++ b/xorg-proto/glproto/glproto-1.4.11.tar.bz2.sig