From e8d181c132ff5fc4c5f4e10f267edb6b884c7561 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 2 May 2008 14:25:37 -0700
Subject: [PATCH] version 0.4.50

---
 .bzrignore              |  4 +++-
 setup.py                |  4 ++--
 src/calibre/__init__.py |  2 +-
 upload.py               | 25 +++++++++++++------------
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/.bzrignore b/.bzrignore
index 51fd860418..a634f5e7aa 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -5,4 +5,6 @@ src/calibre/gui2/images.qrc
 src/calibre/gui2/images_rc.py
 src/calibre/manual/.build/
 src/calibre/manual/cli/
-
+build
+dist
+docs
diff --git a/setup.py b/setup.py
index 5c3591b9a6..5bf0f0cc73 100644
--- a/setup.py
+++ b/setup.py
@@ -79,10 +79,10 @@ if __name__ == '__main__':
           For installation/usage instructions please see 
           http://%s.kovidgoyal.net
           
-          For source code access: bzr branch http://bzr.kovidgoyal.net/code/%s/trunk %s 
+          For source code access: bzr branch lp:%s 
           To update your copy of the source code: bzr merge
             
-          """%(APPNAME, APPNAME, APPNAME, APPNAME, APPNAME),
+          """%(APPNAME, APPNAME, APPNAME, APPNAME),
           license = 'GPL', 
           classifiers = [
             'Development Status :: 4 - Beta', 
diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py
index 858bc21508..36166fbf46 100644
--- a/src/calibre/__init__.py
+++ b/src/calibre/__init__.py
@@ -1,7 +1,7 @@
 ''' E-book management software'''
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
-__version__   = '0.4.49'
+__version__   = '0.4.50'
 __docformat__ = "epytext"
 __author__    = "Kovid Goyal <kovid at kovidgoyal.net>"
 __appname__   = 'calibre'
diff --git a/upload.py b/upload.py
index 4ca08842f9..0156a3f32b 100644
--- a/upload.py
+++ b/upload.py
@@ -20,6 +20,7 @@ check_call = partial(_check_call, shell=True)
 
 def tag_release():
     print 'Tagging release'
+    check_call('bzr commit -m "Updated translations"')
     check_call('bzr tag '+__version__) 
             
 def build_installer(installer, vm, timeout=25):
@@ -74,36 +75,36 @@ def upload_demo():
                '''--mono-family  "/usr/share/fonts/corefonts, Andale Mono" '''
                ''''''%(HTML2LRF,))
     check_call('cd src/calibre/ebooks/lrf/html/demo/ && zip -j /tmp/html-demo.zip * /tmp/html2lrf.lrf')
-    check_call('''scp /tmp/html-demo.zip castalia:%s/'''%(DOWNLOADS,))
+    check_call('''scp /tmp/html-demo.zip divok:%s/'''%(DOWNLOADS,))
     check_call('''txt2lrf -t 'Demonstration of txt2lrf' -a 'Kovid Goyal' '''
                '''--header -o /tmp/txt2lrf.lrf %s/demo.txt'''%(TXT2LRF,) )
     check_call('cd src/calibre/ebooks/lrf/txt/demo/ && zip -j /tmp/txt-demo.zip * /tmp/txt2lrf.lrf')
-    check_call('''scp /tmp/txt-demo.zip castalia:%s/'''%(DOWNLOADS,))
+    check_call('''scp /tmp/txt-demo.zip divok:%s/'''%(DOWNLOADS,))
 
 def upload_installers():
     exe, dmg = installer_name('exe'), installer_name('dmg')
     if exe and os.path.exists(exe):
-        check_call('''ssh castalia rm -f %s/calibre\*.exe'''%(DOWNLOADS,))
-        check_call('''scp %s castalia:%s/'''%(exe, DOWNLOADS))
-        check_call('''ssh castalia rm -f %s/calibre\*.dmg'''%(DOWNLOADS,))
+        check_call('''ssh divok rm -f %s/calibre\*.exe'''%(DOWNLOADS,))
+        check_call('''scp %s divok:%s/'''%(exe, DOWNLOADS))
+        check_call('''ssh divok rm -f %s/calibre\*.dmg'''%(DOWNLOADS,))
     if dmg and os.path.exists(dmg):
-        check_call('''scp %s castalia:%s/'''%(dmg, DOWNLOADS))
-        check_call('''ssh castalia chmod a+r %s/\*'''%(DOWNLOADS,))
-        check_call('''ssh castalia /root/bin/update-installer-links %s %s'''%(exe, dmg))
+        check_call('''scp %s divok:%s/'''%(dmg, DOWNLOADS))
+        check_call('''ssh divok chmod a+r %s/\*'''%(DOWNLOADS,))
+        check_call('''ssh divok /root/bin/update-installer-links %s %s'''%(exe, dmg))
 
 def upload_docs():
     check_call('''epydoc --config epydoc.conf''')
-    check_call('''scp -r docs/html castalia:%s/'''%(DOCS,))
+    check_call('''scp -r docs/html divok:%s/'''%(DOCS,))
     check_call('''epydoc -v --config epydoc-pdf.conf''')
-    check_call('''scp docs/pdf/api.pdf castalia:%s/'''%(DOCS,))
+    check_call('''scp docs/pdf/api.pdf divok:%s/'''%(DOCS,))
 
 def upload_user_manual():
     cwd = os.getcwdu()
     os.chdir('src/calibre/manual')
     try:
         check_call('make clean html')
-        check_call('ssh castalia rm -rf %s/\\*'%USER_MANUAL)
-        check_call('scp -r .build/html/* castalia:%s'%USER_MANUAL)
+        check_call('ssh divok rm -rf %s/\\*'%USER_MANUAL)
+        check_call('scp -r .build/html/* divok:%s'%USER_MANUAL)
     finally:
         os.chdir(cwd)