From b99bec90d3726452116684b40be5b65f7a6eea4e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 27 Aug 2009 09:40:05 -0600
Subject: [PATCH] IGN:64-bit linux binary. Also initial windows only PRS600
 driver

---
 src/calibre/customize/builtins.py             |  3 ++-
 src/calibre/devices/prs700/driver.py          |  9 +++++++++
 src/calibre/gui2/wizard/__init__.py           |  1 +
 src/calibre/trac/plugins/templates/linux.html | 11 +----------
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 069d13b55d..3493ace26a 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -364,7 +364,7 @@ from calibre.devices.jetbook.driver import JETBOOK
 from calibre.devices.kindle.driver import KINDLE, KINDLE2, KINDLE_DX
 from calibre.devices.prs500.driver import PRS500
 from calibre.devices.prs505.driver import PRS505
-from calibre.devices.prs700.driver import PRS700
+from calibre.devices.prs700.driver import PRS700, PRS600
 from calibre.devices.android.driver import ANDROID
 
 plugins = [HTML2ZIP]
@@ -413,6 +413,7 @@ plugins += [
     PRS500,
     PRS505,
     PRS700,
+    PRS600,
     ANDROID,
     CYBOOK_OPUS,
     COOL_ER
diff --git a/src/calibre/devices/prs700/driver.py b/src/calibre/devices/prs700/driver.py
index 7856ef0b34..aa6e2cf83e 100644
--- a/src/calibre/devices/prs700/driver.py
+++ b/src/calibre/devices/prs700/driver.py
@@ -28,3 +28,12 @@ class PRS700(PRS505):
     OSX_CARD_A_MEM = re.compile(r'Sony PRS-700/[^:]+:MS Media')
     OSX_CARD_B_MEM = re.compile(r'Sony PRS-700/[^:]+:SD Media')
 
+class PRS600(PRS700):
+
+    name = 'PRS-600 Device Interface'
+    description = PRS700.description.replace('700', '600')
+
+    WINDOWS_MAIN_MEM = 'PRS-600'
+    WINDOWS_CARD_A_MEM = re.compile(r'PRS-700/\S+:MS')
+    WINDOWS_CARD_B_MEM = re.compile(r'PRS-700/\S+:SD')
+
diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py
index 7045f6334d..d00417205d 100644
--- a/src/calibre/gui2/wizard/__init__.py
+++ b/src/calibre/gui2/wizard/__init__.py
@@ -486,6 +486,7 @@ class LibraryPage(QWizardPage, LibraryUI):
                 try:
                     os.makedirs(lp)
                 except:
+                    traceback.print_exc()
                     lp = os.path.expanduser('~')
         self.location.setText(lp)
 
diff --git a/src/calibre/trac/plugins/templates/linux.html b/src/calibre/trac/plugins/templates/linux.html
index 7dafa6a6d8..1a2d803841 100644
--- a/src/calibre/trac/plugins/templates/linux.html
+++ b/src/calibre/trac/plugins/templates/linux.html
@@ -78,7 +78,7 @@
                                 and press Enter: 
                             </p>
                             <pre class="wiki">
-sudo python -c "import urllib2; exec urllib2.urlopen('http://calibre.kovidgoyal.net/download_linux_binary_installer').read(); main()"
+sudo python -c "import urllib2; exec urllib2.urlopen('http://status.calibre-ebook.com/linux_installer').read(); main()"
                             </pre>
                             <h4>Note</h4>
                             <ul>
@@ -91,15 +91,6 @@ sudo python -c "import urllib2; exec urllib2.urlopen('http://calibre.kovidgoyal.
                                     You must have xdg-utils installed 
                                     on your system before running the installer.
                                 </li>
-                                <li>
-                                    For device automounting to work, you must have the pmount 
-                                    package installed on your system.
-                                </li>
-                                <li>
-                                    On a 64bit machine, you must have 32-bit versions
-                                    of common libraries like X11, freetype, fontconfig,
-                                    expat and their various dependencies installed.
-                                </li>
                             </ul>
                             <h3>Source install</h3>
                             <p>