Source Mage code commit list

[Robin Cook <scm AT sourcemage.org>]

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

 dev/null                                         |binary
 disk/libmtp/DETAILS                              |    4 ++--
 disk/libmtp/HISTORY                              |    3 +++
 disk/libmtp/libmtp-1.1.5.tar.gz.sig              |binary
 python-pypi/calibre/DEPENDS                      |    3 ++-
 python-pypi/calibre/DETAILS                      |    2 +-
 python-pypi/calibre/HISTORY                      |    5 +++++
 python-pypi/calibre/calibre-0.8.53.tar.xz.sig    |    0 
 python-pypi/calibre/calibre-0.8.70.tar.xz.sig    |binary
 python-pypi/calibre/calibre-stop-phone-home.diff |   21 ++++++++-------------
 10 files changed, 21 insertions(+), 17 deletions(-)

New commits:
commit ae7da904c361dbd09f9dfcbe6fb28effc9bdfb5a
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

    calibre: updated to 0.8.70

commit 9901e4dc165cdb217fb2f00ab690a3e5e67e1270
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

    libmtp: updated to 1.1.5

diff --git a/disk/libmtp/DETAILS b/disk/libmtp/DETAILS
index 32529a3..362c763 100755
--- a/disk/libmtp/DETAILS
+++ b/disk/libmtp/DETAILS
@@ -1,8 +1,8 @@
            SPELL=libmtp
-         VERSION=1.0.6
+         VERSION=1.1.5
           SOURCE="$SPELL-$VERSION.tar.gz"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     
SOURCE_HASH=sha512:f82b1da6b1b4b2504a742120f32c12260f5dae51f0d8526d94cf6cfb64c5b6d334cae8d8ac87c0ea93551fd8be97a64dd82ebb102d249e0a2403dff2cd64728f
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE="http://libmtp.sourceforge.net/";
       LICENSE[0]=LGPL
diff --git a/disk/libmtp/HISTORY b/disk/libmtp/HISTORY
index d0a0d40..d9e2449 100644
--- a/disk/libmtp/HISTORY
+++ b/disk/libmtp/HISTORY
@@ -1,3 +1,6 @@
+2012-09-22 Robin Cook <rcook AT wyrms.net>
+       * DETAILS: updated VERSION to 1.1.5
+
 2011-02-13 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.0.6
 
diff --git a/disk/libmtp/libmtp-1.1.5.tar.gz.sig 
b/disk/libmtp/libmtp-1.1.5.tar.gz.sig
new file mode 100644
index 0000000..b8eab4c
Binary files /dev/null and b/disk/libmtp/libmtp-1.1.5.tar.gz.sig differ
diff --git a/python-pypi/calibre/DEPENDS b/python-pypi/calibre/DEPENDS
index 8c42a41..c434fca 100755
--- a/python-pypi/calibre/DEPENDS
+++ b/python-pypi/calibre/DEPENDS
@@ -20,4 +20,5 @@ depends -sub "QT4 XPDF_HEADERS" poppler &&
 depends libwmf &&
 depends sqlite &&
 depends icu &&
-depends dnspython
+depends dnspython &&
+depends libmtp 
diff --git a/python-pypi/calibre/DETAILS b/python-pypi/calibre/DETAILS
index 0925bb5..fabb801 100755
--- a/python-pypi/calibre/DETAILS
+++ b/python-pypi/calibre/DETAILS
@@ -1,5 +1,5 @@
            SPELL=calibre
-         VERSION=0.8.53
+         VERSION=0.8.70
           SOURCE="${SPELL}-${VERSION}.tar.xz"
    SOURCE_URL[0]=http://calibre-ebook.googlecode.com/files/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/python-pypi/calibre/HISTORY b/python-pypi/calibre/HISTORY
index 1a3cf87..0a310d5 100644
--- a/python-pypi/calibre/HISTORY
+++ b/python-pypi/calibre/HISTORY
@@ -1,3 +1,8 @@
+2012-09-22 Robin Cook <rcook AT wyrms.net>
+       * DETAILS: updated VERSION to 0.8.70
+       * DEPENDS: added libmtp
+       * PRE_BUILD: updated phone home patch
+
 2012-05-28 Robin Cook <rcook AT wyrms.net>
        * DETAILS: updated VERSION to 0.8.53
 
diff --git a/python-pypi/calibre/calibre-0.8.53.tar.xz.sig 
b/python-pypi/calibre/calibre-0.8.53.tar.xz.sig
deleted file mode 100644
index 7e2ff6a..0000000
Binary files a/python-pypi/calibre/calibre-0.8.53.tar.xz.sig and /dev/null 
differ
diff --git a/python-pypi/calibre/calibre-0.8.70.tar.xz.sig 
b/python-pypi/calibre/calibre-0.8.70.tar.xz.sig
new file mode 100644
index 0000000..2e8ecb9
Binary files /dev/null and b/python-pypi/calibre/calibre-0.8.70.tar.xz.sig 
differ
diff --git a/python-pypi/calibre/calibre-stop-phone-home.diff 
b/python-pypi/calibre/calibre-stop-phone-home.diff
index ddd20aa..6c3f09d 100644
--- a/python-pypi/calibre/calibre-stop-phone-home.diff
+++ b/python-pypi/calibre/calibre-stop-phone-home.diff
@@ -1,7 +1,7 @@
-diff -ur calibre/src/calibre/gui2/update.py 
calibre-mod/src/calibre/gui2/update.py
---- calibre/src/calibre/gui2/update.py 2011-09-09 11:46:16.000000000 -0500
-+++ calibre-mod/src/calibre/gui2/update.py     2011-09-17 17:52:39.505641255 
-0500
-@@ -20,14 +20,15 @@
+diff -ur calibre.orig/src/calibre/gui2/update.py 
calibre/src/calibre/gui2/update.py
+--- calibre.orig/src/calibre/gui2/update.py    2012-09-20 16:27:22.398340171 
-0500
++++ calibre/src/calibre/gui2/update.py 2012-09-20 16:27:58.594339911 -0500
+@@ -20,18 +20,6 @@
  VSEP = '|'
  
  def get_newest_version():
@@ -12,16 +12,11 @@ diff -ur calibre/src/calibre/gui2/update.py 
calibre-mod/src/calibre/gui2/update.
 -            'win' if iswindows else 'osx' if isosx else 'oth')
 -    req.add_header('CALIBRE_INSTALL_UUID', prefs['installation_uuid'])
 -    version = br.open(req).read().strip()
+-    try:
+-        version = version.decode('utf-8')
+-    except UnicodeDecodeError:
+-        version = u''
 -    return version
-+    #br = browser()
-+    #req = mechanize.Request(URL)
-+    #req.add_header('CALIBRE_VERSION', __version__)
-+    #req.add_header('CALIBRE_OS',
-+    #        'win' if iswindows else 'osx' if isosx else 'oth')
-+    #req.add_header('CALIBRE_INSTALL_UUID', prefs['installation_uuid'])
-+    #version = br.open(req).read().strip()
-+    #return version
-+    return '-0.0.0'
  
  class CheckForUpdates(QThread):