[SM-Commit] GIT changes to master grimoire by Arjan Bouter (b9d4b53e4d778643d76780845f61feb52ecbd58d)

Arjan Bouter scm at sourcemage.org
Tue Jan 17 09:00:48 EST 2012


GIT changes to master grimoire by Arjan Bouter <abouter at sourcemage.org>:

 gnome2-libs/libsoup/DETAILS                   |    5 +++--
 gnome2-libs/libsoup/HISTORY                   |    3 +++
 gnome2-libs/libsoup/libsoup-2.37.3.tar.xz.sig |binary
 libs/libnih/DETAILS                           |   10 +++++-----
 libs/libnih/HISTORY                           |    3 +++
 smgl/upstart/DETAILS                          |   16 ++++++++++------
 smgl/upstart/HISTORY                          |   10 ++++++++--
 smgl/upstart/PRE_BUILD                        |    2 +-
 smgl/upstart/upstart.gpg                      |binary
 windowmanagers/awesome/HISTORY                |    3 +++
 windowmanagers/awesome/PRE_BUILD              |    3 +++
 11 files changed, 39 insertions(+), 16 deletions(-)

New commits:
commit b9d4b53e4d778643d76780845f61feb52ecbd58d
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    upstart: version 1.4

commit 21545d62223454d370f663e16ab9b0774921e0a3
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    libnih: version 1.0.3

commit 5b79cb80dd5396bb0a1ba0395ae9504a3967a270
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    awesome: missing PRE_BUILD

commit 095d216e4b5b4bd56ee4c0df6f3f78545742132c
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    libsoup: devel version 2.37.3

commit 6f7b8afaf0c7796e89c68fcb347a7bb4b0a72b13
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    awesome: added PRE_BUILD to fix glib2 include in spawn.c

diff --git a/gnome2-libs/libsoup/DETAILS b/gnome2-libs/libsoup/DETAILS
index c65539d..4966bb5 100755
--- a/gnome2-libs/libsoup/DETAILS
+++ b/gnome2-libs/libsoup/DETAILS
@@ -1,11 +1,12 @@
            SPELL=libsoup
 if [[ $LIBSOUP_DEVEL == y ]]; then
-         VERSION=2.36.1
+         VERSION=2.37.3
+          SOURCE=$SPELL-$VERSION.tar.xz
 else
          VERSION=2.36.1
+          SOURCE=$SPELL-$VERSION.tar.bz2
 fi
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
-          SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/gnome2-libs/libsoup/HISTORY b/gnome2-libs/libsoup/HISTORY
index 7d07c66..ae7a1dd 100644
--- a/gnome2-libs/libsoup/HISTORY
+++ b/gnome2-libs/libsoup/HISTORY
@@ -1,3 +1,6 @@
+2012-01-11 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS: devel version 2.37.3
+
 2011-10-18 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.36.1
 
diff --git a/gnome2-libs/libsoup/libsoup-2.37.3.tar.xz.sig b/gnome2-libs/libsoup/libsoup-2.37.3.tar.xz.sig
new file mode 100644
index 0000000..19e4da3
Binary files /dev/null and b/gnome2-libs/libsoup/libsoup-2.37.3.tar.xz.sig differ
diff --git a/libs/libnih/DETAILS b/libs/libnih/DETAILS
index 6dfd4f3..991dabe 100755
--- a/libs/libnih/DETAILS
+++ b/libs/libnih/DETAILS
@@ -1,9 +1,9 @@
            SPELL=libnih
-         VERSION=1.0.2.orig
-          SOURCE="${SPELL}_${VERSION}.tar.gz"
-   SOURCE_URL[0]=http://archive.ubuntu.com/ubuntu/pool/main/libn/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:d13f46dc2e449d8864a39e1b71747e419b8d262d3c8ce7f555569208e3b72c5e74550d05336036794cc9debec52fec03eb7e9544b7bd93f37691048d0e52ad6c
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-1.0.2"
+         VERSION=1.0.3
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+   SOURCE_URL[0]="http://launchpad.net/${SPELL}/${VERSION:0:3}/${VERSION}/+download/${SOURCE}"
+     SOURCE_HASH=sha512:fce40d2445b28c27b8838631681ca3206a4f053b2dd4fc488fc9ef98bbd3d933e3d62b82cf346be2ef1677f6457f692cf5544cd915a6bb1e5c618f98ffa101b4
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="https://launchpad.net/libnih"
       LICENSE[0]=GPL
          ENTERED=20101114
