Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (4858b16324d98494988091d83d81134a3c9c71d9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (4858b16324d98494988091d83d81134a3c9c71d9)
  • Date: Thu, 3 Nov 2011 20:50:52 -0500

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

python-pypi/calibre/DETAILS | 4 +--
python-pypi/calibre/HISTORY | 8 ++++++
python-pypi/calibre/PREPARE | 1
python-pypi/calibre/PRE_BUILD | 6 +++++
python-pypi/calibre/calibre-0.8.24.tar.gz.sig |binary
python-pypi/calibre/calibre-stop-phone-home.diff | 27
+++++++++++++++++++++++
6 files changed, 44 insertions(+), 2 deletions(-)

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

calibre: updated to 0.8.24 added option to disable phone home.

diff --git a/python-pypi/calibre/DETAILS b/python-pypi/calibre/DETAILS
index 5ee65bb..73a654e 100755
--- a/python-pypi/calibre/DETAILS
+++ b/python-pypi/calibre/DETAILS
@@ -1,8 +1,8 @@
SPELL=calibre
- VERSION=0.8.22
+ VERSION=0.8.24
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://calibre-ebook.googlecode.com/files/$SOURCE
-
SOURCE_HASH=sha512:8267bc3b59ac88835f3af96c923ba29904dbc9a7d1db9069b0ed33b616e5f483c3d84463119fb37593f56e3b81deb7e6ac425f7fcd40f4c55c74d07b5bf934ff
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
WEB_SITE="http://calibre.kovidgoyal.net/";
LICENSE[0]=GPL
diff --git a/python-pypi/calibre/HISTORY b/python-pypi/calibre/HISTORY
index b0843c8..71bb522 100644
--- a/python-pypi/calibre/HISTORY
+++ b/python-pypi/calibre/HISTORY
@@ -1,3 +1,11 @@
+2011-11-03 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.8.24
+
+2011-11.03 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated to 0.8.24
+ * PREPARE: added to disable phone home
+ * PRE_BUILD: added to apply disable phone home patch
+
2011-10-18 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 0.8.22

diff --git a/python-pypi/calibre/PREPARE b/python-pypi/calibre/PREPARE
new file mode 100755
index 0000000..02a99e7
--- /dev/null
+++ b/python-pypi/calibre/PREPARE
@@ -0,0 +1 @@
+config_query CALIBRE_PHOME "Patch to disable phone home?" n
diff --git a/python-pypi/calibre/PRE_BUILD b/python-pypi/calibre/PRE_BUILD
new file mode 100755
index 0000000..d0009d9
--- /dev/null
+++ b/python-pypi/calibre/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+if [ "$CALIBRE_PHOME" = "y" ]; then
+ patch -p1 < $SCRIPT_DIRECTORY/calibre-stop-phone-home.diff
+fi
diff --git a/python-pypi/calibre/calibre-0.8.24.tar.gz.sig
b/python-pypi/calibre/calibre-0.8.24.tar.gz.sig
new file mode 100644
index 0000000..944ccf7
Binary files /dev/null and b/python-pypi/calibre/calibre-0.8.24.tar.gz.sig
differ
diff --git a/python-pypi/calibre/calibre-stop-phone-home.diff
b/python-pypi/calibre/calibre-stop-phone-home.diff
new file mode 100644
index 0000000..ddd20aa
--- /dev/null
+++ b/python-pypi/calibre/calibre-stop-phone-home.diff
@@ -0,0 +1,27 @@
+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 @@
+ VSEP = '|'
+
+ def get_newest_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
++ #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):
+



  • [SM-Commit] GIT changes to master grimoire by Robin Cook (4858b16324d98494988091d83d81134a3c9c71d9), Robin Cook, 11/03/2011

Archive powered by MHonArc 2.6.24.

Top of Page