[Checkins] SVN: zopyx.convert2/branches/calibre-integration/ preliminary Calibre integration

[Andreas Jung]

Log message for revision 103589:
  preliminary Calibre integration
  

Changed:
  U   zopyx.convert2/branches/calibre-integration/CHANGES.txt
  U   zopyx.convert2/branches/calibre-integration/setup.py
  U   zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/__init__.py

-=-
Modified: zopyx.convert2/branches/calibre-integration/CHANGES.txt
===================================================================
--- zopyx.convert2/branches/calibre-integration/CHANGES.txt	2009-09-05 12:06:50 UTC (rev 103588)
+++ zopyx.convert2/branches/calibre-integration/CHANGES.txt	2009-09-05 12:32:39 UTC (rev 103589)
@@ -1,3 +1,7 @@
+2.1.0 (unreleased)
+==================
+- Calibre integration
+
 2.0.4 (2009-07-07)
 ====================
 - pinned BeautifulSoup 3.0.x

Modified: zopyx.convert2/branches/calibre-integration/setup.py
===================================================================
--- zopyx.convert2/branches/calibre-integration/setup.py	2009-09-05 12:06:50 UTC (rev 103588)
+++ zopyx.convert2/branches/calibre-integration/setup.py	2009-09-05 12:32:39 UTC (rev 103589)
@@ -12,7 +12,7 @@
     'Programming Language :: Python',
 ]
 
-version = '2.0.4'
+version = '2.1.0-dev'
 
 desc = unicode(file('README.txt').read().strip(), 'utf-8')
 changes = file('CHANGES.txt').read().strip()

Modified: zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/__init__.py
===================================================================
--- zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/__init__.py	2009-09-05 12:06:50 UTC (rev 103588)
+++ zopyx.convert2/branches/calibre-integration/src/zopyx/convert2/__init__.py	2009-09-05 12:32:39 UTC (rev 103589)
@@ -10,6 +10,7 @@
 import fop
 import prince
 import xfc
+import calibre
 from convert import Converter