diff --git a/src/calibre/trac/plugins/download.py b/src/calibre/trac/plugins/download.py index 938e088447..78694588d9 100644 --- a/src/calibre/trac/plugins/download.py +++ b/src/calibre/trac/plugins/download.py @@ -114,10 +114,6 @@ else: return self.osx(req) elif os == 'linux': return self.linux(req) - elif 'binary' in os: - return self.linux_binary(req) - else: - return self.linux_distro(req, os) def top_level(self, req): operating_systems = [ @@ -172,10 +168,6 @@ else: '''%dict(appname=__appname__))) return 'binary.html', data, None - def linux_binary(self, req): - version = self.version_from_filename() - return 'pyinstaller.html', {'app':__appname__, 'version':version}, None - def osx(self, req): version = self.version_from_filename() file = 'calibre-%s.dmg'%(version,) @@ -196,7 +188,7 @@ else: def linux(self, req): data = get_linux_data(version=self.version_from_filename()) - return 'download.html', data, None + return 'linux.html', data, None LINUX_INSTALLER = r''' diff --git a/src/calibre/trac/plugins/templates/distro.html b/src/calibre/trac/plugins/templates/distro.html deleted file mode 100644 index e735c6f4ad..0000000000 --- a/src/calibre/trac/plugins/templates/distro.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - $title - - - - - -
-

$title

- See the Changelog for the changes in the latest version. Note: As of 0.4.80 this install - will not work on 64-bit CPUs. Try the precompiled binary available here instead. -
- First verify that you have a sufficiently new installation of python - 
python --version
should return at least 2.5.1
-

- Make sure your python is compiled with the sqlite USE flag. -

-
- Run the following commands in a terminal as root - 
${distro.command}
-
-

Manual steps

-
    - ${distro.manual} -
-
-
-
-
    -
  1. Make sure that your system has python >= 2.5
    2. -
  2. Install the various dependencies listed below: Make sure that any python packages are installed into python2.5 (e.g. setuptools, python-imaging, PyQt4, etc). You will also have to install the development versions of the packages (these packages usually have -dev added to their names).
    3. -
  3. Run the following commands in a terminal: - 
    -wget -O- http://calibre.kovidgoyal.net/downloads/calibre-${version}.tar.gz | tar xvz 
-cd calibre*
-python setup.py build && sudo python setup.py install
-
    4. -
-

Dependencies

- - - - - - - - -
NameMinimum version
${dep[0]}${dep[1]}
HAL0.5.10
-
- While you wait for the installation to complete, please consider donating to support the development of ${distro.app}. -
-
- - - - -
-
-
- - diff --git a/src/calibre/trac/plugins/templates/download.html b/src/calibre/trac/plugins/templates/download.html index 97f3000810..f0eee5de7e 100644 --- a/src/calibre/trac/plugins/templates/download.html +++ b/src/calibre/trac/plugins/templates/download.html @@ -6,142 +6,36 @@ xmlns:xi="http://www.w3.org/2001/XInclude"> - ${title} - + $title +

If you have a 64bit computer, or an outdated operating system, the distribution + specific installation may not work for you. In that case, first try the binary installer. + If that also does not work, your only recourse is to try to install from source. In order + to do that you will have to install all the dependencies as well as the -dev package of PyQt4. +

+
-

${title}

-

- The latest release of ${app} is ${version}. See the - Changelog for a list of new features. -

-

- ${app} is available in the software repositories of the following - linux distributions: - - - - - - - - - - -
Supported distributionsUnsupported distributions
-
-
- ${distro.title} -
- ${distro.title} -
- 		-
-

Binary install

-

- ${app} has a binary installer that has been - tested on a number of distributions on both - 32-bit and 64-bit x86 machines. To install, - copy paste the following command into a terminal - and press Enter: -

- 
-sudo python -c "import urllib2; exec urllib2.urlopen('http://calibre.kovidgoyal.net/download_linux_binary_installer').read(); main()"
-
-

Note

-
    -
  • - When running the command line utilities, - they will segfault after completion. This can - be ignored. -
    • -
  • - You must have help2man and xdg-utils installed - on your system before running the installer. -
    • -
-

Source install

-

-

    -
  1. - Make sure your system has python ≥ ${dependencies[0][1]} -
    2. -
  2. - Install the various dependencies listed below -
    3. -
  3. - Run the following commands in a terminal: -
    4. -
- 
-wget -O- http://calibre.kovidgoyal.net/downloads/${app}-${version}.tar.gz | tar xvz 
-cd calibre*
-python setup.py build && sudo python setup.py install
-
- Note that if your distribution does not have a - correctly compiled libunrar.so, ${app} will not - support rar files. -

-
-
-

-

- While you wait for the download to complete, please consider - donating to support the development of ${app}. -

-
-
- - - - -
-
-
-

Dependencies

- ${app} has the following dependencies (the listed version is the minimum version) -

- - - - - - - - -
PackageVersion
${dep[0]}${dep[1]}
+

$title

+
+ + + + +
+ + + + +
+ ${os['title']} + +
+
+ +
diff --git a/src/calibre/trac/plugins/templates/linux.html b/src/calibre/trac/plugins/templates/linux.html new file mode 100644 index 0000000000..97f3000810 --- /dev/null +++ b/src/calibre/trac/plugins/templates/linux.html @@ -0,0 +1,147 @@ + + + + + ${title} + + + + + +
+

${title}

+

+ The latest release of ${app} is ${version}. See the + Changelog for a list of new features. +

+

+ ${app} is available in the software repositories of the following + linux distributions: + + + + + + + + + + +
Supported distributionsUnsupported distributions
+
+
+ ${distro.title} +
+ ${distro.title} +
+ 		+
+

Binary install

+

+ ${app} has a binary installer that has been + tested on a number of distributions on both + 32-bit and 64-bit x86 machines. To install, + copy paste the following command into a terminal + and press Enter: +

+ 
+sudo python -c "import urllib2; exec urllib2.urlopen('http://calibre.kovidgoyal.net/download_linux_binary_installer').read(); main()"
+
+

Note

+
    +
  • + When running the command line utilities, + they will segfault after completion. This can + be ignored. +
    • +
  • + You must have help2man and xdg-utils installed + on your system before running the installer. +
    • +
+

Source install

+

+

    +
  1. + Make sure your system has python ≥ ${dependencies[0][1]} +
    2. +
  2. + Install the various dependencies listed below +
    3. +
  3. + Run the following commands in a terminal: +
    4. +
+ 
+wget -O- http://calibre.kovidgoyal.net/downloads/${app}-${version}.tar.gz | tar xvz 
+cd calibre*
+python setup.py build && sudo python setup.py install
+
+ Note that if your distribution does not have a + correctly compiled libunrar.so, ${app} will not + support rar files. +

+
+
+

+

+ While you wait for the download to complete, please consider + donating to support the development of ${app}. +

+
+
+ + + + +
+
+
+

Dependencies

+ ${app} has the following dependencies (the listed version is the minimum version) +

+ + + + + + + + +
PackageVersion
${dep[0]}${dep[1]}
+
+ + diff --git a/src/calibre/trac/plugins/templates/pyinstaller.html b/src/calibre/trac/plugins/templates/pyinstaller.html deleted file mode 100644 index f85b3b9499..0000000000 --- a/src/calibre/trac/plugins/templates/pyinstaller.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - Download $app for Linux - - - - - -
-

Download $app for Linux

-

This binary package is compatible with most recent linux distributions running on Intel 32 bit CPUs. It needs testing on 64 bit CPUs. There have been reports of its working on some 64bit machines.

-

- - (Version: $version Changelog) -

-

To install, copy paste the following command into a terminal and press Enter: -

- 
sudo python -c "import urllib2; exec urllib2.urlopen('http://calibre.kovidgoyal.net/download_linux_binary_installer').read(); main()"
-

- While you wait for the download to complete, please consider donating to support the development - of ${app}.

-
-
- - - - -
- -
-

Note

-
-
    -
  • This installer is very new and has only been tested on a couple of systems, so if you encounter - problems, please report them.
    • -
  • You shoud have help2man and xdg-utils installed on your system.
    • -
-
-
- -