Source Mage code commit list

[Bor Kraljič <scm AT sourcemage.org>]

GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

 ChangeLog                             |    1 +
 dev/null                              |binary
 printer/pycups/HISTORY                |    3 +++
 printer/pycups/timwaugh.gpg           |    0 
 printer/system-config-printer/DETAILS |    9 ++++-----
 printer/system-config-printer/HISTORY |    4 ++++
 printer/system-config-printer/tim.gpg |    0 
 printer/timwaugh.gpg                  |binary
 8 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 6bd781ac630ad03beab38004012f093740aff4a2
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

    printer/timwaugh.gpg: one gpg can be used for both (pycups & 
system-config-printer)

diff --git a/ChangeLog b/ChangeLog
index 54c8b25..63b092e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
        * kernels/dazuko.gpg: one gpg can be used for both (dazuko & dazukofs)
        * editors/scribus.gpg: one gpg can be used for both (scribus & 
scribus4)
        * gnome2-apps/AE733A47.gpg: one gpg can be used for both (gchempaint 
& gnome-chemistry-utils)
+       * printer/timwaugh.gpg: one gpg can be used for both (pycups & 
system-config-printer)
 
 2011-08-22 Julien "_kaze_" ROZO <julien AT rozo.org>
        * telephony/libsrtp: new spell, an open-source implementation of the
diff --git a/printer/pycups/HISTORY b/printer/pycups/HISTORY
index 190be3e..7f62316 100644
--- a/printer/pycups/HISTORY
+++ b/printer/pycups/HISTORY
@@ -1,3 +1,6 @@
+2011-08-23 Bor Kraljič <pyrobor AT ver.si>
+       * timwaugh.gpg: moved to section folder
+
 2011-08-03 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.9.58, sig -> asc, SHA512 used temporary
        * PRE_BUILD: added to fix Makefile to install cups.so
diff --git a/printer/pycups/timwaugh.gpg b/printer/pycups/timwaugh.gpg
deleted file mode 100644
index e5d176a..0000000
Binary files a/printer/pycups/timwaugh.gpg and /dev/null differ
diff --git a/printer/system-config-printer/DETAILS 
b/printer/system-config-printer/DETAILS
index 193f379..79763a6 100755
--- a/printer/system-config-printer/DETAILS
+++ b/printer/system-config-printer/DETAILS
@@ -1,13 +1,12 @@
            SPELL=system-config-printer
          VERSION=1.3.5
-    
SOURCE_HASH=sha512:2b58dff4328455bd1f9b3a9d4df4a0c00ee7d3f1fbb1404652bbc7161dd08a5ac965371f90ff8d125447bfd9e652ca8d0434f7919b5773b6179e548eda358d11
           SOURCE=$SPELL-$VERSION.tar.xz
-#         SOURCE2=$SOURCE.sig
+         SOURCE2=$SOURCE.sig
+  SOURCE2_IGNORE=signature
+      SOURCE_GPG=timwaugh.gpg:$SOURCE2:UPSTREAM_KEY
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    
SOURCE_URL[0]=http://cyberelk.net/tim/data/system-config-printer/1.3/$SOURCE
-#  SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
-#      SOURCE_GPG=tim.gpg:$SOURCE.sig:UPSTREAM_KEY
-#  SOURCE2_IGNORE=signature
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
         WEB_SITE=http://cyberelk.net/tim/software/system-config-printer/
       LICENSE[0]=GPL
          ENTERED=20081113
diff --git a/printer/system-config-printer/HISTORY 
b/printer/system-config-printer/HISTORY
index eaf0b8b..6c86ee2 100644
--- a/printer/system-config-printer/HISTORY
+++ b/printer/system-config-printer/HISTORY
@@ -1,3 +1,7 @@
+2011-08-23 Bor Kraljič <pyrobor AT ver.si>
+       * DETAILS: use timwaugh.gpg as keyring
+       * tim.gpg: removed, no longer needed
+
 2011-08-03 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.3.5
        * PRE_BUILD, no-packagekit.patch: added patch form Arch
diff --git a/printer/system-config-printer/tim.gpg 
b/printer/system-config-printer/tim.gpg
deleted file mode 100644
index e6baa83..0000000
Binary files a/printer/system-config-printer/tim.gpg and /dev/null differ
diff --git a/printer/timwaugh.gpg b/printer/timwaugh.gpg
new file mode 100644
index 0000000..e5d176a
Binary files /dev/null and b/printer/timwaugh.gpg differ