diff --git a/libs/libnih/HISTORY b/libs/libnih/HISTORY
index f98a20a..7cb0369 100644
--- a/libs/libnih/HISTORY
+++ b/libs/libnih/HISTORY
@@ -1,3 +1,6 @@
+2012-01-17 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS: version 1.0.3
+
 2010-11-14 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS, DETAILS: spell created
 
diff --git a/smgl/upstart/DETAILS b/smgl/upstart/DETAILS
index e601825..e4aa440 100755
--- a/smgl/upstart/DETAILS
+++ b/smgl/upstart/DETAILS
@@ -1,15 +1,19 @@
            SPELL=upstart
-         VERSION=0.6.7
+         VERSION=1.4
           SOURCE=$SPELL-$VERSION.tar.gz
-     SOURCE_HASH=sha512:789b66eef67d98e320ae859cb1ee157f86d675adb5cebff5db2eb50a172045925d2a39833c5ae3a5885a6a9ad753fe63bc0ff624e0785075cb952d05ef7bbe09
-   SOURCE_URL[0]=http://upstart.ubuntu.com/download/${VERSION:0:3}/${SOURCE}
+         SOURCE2=${SOURCE}.asc
+   SOURCE_URL[0]=http://upstart.ubuntu.com/download/${VERSION}/${SOURCE}
+#   SOURCE_URL[0]=http://launchpad.net/upstart/1.x/${VERSION}/+download/${SOURCE}
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+  SOURCE2_IGNORE=signature
+      SOURCE_GPG=upstart.gpg:$SOURCE2:UPSTREAM_KEY
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://upstart.ubuntu.com
          ENTERED=20080113
       LICENSE[0]=GPL
            SHORT="init system"
 cat << EOF
-upstart is a replacement for the /sbin/init daemon which handles starting
-of tasks and services during boot,
-stopping them during shutdown and supervising them while the system is running.
+upstart is a replacement for the /sbin/init daemon which handles starting of
+tasks and services during boot, stopping them during shutdown and supervising
+them while the system is running.
 EOF
diff --git a/smgl/upstart/HISTORY b/smgl/upstart/HISTORY
index 02aa917..6badb02 100644
--- a/smgl/upstart/HISTORY
+++ b/smgl/upstart/HISTORY
@@ -1,5 +1,11 @@
-2011-10-14 Bor Kraljič <pyrobor at ver.si>
-	* DETAILS: fixed long description wrap (scripted)
+2012-01-17 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS: version 1.4
+	* PRE_BUILD: fixed removal of sysv-compat jobs
+	* upstart.gpg: added another key they use for releases
+
+2011-11-10 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS: version 1.2, long description <80 col
+	  switched to upstream gpg checking
 
 2011-03-30 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: version 0.6.7
diff --git a/smgl/upstart/PRE_BUILD b/smgl/upstart/PRE_BUILD
index bbb1de0..dfcbe6d 100755
--- a/smgl/upstart/PRE_BUILD
+++ b/smgl/upstart/PRE_BUILD
@@ -1,3 +1,3 @@
 default_pre_build &&
 cd ${SOURCE_DIRECTORY} &&
-sedit 's/util conf doc/util doc/' Makefile.in
+sedit 's/ conf / /' Makefile.in
diff --git a/smgl/upstart/upstart.gpg b/smgl/upstart/upstart.gpg
new file mode 100644
index 0000000..765a46d
Binary files /dev/null and b/smgl/upstart/upstart.gpg differ
diff --git a/windowmanagers/awesome/HISTORY b/windowmanagers/awesome/HISTORY
index 593ba3f..1ec7c95 100644
--- a/windowmanagers/awesome/HISTORY
+++ b/windowmanagers/awesome/HISTORY
@@ -1,3 +1,6 @@
+2012-01-11 Arjan Bouter <abouter at sourcemage.org>
+	* PRE_BUILD: added to fix glib2 include
+
 2011-12-17 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: lua -> lua51
 
diff --git a/windowmanagers/awesome/PRE_BUILD b/windowmanagers/awesome/PRE_BUILD
new file mode 100755
index 0000000..0a1261e
--- /dev/null
+++ b/windowmanagers/awesome/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+sedit 's#glib/gspawn.h#glib-2.0/glib.h#' spawn.c


More information about the SM-Commit mailing list