Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Sync to trunk.

Browse Source
This commit is contained in:
John Schember 2009-07-25 11:49:14 -04:00
commit d581c9a2cb
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -169,7 +169,7 @@ if __name__ == '__main__':
http://%s.kovidgoyal.net http://%s.kovidgoyal.net
For source code access: For source code access:
bzr branch %s bzr branch lp:%s
To update your copy of the source code: To update your copy of the source code:
bzr merge bzr merge

6
src/calibre/devices/jetbook/driver.py
View File

@ -28,16 +28,16 @@ class JETBOOK(USBMS):
VENDOR_NAME = 'LINUX' VENDOR_NAME = 'LINUX'
WINDOWS_MAIN_MEM = 'EBOOK' WINDOWS_MAIN_MEM = 'EBOOK'
WINDOWS_CARD_MEM = 'EBOOK' WINDOWS_CARD_A_MEM = 'EBOOK'
OSX_MAIN_MEM = None OSX_MAIN_MEM = None
OSX_CARD_MEM = None OSX_CARD_A_MEM = None
MAIN_MEMORY_VOLUME_LABEL = 'Jetbook Main Memory' MAIN_MEMORY_VOLUME_LABEL = 'Jetbook Main Memory'
STORAGE_CARD_VOLUME_LABEL = 'Jetbook Storage Card' STORAGE_CARD_VOLUME_LABEL = 'Jetbook Storage Card'
EBOOK_DIR_MAIN = "Books" EBOOK_DIR_MAIN = "Books"
EBOOK_DIR_CARD = "Books" EBOOK_DIR_CARD_A = "Books"
SUPPORTS_SUB_DIRS = True SUPPORTS_SUB_DIRS = True
JETBOOK_FILE_NAME_PATTERN = re.compile( JETBOOK_FILE_NAME_PATTERN = re.compile(

2
src/calibre/trac/plugins/Changelog.py
View File

@ -48,7 +48,7 @@ class ChangelogFormatter(blog.LogFormatter):
txt = ['= Changelog =\n[[PageOutline]]'] txt = ['= Changelog =\n[[PageOutline]]']
for entry in self.entries: for entry in self.entries:
txt.append(u'----\n== Version '+entry[0]+' ==') txt.append(u'----\n== Version '+entry[0]+' ==')
if entry[0] == '0.6.0': if entry[0].strip().startswith('0.6.0'):
txt.append(u'For a list of new features in 0.6.0 see http://calibre.kovidgoyal.net/new_in_6') txt.append(u'For a list of new features in 0.6.0 see http://calibre.kovidgoyal.net/new_in_6')
else: else:
for msg in entry[1]: for msg in entry[1]: