--- calibre-0.6.12+dfsg.orig/debian/calibre.README.Debian +++ calibre-0.6.12+dfsg/debian/calibre.README.Debian @@ -0,0 +1,20 @@ +calibre for Debian +================== + +Customizing LRF fonts +--------------------- +By default, the calibre package maps the LRF standard fonts to the the +free Liberation fonts (package ttf-liberation): + + Swis721 BT Roman -> LiberationSans-Regular.ttf + Dutch801 Rm BT Roman -> LiberationSerif-Regular.ttf + Courier10 BT Roman -> LiberationMono-Regular.ttf + +You can customize this mapping by creating a directory +/etc/calibre/fonts with three symlinks (or files) to the TrueType +fonts you want to use: + + /etc/calibre/fonts/tt0003m_.ttf -> point to Swis721 BT Roman font + /etc/calibre/fonts/tt0011m_.ttf -> point to Dutch801 Rm BT Roman font + /etc/calibre/fonts/tt0419m_.ttf -> point to Courier10 BT Roman font + --- calibre-0.6.12+dfsg.orig/debian/rules +++ calibre-0.6.12+dfsg/debian/rules @@ -0,0 +1,88 @@ +#!/usr/bin/make -f + +DEB_PYTHON_SYSTEM := pycentral + +DEB_DH_INSTALL_SOURCEDIR := debian/tmp + +# This filters out *.so for the package "calibre". With this, we can +# install usr/lib in calibre.install and just leave out the binary +# bits. +DEB_DH_INSTALL_ARGS = $(if $(findstring -bin,$(cdbs_curpkg)),,-X*.so) + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/class/python-distutils.mk + +DEB_PYTHON_BUILD_ARGS = +DEB_PYTHON_INSTALL_ARGS_ALL := + +install/calibre:: + # cdbs >= 0.4.53 does not call setup.py install any more (#525436); + # hackish workaround: + mkdir -p debian/tmp/usr/bin + [ -e debian/tmp/usr/bin/calibre ] || python setup.py install --root=debian/tmp $(DEB_PYTHON_INSTALL_ARGS_ALL) + + # remove bundled python libraries which are provided by system + # packages + rm -r debian/tmp/usr/lib/calibre/cherrypy + rm -r debian/tmp/usr/lib/calibre/cssutils + rm -r debian/tmp/usr/lib/calibre/encutils + rm -r debian/tmp/usr/lib/calibre/pyPdf + + # this is crack, and we have automounting + rm debian/tmp/usr/bin/calibre-mount-helper + + # we do need the bundled cssutils' profiles.py, though + cp src/cssutils/profiles.py debian/tmp/usr/lib/calibre/cssutils_profiles.py + + # remove hardcoded prs500 fonts, so that calibre falls back to + # using the liberation ones in /usr/share/fonts/ + rm -r debian/tmp/usr/share/calibre/fonts/prs500/ + + # do not ship a copy of ttf-liberation + rm -r debian/tmp/usr/share/calibre/fonts/liberation/ + ln -s /usr/share/fonts/truetype/ttf-liberation/ debian/tmp/usr/share/calibre/fonts/liberation + + # fix executable permissions + find debian/tmp/usr/lib/calibre/calibre -type f | xargs chmod a-x + + # add icon + mkdir -p debian/tmp/usr/share/pixmaps/ + cp src/calibre/manual/resources/logo.png debian/tmp/usr/share/pixmaps/calibre.png + + # Create and install some of the man pages + $(MAKE) -C debian/man VERSION="$(MAIN_VERSION)" + + # call postinst function to generate udev rule, and manpages + PYTHONPATH=`pwd`/debian/tmp/usr/lib/calibre DESTDIR=`pwd`/debian/calibre debian/tmp/usr/bin/calibre_postinstall --use-destdir --dont-check-root --do-not-reload-udev-hal + rm debian/tmp/usr/bin/calibre_postinstall + mkdir debian/calibre/lib/ + mv debian/calibre/etc/udev debian/calibre/lib + + dh_buildinfo + +clean:: + rm -f src/calibre/cssutils_profiles.py + rm -rf debian/orig + [ ! -d build ] || python setup.py build -c + $(MAKE) -C debian/man clean + +# Downloads the current upstream release according to +# debian/changelog, and replace the non-free prs500 TTFs with symlinks +# to their free liberation fonts counterparts. This also updates the unpacked +# source tree to the new upstream version. +get-orig-source: + set -e; \ + V=`dpkg-parsechangelog | sed -rn '/^Version:/ {s/^Version: ([0-9.]+).*$$/\1/; p}'`; \ + mkdir -p debian/orig/calibre-$$V; cd debian/orig/calibre-$$V; \ + wget -O - http://calibre.kovidgoyal.net/downloads/calibre-$$V.tar.gz | tar xz; \ + cd ..; \ + D=`pwd`; rm -f calibre-*/src/odf/thumbnail.py; \ + cd calibre-*/resources/fonts; \ + rm prs500/tt0003m_.ttf; ln -s ../liberation/LiberationSans-Regular.ttf prs500/tt0003m_.ttf; \ + rm prs500/tt0011m_.ttf; ln -s ../liberation/LiberationSerif-Regular.ttf prs500/tt0011m_.ttf; \ + rm prs500/tt0419m_.ttf; ln -s ../liberation/LiberationMono-Regular.ttf prs500/tt0419m_.ttf; \ + cd $$D; tar c . | gzip -9 > ../../../calibre_$$V+dfsg.orig.tar.gz; \ + cd ../..; rm -r debian/orig; \ + find -mindepth 1 -maxdepth 1 ! -name '.bzr*' ! -name debian | xargs rm -rf; \ + [ ! -e setup.py ] || tar xzf ../calibre_$$V+dfsg.orig.tar.gz --strip-components 2 --- calibre-0.6.12+dfsg.orig/debian/calibre.install +++ calibre-0.6.12+dfsg/debian/calibre.install @@ -0,0 +1,6 @@ +usr/bin +usr/lib/calibre/calibre/ +usr/lib/calibre/odf +usr/lib/calibre/cssutils_profiles.py +usr/share/ +../local/*.desktop usr/share/applications --- calibre-0.6.12+dfsg.orig/debian/changelog +++ calibre-0.6.12+dfsg/debian/changelog @@ -0,0 +1,110 @@ +calibre (0.6.12+dfsg-0ubuntu1) karmic; urgency=low + + * New upstream bug fix release. + * debian/rules: Update get-orig-source for new upstream source layout. + * Drop recipe_zeitde_moresections.patch: Applied upstream. + * Add fix-setup.py-install-root.patch: Fix setup.py install --root option to + do what --root should do. + * Add disable-podofo-extension.patch: Disable podofo extension, podofo is + not yet packaged. + * debian/rules: Replace copy of Liberation TTFs with symlink to + ttf-liberation files. + * debian/rules: Remove unnecessary executable permissions from libraries in + /usr/lib/calibre/. + * debian/control: Set Vcs-Bzr: for Ubuntu branch. + * Add fix_recipe_zeitde.patch: Fix recipe for "Die Zeit", zeit.de recently + reorganized their web pages. + + -- Martin Pitt Fri, 18 Sep 2009 01:18:18 +0200 + +calibre (0.6.10+dfsg-0ubuntu1) karmic; urgency=low + + [ Martin Pitt ] + * New upstream release. Please see http://calibre.kovidgoyal.net/new_in_6/ + for the list of new features and changes. (Closes: #539343) + * remove_postinstall.patch: Update for new version. + * build_debug.patch: Remove, not necessary any more apparently. + * debian/copyright: Fix reference to versionless GPL. + * debian/rules: Drop obsolete dh_desktop call. + * debian/rules: Add workaround for weird Python 2.6 setuptools behaviour of + putting compiled .so files into src/calibre/plugins/calibre/plugins + instead of src/calibre/plugins. + * debian/rules: Drop hal fdi moving, new upstream version does not use hal + any more. Drop hal dependency, too. + * debian/rules: Install udev rules into /lib/udev/rules.d. + * Add debian/calibre.preinst: Remove unmodified + /etc/udev/rules.d/95-calibre.rules on upgrade. + * debian/control: Bump Python dependencies to 2.6, since upstream needs + it now. + * Bump Standards-Version to 3.8.3. + * Add recipe_zeitde_moresections.patch: Add more sections to recipe for "Die + Zeit". + + [ Stefan Lesicnik ] + * debian/calibre.preinst: Added DEBHELPER token. + * debian/man/Makefile: Added newline to make lintian happy. + * Add debian/README.source. + * Drop qmake-qt4.patch, no longer needed. + * Depend on python-cherrypy3 (>= 3.1.1) to fix calibre-server. + * Add libpoppler-qt4-dev to Build-Depends to support quicker PDF functions. + debian/rules: Add calibre_poppler to list of .so files to copy. + * Adjust patches to new upstream version: + - bundled_cssutils_profiles.patch + - remove_postinstall.patch + * debian/rules: Remove rm of tagging lib as it no longer exists. + + -- Martin Pitt Sun, 28 Jun 2009 22:01:24 +0200 + +calibre (0.5.14+dfsg-1) unstable; urgency=low + + * New upstream release. + * debian/rules, get-orig-source: Do not unpack newly generated orig tarball + if we don't have unpackaged upstream sources in the tree (such as when + building with bzr-buildpackage). + + -- Martin Pitt Sat, 06 Jun 2009 17:18:02 +0200 + +calibre (0.5.11+dfsg-2) unstable; urgency=low + + * debian/rules, debian/control: Remove upstream shipped copy of + python-django-tagging. Depend on the package instead. + (Closes: #528091) + * debian/control: Use my @debian.org Uploaders: address. + * debian/control: Bump Standards-Version (no changes necesssary). + + -- Martin Pitt Thu, 14 May 2009 08:15:23 +0200 + +calibre (0.5.11+dfsg-1) unstable; urgency=low + + * New upstream release. + * debian/control: Drop Ubuntu specific python-mechanize binary dependency as + well (brown paperbag). (Closes: #525612) + + -- Martin Pitt Sun, 10 May 2009 21:00:35 +0200 + +calibre (0.5.9+dfsg-1) unstable; urgency=low + + * New upstream release. (Closes: #525339) + * manpages-installation.patch: Encode generated manpages as UTF-8, to avoid + UnicodeDecodeErrors when writing them out to files. + * debian/control: Demote calibre dependency of calibre-bin to Recommends:, + which is sufficient and avoids a circular dependency. (Closes: #522059) + * debian/control: Drop build dependency help2man, current version does not + need it any more. + * debian/control: Drop versioned build dependency on python-mechanize, + current sid version is enough. + * debian/rules: Copy "setup.py install" command from cdbs' + python-distutils.mk, since the current version broke this. This is a + hackish workaround until #525436 gets fixed. + * debian/rules: Drop using $(wildcard ), use `ls`; the former does not work + any more. + + -- Martin Pitt Sun, 05 Apr 2009 18:42:16 -0700 + +calibre (0.4.143+dfsg-1) unstable; urgency=low + + [ Martin Pitt ] + * Initial release, packaging by Miriam Ruiz and + Martin Pitt . Closes: #482680 + + -- Miriam Ruiz Thu, 08 Jan 2009 21:42:04 +0100 --- calibre-0.6.12+dfsg.orig/debian/calibre.manpages +++ calibre-0.6.12+dfsg/debian/calibre.manpages @@ -0,0 +1 @@ +debian/man/*.1 --- calibre-0.6.12+dfsg.orig/debian/watch +++ calibre-0.6.12+dfsg/debian/watch @@ -0,0 +1,9 @@ +# watch control file for uscan +# see uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +# remove +dfsg upstream version suffix +opts=dversionmangle=s/\+dfsg$// \ + http://calibre.kovidgoyal.net/downloads/calibre-(.*)\.tar\.gz --- calibre-0.6.12+dfsg.orig/debian/copyright +++ calibre-0.6.12+dfsg/debian/copyright @@ -0,0 +1,355 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196 +Upstream-Name: calibre +Upstream-Maintainer: Kovid Goyal +Upstream-Source: http://calibre.kovidgoyal.net/downloads + +Files: * +Copyright: Copyright (C) 2008 Kovid Goyal +License: GPL-3 + The full text of the GPL is distributed as in + /usr/share/common-licenses/GPL-3 on Debian systems. + +Files: src/calibre/ebooks/BeautifulSoup.py +Copyright: Copyright (c) 2004-2007, Leonard Richardson +License: BSD + The full text of the BSD license is distributed as in + /usr/share/common-licenses/BSD on Debian systems. + +Files: src/calibre/ebooks/chardet/* +Copyright: Copyright (C) 1998-2001 Netscape Communications Corporation +License: LGPL-2.1+ + The full text of the LGPL is distributed as in + /usr/share/common-licenses/LGPL-2.1 on Debian systems. + +Files: src/calibre/ebooks/hyphenate.py +Copyright: Copyright (C) 1990, 2004, 2005 Gerard D.C. Kuiken. +License: other + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright + notice and this notice are preserved. + +Files: /src/cherrypy/* +Copyright: Copyright (c) 2004-2007, CherryPy Team (team@cherrypy.org) +Copyright: Copyright (C) 2005, Tiago Cogumbreiro +License: BSD + The full text of the BSD license is distributed as in + /usr/share/common-licenses/BSD on Debian systems. + +Files: src/odf/* +Copyright: Copyright (C) 2006-2008 Søren Roug, European Environment Agency +License: LGPL2.1+ + The full text of the LGPL is distributed as in + /usr/share/common-licenses/LGPL-2.1 on Debian systems. + +Files: src/odf/teletype.py +Files: src/odf/easyliststyle.py +Copyright: Copyright (C) 2008, J. David Eisenberg +License: GPL2+ + The full text of the GPL is distributed as in + /usr/share/common-licenses/GPL-2 on Debian systems. + +Files: src/pyPdf/* +Copyright: Copyright (c) 2006, Mathieu Fenniak +Copyright: Copyright (c) 2007, Ashish Kulkarni +License: BSD + The full text of the BSD license is distributed as in + /usr/share/common-licenses/BSD on Debian systems. + +Files: src/calibre/utils/genshi/* +Copyright: Copyright (C) 2006-2008 Edgewall Software +License: BSD + The full text of the BSD license is distributed as in + /usr/share/common-licenses/BSD on Debian systems. + +Files: src/calibre/utils/lzx/* +Copyright: Copyright (C) 2002, Matthew T. Russotto +Copyright: Copyright (C) 2008, Marshall T. Vandegrift +Copyright: Copyright (C) 2006-2008, Alexander Chemeris +License: LGPL-2.1 + The full text of the LGPL is distributed as in + /usr/share/common-licenses/LGPL-2.1 on Debian systems. + +Files: src/calibre/utils/lzx/msstdint.h +Copyright: Copyright (C) 2006-2008, Alexander Chemeris +License: BSD + The full text of the BSD license is distributed as in + /usr/share/common-licenses/BSD on Debian systems. + +Files: src/calibre/utils/pyparsing.py +Copyright: Copyright (c) 2003-2008, Paul T. McGuire +License: MIT + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Files: src/calibre/utils/PythonMagickWand.py +Copyright: (c) 2007 - Achim Domma - domma@procoders.net +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +Files: src/calibre/utils/msdes/d3des.h: +Files: src/calibre/utils/msdes/des.c: +Copyright: Copyright (C) 1988,1989,1990,1991,1992, Richard Outerbridge +License: Other + THIS SOFTWARE PLACED IN THE PUBLIC DOMAIN BY THE AUTHOUR + +Files: src/calibre/utils/msdes/msdesmodule.c +Copyright: Copyright (C) 2008, Marshall T. Vandegrift +License: GPL-3 + The full text of the GPL is distributed as in + /usr/share/common-licenses/GPL-3 on Debian systems. + +Files: src/calibre/utils/msdes/spr.h +Copyright: Copyright (C) 2002, Dan A. Jackson +License: GPL2+ + The full text of the GPL is distributed as in + /usr/share/common-licenses/GPL-2 on Debian systems. + +Files: src/calibre/gui2/pictureflow/* +Copyright: (C) Copyright 2007 Trolltech ASA +License: BSD + The full text of the BSD license is distributed as in + /usr/share/common-licenses/BSD on Debian systems. + +Files: src/calibre/ebooks/lit/* +Copyright: 2008, Marshall T. Vandegrift +License: GPL-3 + The full text of the GPL is distributed as in + /usr/share/common-licenses/GPL-3 on Debian systems. + +Files: src/calibre/ebooks/lrf/* +Copyright: 2008, Anatoly Shipitsin +Copyright: copyright 2002 Paul Henry Tremblay +Copyright: Copyright (C) 2008 B.Scott Wxby [bswxby] +Copyright: Copyright (C) 2007 David Chen SonyReaderDaveChenorg +Copyright: Copyright (c) 2007 Mike Higgins (Falstaff) +License: GPL-3 + The full text of the GPL is distributed as in + /usr/share/common-licenses/GPL-3 on Debian systems. + +Files: src/calibre/ebooks/BeautifulSoup.py +Copyright: Copyright (c) 2004-2007, Leonard Richardson +License: BSD + The full text of the BSD license is distributed as in + /usr/share/common-licenses/BSD on Debian systems. + +Files: src/calibre/ebooks/rtf2xml/* +Copyright: copyright 2002 Paul Henry Tremblay +License: GPL + The full text of the GPL is distributed as in + /usr/share/common-licenses/GPL-2 on Debian systems. + +Files: src/calibre/web/feeds/feedparser.py +Copyright: Copyright (c) 2002-2006, Mark Pilgrim +License: BSD + The full text of the BSD license is distributed as in + /usr/share/common-licenses/BSD on Debian systems. + +Files: src/calibre/web/feeds/recipes/* +Copyright: 2008, Darko Miletic +Copyright: 2008, Mathieu Godlewski +Copyright: Copyright (C) 2008 B.Scott Wxby [bswxby] +Copyright: Copyright (C) 2007 David Chen SonyReaderDaveChenorg +Copyright: 2008, Derry FitzGerald +License: GPL-3 + The full text of the GPL is distributed as in + /usr/share/common-licenses/GPL-3 on Debian systems. + +Files: src/calibre/ebooks/metadata/* +Copyright: 2008, Ashish Kulkarni +Copyright: Copyright (C) 2006 Søren Roug, European Environment Agency +License: GPL-3 + The full text of the GPL is distributed as in + /usr/share/common-licenses/GPL-3 on Debian systems. + +Files: src/encutils/__init__.py +Copyright: 2005-2008: Christof Hoeke +License: LGPL-3+, CC-BY-3.0 + The full text of the LGPL is distributed as in + /usr/share/common-licenses/LGPL-3 on Debian systems. + +Files: src/calibre/translations/* +Copyright: Copyright (C) 2007, Kovid Goyal +Copyright: Copyright (C) 2008, Rosetta Contributors and Canonical Ltd. +License: GPL-3 + The full text of the GPL is distributed as in + /usr/share/common-licenses/GPL-3 on Debian systems. + +Files: src/calibre/gui2/viewer/jquery.js +Files: src/calibre/gui2/viewer/jquery_scrollTo.js +Files: src/calibre/library/static/date.js +Copyright: Copyright (C) 2008, John Resig (jquery.com) +Copyright: Copyright (C) 2007-2008, Ariel Flesler - aflesler@gmail.com | http://flesler.blogspot.com +Copyright: Copyright (C) 2006-2007, Coolite Inc. (http://www.coolite.com/) +License: MIT + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Files: src/calibre/ebooks/lrf/fonts/liberation/* +Copyright: Copyright (C) 2007, Red Hat, Inc. All rights reserved. +License: Other + Copyright (C) 2007, Red Hat, Inc. All rights reserved. + LIBERATION is a trademark of Red Hat, Inc. + + This agreement governs the use of the Software and any updates to the Software, + regardless of the delivery mechanism. Subject to the following terms, Red Hat, Inc. + ("Red Hat") grants to the user ("Client") a license to this work pursuant to + the GNU General Public License v.2 with the exceptions set forth below and such + other terms as our set forth in this End User License Agreement. + + 1. The Software and License Exception. LIBERATION font software (the "Software") + consists of TrueType-OpenType formatted font software for rendering LIBERATION + typefaces in sans serif, serif, and monospaced character styles. You are licensed + to use, modify, copy, and distribute the Software pursuant to the GNU General + Public License v.2 with the following exceptions: + + (a) As a special exception, if you create a document which uses this font, and + embed this font or unaltered portions of this font into the document, this + font does not by itself cause the resulting document to be covered by the + GNU General Public License. This exception does not however invalidate any + other reasons why the document might be covered by the GNU General Public + License. If you modify this font, you may extend this exception to your + version of the font, but you are not obligated to do so. If you do not + wish to do so, delete this exception statement from your version. + + (b) As a further exception, any distribution of the object code of the Software + in a physical product must provide you the right to access and modify the + source code for the Software and to reinstall that modified version of the + Software in object code form on the same physical product on which you + received it. + + 2. Intellectual Property Rights. The Software and each of its components, including + the source code, documentation, appearance, structure and organization are owned + by Red Hat and others and are protected under copyright and other laws. Title to + the Software and any component, or to any copy, modification, or merged portion + shall remain with the aforementioned, subject to the applicable license. + The "LIBERATION" trademark is a trademark of Red Hat, Inc. in the U.S. and other + countries. This agreement does not permit Client to distribute modified versions + of the Software using Red Hat's trademarks. If Client makes a redistribution of + a modified version of the Software, then Client must modify the files names to + remove any reference to the Red Hat trademarks and must not use the Red Hat + trademarks in any way to reference or promote the modified Software. + + 3. Limited Warranty. To the maximum extent permitted under applicable law, the + Software is provided and licensed "as is" without warranty of any kind, + expressed or implied, including the implied warranties of merchantability, + non-infringement or fitness for a particular purpose. Red Hat does not warrant + that the functions contained in the Software will meet Client's requirements or + that the operation of the Software will be entirely error free or appear precisely + as described in the accompanying documentation. + + 4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable + law, Red Hat or any Red Hat authorized dealer will not be liable to Client for any + incidental or consequential damages, including lost profits or lost savings arising + out of the use or inability to use the Software, even if Red Hat or such dealer has + been advised of the possibility of such damages. + + 5. General. If any provision of this agreement is held to be unenforceable, that shall + not affect the enforceability of the remaining provisions. This agreement shall be + governed by the laws of the State of North Carolina and of the United States, without + regard to any conflict of laws provisions, except that the United Nations Convention + on the International Sale of Goods shall not apply. + + +Files: installer/cx_Freeze/* +Copyright: Copyright © 2007-2008, Colt Engineering, Edmonton, Alberta, Canada. +Copyright: Copyright © 2001-2006, Computronix (Canada) Ltd., Edmonton, Alberta, Canada. +License: other + All rights reserved. + + NOTE: this license is derived from the Python Software Foundation License + which can be found at http://www.python.org/psf/license + + License for cx_Freeze 4.0.1 + --------------------------- + + 1. This LICENSE AGREEMENT is between the copyright holders and the Individual + or Organization ("Licensee") accessing and otherwise using cx_Freeze + software in source or binary form and its associated documentation. + + 2. Subject to the terms and conditions of this License Agreement, the + copyright holders hereby grant Licensee a nonexclusive, royalty-free, + world-wide license to reproduce, analyze, test, perform and/or display + publicly, prepare derivative works, distribute, and otherwise use cx_Freeze + alone or in any derivative version, provided, however, that this License + Agreement and this notice of copyright are retained in cx_Freeze alone or in + any derivative version prepared by Licensee. + + 3. In the event Licensee prepares a derivative work that is based on or + incorporates cx_Freeze or any part thereof, and wants to make the derivative + work available to others as provided herein, then Licensee hereby agrees to + include in any such work a brief summary of the changes made to cx_Freeze. + + 4. The copyright holders are making cx_Freeze available to Licensee on an + "AS IS" basis. THE COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, + EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, THE COPYRIGHT + HOLDERS MAKE NO AND DISCLAIM ANY REPRESENTATION OR WARRANTY OF + MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF + CX_FREEZE WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. + + 5. THE COPYRIGHT HOLDERS SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF + CX_FREEZE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS + A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING CX_FREEZE, OR ANY + DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + + 6. This License Agreement will automatically terminate upon a material breach + of its terms and conditions. + + 7. Nothing in this License Agreement shall be deemed to create any relationship + of agency, partnership, or joint venture between the copyright holders and + Licensee. This License Agreement does not grant permission to use + copyright holder's trademarks or trade name in a trademark sense to endorse + or promote products or services of Licensee, or any third party. + + 8. By copying, installing or otherwise using cx_Freeze, Licensee agrees to be + bound by the terms and conditions of this License Agreement. + + Computronix® is a registered trademark of Computronix (Canada) Ltd. + --- calibre-0.6.12+dfsg.orig/debian/pycompat +++ calibre-0.6.12+dfsg/debian/pycompat @@ -0,0 +1 @@ +2 --- calibre-0.6.12+dfsg.orig/debian/compat +++ calibre-0.6.12+dfsg/debian/compat @@ -0,0 +1 @@ +5 --- calibre-0.6.12+dfsg.orig/debian/README.source +++ calibre-0.6.12+dfsg/debian/README.source @@ -0,0 +1,5 @@ +Updating this package is done via the get-orig-source rule. This ensures that +all required changes are made to meet the dfsg. This includes removing of +propriety fonts and linking against Liberation fonts. + +This package is patched using the quilt patch system. --- calibre-0.6.12+dfsg.orig/debian/calibre-bin.install +++ calibre-0.6.12+dfsg/debian/calibre-bin.install @@ -0,0 +1 @@ +usr/lib/calibre/calibre/plugins/ --- calibre-0.6.12+dfsg.orig/debian/control +++ calibre-0.6.12+dfsg/debian/control @@ -0,0 +1,93 @@ +Source: calibre +Section: text +Priority: extra +Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.51), quilt, txt2man, + dh-buildinfo, python-central (>= 0.5.6), python-setuptools, + python-dev (>= 2.6), python-qt4-dev (>= 4.3.3-2ubuntu1), + python-imaging, python-lxml, python-mechanize, + python-beautifulsoup, python-dateutil, python-django-tagging, pyqt4-dev-tools, + sip4, libqt4-dev, libpoppler-qt4-dev +Maintainer: Miriam Ruiz +Uploaders: Martin Pitt +Standards-Version: 3.8.3 +XS-Python-Version: current +Homepage: http://calibre.kovidgoyal.net/ +Vcs-Bzr: https://code.launchpad.net/~ubuntu-dev/calibre/ubuntu + +Package: calibre +Architecture: all +XB-Python-Version: ${python:Versions} +Depends: ${python:Depends}, ${misc:Depends}, python-dbus, + python-imaging, python-lxml, python-mechanize, + python-beautifulsoup, python-pkg-resources, python-pypdf (>= 1.10), + python-cssutils (>= 0.9.5), python-encutils (>= 0.9.5), python-cherrypy3 (>= 3.1.1), + python-dateutil, python-django-tagging, python-qt4, xdg-utils, + imagemagick, ttf-liberation, calibre-bin (>= ${source:Version}) +Description: e-book converter and library management + Calibre is meant to be a complete e-library solution. It includes library + management, format conversion, news feeds to ebook conversion as well as + e-book reader sync features. + . + Calibre is primarily a ebook cataloging program. It manages your ebook + collection for you. It is designed around the concept of the logical book, + i.e. a single entry in the database that may correspond to ebooks in several + formats. It also upports conversion from a dozen different ebook formats to + LRF and EPUB. A graphical interface to the conversion software can be + accessed easily by just clicking the "Convert E-books" button. + . + Supported input formats are: MOBI, LIT, PRC, EPUB, ODT, HTML, CBR, CBZ, RTF, + TXT, PDF and LRS. + . + Calibre has a modular device driver design that makes adding support for + different e-reader devices easy. At the moment, it has support for the + SONY PRS 500/505/700 and the iPhone (with the stanza reader software). + Syncing supports updating metadata on the device from metadata in the library + and the creation of collections on the device based on the tags defined in + the library view. If an book has more than one format available, calibre + automatically chooses the best format when uploading to the device. + . + Calibre can automatically fetch news from a number of websites/RSS feeds, + format the news into a ebook and upload to a connected device. There is + support for generating LRF/EPUB ebooks. The ebooks include the *full* + versions of the articles, not just the summaries. + . + Calibre has also a built-in ebook viewer that can display all the major ebook + formats. + +Package: calibre-bin +Architecture: any +XB-Python-Version: ${python:Versions} +Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} +Recommends: calibre (>= ${source:Version}) +Description: e-book converter and library management + Calibre is meant to be a complete e-library solution. It includes library + management, format conversion, news feeds to ebook conversion as well as + e-book reader sync features. + . + Calibre is primarily a ebook cataloging program. It manages your ebook + collection for you. It is designed around the concept of the logical book, + i.e. a single entry in the database that may correspond to ebooks in several + formats. It also upports conversion from a dozen different ebook formats to + LRF and EPUB. A graphical interface to the conversion software can be + accessed easily by just clicking the "Convert E-books" button. + . + Supported input formats are: MOBI, LIT, PRC, EPUB, ODT, HTML, CBR, CBZ, RTF, + TXT, PDF and LRS. + . + Calibre has a modular device driver design that makes adding support for + different e-reader devices easy. At the moment, it has support for the + SONY PRS 500/505/700 and the iPhone (with the stanza reader software). + Syncing supports updating metadata on the device from metadata in the library + and the creation of collections on the device based on the tags defined in + the library view. If an book has more than one format available, calibre + automatically chooses the best format when uploading to the device. + . + Calibre can automatically fetch news from a number of websites/RSS feeds, + format the news into a ebook and upload to a connected device. There is + support for generating LRF/EPUB ebooks. The ebooks include the *full* + versions of the articles, not just the summaries. + . + Calibre has also a built-in ebook viewer that can display all the major ebook + formats. + . + This package contains the compiled architecture dependent plugins. --- calibre-0.6.12+dfsg.orig/debian/calibre.preinst +++ calibre-0.6.12+dfsg/debian/calibre.preinst @@ -0,0 +1,32 @@ +#!/bin/sh + +set -e + +rm_conffile() { + PKGNAME="calibre" + CONFFILE="$1" + + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" + fi + fi +} + +case "$1" in + install|upgrade) + if dpkg --compare-versions "$2" lt-nl "0.6.3"; then + rm_conffile "/etc/udev/rules.d/95-calibre.rules" + fi +esac + +exit 0 + +#DEBHELPER# --- calibre-0.6.12+dfsg.orig/debian/man/epub-meta.txt +++ calibre-0.6.12+dfsg/debian/man/epub-meta.txt @@ -0,0 +1,32 @@ +Usage: epub-meta [options] myfile.epub + +Read and write metadata from an ebook file. + +Whenever you pass arguments to epub-meta that have spaces in them, enclose the arguments in quotation marks. + +Options: + --version show program's version number and exit + + -h, --help show this help message and exit + + -t TITLE, --title=TITLE + Set the book title + + -a AUTHORS, --authors=AUTHORS + Set the authors + + --comment=COMMENT Set the comment + + --tags=TAGS A comma separated list of tags to set + + --series=SERIES The series to which this book belongs + + --series-index=SERIES_INDEX + The series index + + --language=LANGUAGE The book language + + --get-cover Extract the cover + + +Created by Kovid Goyal --- calibre-0.6.12+dfsg.orig/debian/man/ebook-viewer.txt +++ calibre-0.6.12+dfsg/debian/man/ebook-viewer.txt @@ -0,0 +1,14 @@ +Usage: ebook-viewer [options] file + +View an ebook. + + +Whenever you pass arguments to ebook-viewer that have spaces in them, enclose the arguments in quotation marks. + +Options: + --version show program's version number and exit + + -h, --help show this help message and exit + + +Created by Kovid Goyal --- calibre-0.6.12+dfsg.orig/debian/man/calibre-debug.txt +++ calibre-0.6.12+dfsg/debian/man/calibre-debug.txt @@ -0,0 +1,24 @@ +Usage: calibre-debug [options] + +Run an embedded python interpreter. + + +Whenever you pass arguments to calibre-debug that have spaces in them, enclose the arguments in quotation marks. + +Options: + --version show program's version number and exit + + -h, --help show this help message and exit + + --update-module=UPDATE_MODULE + Update the specified module in the frozen library. Module specifications are of the form full.name.of.module,path_to_module.py + + -c COMMAND, --command=COMMAND + Run python code. + + -g, --gui Run the GUI + + --migrate Migrate old database. Needs two arguments. Path to library1.db and path to new library folder. + + +Created by Kovid Goyal --- calibre-0.6.12+dfsg.orig/debian/man/calibre-fontconfig.txt +++ calibre-0.6.12+dfsg/debian/man/calibre-fontconfig.txt @@ -0,0 +1,3 @@ +Usage: calibre-fontconfig [options] + +This program is part of Calibre --- calibre-0.6.12+dfsg.orig/debian/man/prs500.txt +++ calibre-0.6.12+dfsg/debian/man/prs500.txt @@ -0,0 +1,11 @@ +Usage: prs500 [options] command args + +command is one of: info, books, df, ls, cp, mkdir, touch, cat, rm + +For help on a particular command: prs500 command + +Options: + --version show program's version number and exit + --log-packets print out packet stream to stdout. The numbers in the left + column are byte offsets that allow the packet size to be read + off easily. --- calibre-0.6.12+dfsg.orig/debian/man/names +++ calibre-0.6.12+dfsg/debian/man/names @@ -0,0 +1,52 @@ +any2epub - convert ebook from a large number of ebook formats to EPUB +any2lit - convert ebook from a large number of ebook formats to LIT +any2lrf - convert ebook from a large number of ebook formats to LRF +calibre-customize - customize calibre by loading external plugins +calibredb - command line interface to the calibre books database +calibre-debug - run an embedded python interpreter for debug purposes +calibre-fontconfig - font configuration tool for calibre +calibre-parallel - parallel tool for calibre +calibre_postinstall - postinstall tool for calibre +calibre-server - calibre content server +calibre - launch Calibre Graphical User Interface +comic2epub - convert comic from CBZ or CBR to an EPUB ebook +comic2lrf - convert comic from CBZ or CBR to an LRF ebook +ebook-viewer - view ebook +epub2lrf - convert ebook from EPUB to LRF +epub-meta - read and write metadata from an EPUB ebook file +fb22lrf - convert ebook from FB2 to LRF +fb2-meta - read and write metadata from FB2 file +feeds2disk - download data from feeds +feeds2epub - download data from feeds and save to EPUB ebook +feeds2lrf - download data from feeds and save to LRF ebook +html2epub - convert HTML file to EPUB ebook +html2lrf - convert HTML file to LRF ebook +html2oeb - follow all links in an HTML file and collect them +imp-meta - read and write metadata from IMP file +isbndb - fetch metadata for books from isndb.com +librarything - fetch a cover image for the book identified by ISBN from LibraryThing.com +lit2lrf - convert ebook from LIT to LRF +lit2oeb - convert ebook from LIT to OEB +lit-meta - read and write metadata from a LIT ebook file +lrf2html - convert LRF file into an HTML file +lrf2lrs - convert LRF file into an LRS (XML UTF-8 encoded) file +lrf-meta - read and write metadata from LRF ebook file +lrfviewer - view LRF ebook +lrs2lrf - compile an LRS file into an LRF file +markdown-calibre - markdown tool for calibre +mobi2lrf - convert MOBI file to LRF ebook +mobi2oeb - convert MOBI file to OEB +odt2oeb - convert ODT file to OEB +odt-meta - read and write metadata from an ODT file +oeb2lit - convert OEB file to LIT ebook +opf-meta - read and write metadata from an OPF file +pdf2lrf - convert PDF file to LRF ebook +pdf-meta - read and write metadata from a PDF file +pdfreflow - convert a PDF file to a HTML file +prs500 - control PRS 500 devices +rb-meta - read and write metadata from an RB file +rtf2lrf - convert RTF to LRF ebook +rtf-meta - read and write metadata from an RTF file +txt2lrf - convert TXT to LRF ebook +web2disk - download a site from the web +web2lrf - download a site from the web and convert it into an LRF ebook --- calibre-0.6.12+dfsg.orig/debian/man/odt-meta.txt +++ calibre-0.6.12+dfsg/debian/man/odt-meta.txt @@ -0,0 +1,3 @@ +Usage: /usr/bin/odt-meta file.odt + +Read and write metadata from an ebook file. --- calibre-0.6.12+dfsg.orig/debian/man/lit-meta.txt +++ calibre-0.6.12+dfsg/debian/man/lit-meta.txt @@ -0,0 +1,3 @@ +Usage: /usr/bin/lit-meta file.lit + +Read and write metadata from an ebook file. --- calibre-0.6.12+dfsg.orig/debian/man/calibre.txt +++ calibre-0.6.12+dfsg/debian/man/calibre.txt @@ -0,0 +1,23 @@ +Usage: calibre [opts] [path_to_ebook] + +Launch the main calibre Graphical User Interface and optionally add the ebook at +path_to_ebook to the database. + + +Whenever you pass arguments to calibre that have spaces in them, enclose the arguments in quotation marks. + +Options: + --version show program's version number and exit + + -h, --help show this help message and exit + + --redirect-console-output + Redirect console output to a dialog window (both stdout and stderr). Useful on windows where GUI apps do not have a output streams. + + --with-library=WITH_LIBRARY + Use the library located at the specified path. + + -v, --verbose Log debugging information to console + + +Created by Kovid Goyal --- calibre-0.6.12+dfsg.orig/debian/man/lrfviewer.txt +++ calibre-0.6.12+dfsg/debian/man/lrfviewer.txt @@ -0,0 +1,28 @@ +Usage: lrfviewer [options] book.lrf + +Read the LRF ebook book.lrf + + +Whenever you pass arguments to lrfviewer that have spaces in them, enclose the arguments in quotation marks. + +Options: + --version show program's version number and exit + + -h, --help show this help message and exit + + --redirect-console-output + Redirect console output to a dialog window (both stdout and stderr). Useful on windows where GUI apps do not have a output streams. + + --verbose Print more information about the rendering process + + --visual-debug Turn on visual aids to debugging the rendering engine + + --disable-hyphenation + Disable hyphenation. Should significantly speed up rendering. + + --white-background By default the background is off white as I find this easier on the eyes. Use this option to make the background pure white. + + --profile Profile the LRF renderer + + +Created by Kovid Goyal --- calibre-0.6.12+dfsg.orig/debian/man/calibre-parallel.txt +++ calibre-0.6.12+dfsg/debian/man/calibre-parallel.txt @@ -0,0 +1,3 @@ +Usage: calibre-parallel [options] + +This program is part of Calibre --- calibre-0.6.12+dfsg.orig/debian/man/pdf-meta.txt +++ calibre-0.6.12+dfsg/debian/man/pdf-meta.txt @@ -0,0 +1,3 @@ +Usage: pdf-meta file.pdf + +Read and write metadata from an ebook file. --- calibre-0.6.12+dfsg.orig/debian/man/markdown-calibre.txt +++ calibre-0.6.12+dfsg/debian/man/markdown-calibre.txt @@ -0,0 +1,15 @@ +Usage: markdown-calibre INPUTFILE [options] + +Options: + -h, --help show this help message and exit + -f OUTPUT_FILE, --file=OUTPUT_FILE + write output to OUTPUT_FILE + -e ENCODING, --encoding=ENCODING + encoding for input and output files + -q, --quiet suppress all messages + -v, --verbose print info messages + -s SAFE_MODE, --safe=SAFE_MODE + same mode ('replace', 'remove' or 'escape' user's HTML tag) + --noisy print debug messages + -x EXTENSION, --extension=EXTENSION + load extension EXTENSION --- calibre-0.6.12+dfsg.orig/debian/man/Makefile +++ calibre-0.6.12+dfsg/debian/man/Makefile @@ -0,0 +1,48 @@ +TXTS=$(shell find . -name "*.txt") +MANS=$(TXTS:.txt=.1) +VERSION=unknown + +all: $(MANS) + +%.1: %.txt + @echo "Creating man page for $$(echo $@ | sed -e 's/.1//')" ; \ + printf "NAME\n\n$(shell cat names | grep -E "^$$(echo $@ | sed -e 's/.1//') - ")\n\n" | \ + cat - $< | \ + sed -e "s/TEXT_SIZE_MULTIPLIER_FOR_RENDERED_TABLES/SIZE/" | \ + sed -e "s/ *$$//g" | \ + sed -e "s/'/\\\\'/g" | \ + sed -e "s/\"/\\\\'/g" | \ + sed -e "s/ - feeds2/ feeds2/g" | \ + sed -e "s/^Options:$$/\n\n MAIN OPTIONS:/" | \ + sed -e "s/^ \([^- ].*\):$$/\n\n\1 OPTIONS#BR#/" | \ + sed -e "s/OPTIONS OPTIONS/OPTIONS/" | \ + sed -e "s/2DISK OPTIONS/ TO DISK OPTIONS/" | \ + sed -e "s/#BR# */\n/" | \ + sed -e "s/^Created by/AUTHOR\nCreated by/" | \ + sed -e "s/^ARG can be one of:/ARGUMENT\nARG can be one of:\n/" | \ + sed -e "s/^Usage:/USAGE\n/" | \ + awk '{if (/^USAGE$$/) { \ + out=$$0 "\n\n" ; \ + getline ; \ + out=out $$0 ; \ + getline ; \ + out=out $$0 ; \ + print out "\n\nDESCRIPTION\n\n" \ + } else {print $$0}}' | \ + awk '{if (/ *-/) { out=$$0; getline; out=out $$0;print out} else {print $$0}}' | \ + awk '/^$$/{ if (! blank++) print; next } { blank=0; print }' | \ + txt2man \ + -s 1 \ + -t `echo "$@" | sed -e "s/.1//"` \ + -P "Calibre $(VERSION)" \ + > $@ + +check: $(MANS) + @for i in *.1; do \ + echo "Checking man page for $$i" ; \ + LANG=C man --warnings -l "$$i" >/dev/null ; \ + done + +clean: + rm -f *.1 + --- calibre-0.6.12+dfsg.orig/debian/man/fb2-meta.txt +++ calibre-0.6.12+dfsg/debian/man/fb2-meta.txt @@ -0,0 +1,3 @@ +Usage: /usr/bin/fb2-meta mybook.fb2 + +Read and write metadata from an ebook file. --- calibre-0.6.12+dfsg.orig/debian/man/imp-meta.txt +++ calibre-0.6.12+dfsg/debian/man/imp-meta.txt @@ -0,0 +1,3 @@ +Usage: imp-meta file.imp + +Read and write metadata from an ebook file. --- calibre-0.6.12+dfsg.orig/debian/man/rb-meta.txt +++ calibre-0.6.12+dfsg/debian/man/rb-meta.txt @@ -0,0 +1,3 @@ +Usage: rb-meta file.rb + +Read and write metadata from an ebook file. --- calibre-0.6.12+dfsg.orig/debian/local/lrfviewer.desktop +++ calibre-0.6.12+dfsg/debian/local/lrfviewer.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=LRF Viewer +Comment=Viewer for LRF files (SONY ebook format files) +TryExec=lrfviewer +Exec=lrfviewer %F +Icon=lrfviewer +MimeType=application/x-sony-bbeb; +Categories=Graphics;Viewer; --- calibre-0.6.12+dfsg.orig/debian/local/calibre.desktop +++ calibre-0.6.12+dfsg/debian/local/calibre.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=calibre +Comment=E-book library management +Comment[es]=aplicación para la gestión de libros electrónicos +Comment[de]=E-Book Bibliotheksverwaltung +Exec=calibre +Icon=calibre +Categories=Office;Database;FileTools;Viewer;Qt; --- calibre-0.6.12+dfsg.orig/debian/patches/no_updates_dialog.patch +++ calibre-0.6.12+dfsg/debian/patches/no_updates_dialog.patch @@ -0,0 +1,13 @@ +Index: debian/src/calibre/gui2/__init__.py +=================================================================== +--- orig/src/calibre/gui2/__init__.py 2009-02-26 06:36:05.000000000 +0100 ++++ new/src/calibre/gui2/__init__.py 2009-03-01 17:51:34.000000000 +0100 +@@ -38,7 +38,7 @@ + help=_('Show button labels in the toolbar')) + c.add_opt('main_window_geometry', default=None, + help=_('Main window geometry')) # value QVariant.toByteArray +- c.add_opt('new_version_notification', default=True, ++ c.add_opt('new_version_notification', default=False, + help=_('Notify when a new version is available')) + c.add_opt('use_roman_numerals_for_series_number', default=True, + help=_('Use Roman numerals for series number')) --- calibre-0.6.12+dfsg.orig/debian/patches/remove_postinstall.patch +++ calibre-0.6.12+dfsg/debian/patches/remove_postinstall.patch @@ -0,0 +1,48 @@ +# Description: +# - Disable postinstall run, it's done later in debian/rules with custom arguments +# - Disable cleanup of runtime config dir, since that does not make sense at +# build time. +# - Disable setup_desktop_integration, since this uses the xdg tools. +# This totally does not work for package build time, we use static +# files in debian/local/ instead. +Index: calibre-0.6.12+dfsg/src/calibre/linux.py +=================================================================== +--- calibre-0.6.12+dfsg.orig/src/calibre/linux.py 2009-09-11 23:12:42.000000000 +0200 ++++ calibre-0.6.12+dfsg/src/calibre/linux.py 2009-09-17 23:18:05.000000000 +0200 +@@ -311,7 +311,6 @@ + global use_destdir + use_destdir = opts.destdir + manifest = [] +- setup_desktop_integration(opts.fatal_errors) + if opts.no_root or os.geteuid() == 0: + manifest += install_man_pages(opts.fatal_errors, use_destdir) + manifest += setup_udev_rules(opts.group_file, not opts.dont_reload, opts.fatal_errors) +@@ -329,15 +328,6 @@ + if opts.save_manifest_to: + open(opts.save_manifest_to, 'wb').write('\n'.join(manifest)+'\n') + +- from calibre.utils.config import config_dir +- if os.path.exists(config_dir): +- os.chdir(config_dir) +- for f in os.listdir('.'): +- if os.stat(f).st_uid == 0: +- os.rmdir(f) if os.path.isdir(f) else os.unlink(f) +- if os.stat(config_dir).st_uid == 0: +- os.rmdir(config_dir) +- + def binary_install(): + manifest = os.path.join(getattr(sys, 'frozen_path'), 'manifest') + exes = [x.strip() for x in open(manifest).readlines()] +Index: calibre-0.6.12+dfsg/setup/install.py +=================================================================== +--- calibre-0.6.12+dfsg.orig/setup/install.py 2009-09-17 23:18:15.000000000 +0200 ++++ calibre-0.6.12+dfsg/setup/install.py 2009-09-17 23:18:22.000000000 +0200 +@@ -64,7 +64,7 @@ + self.write_templates(opts) + self.setup_mount_helper() + self.install_files(opts) +- self.run_postinstall() ++ #self.run_postinstall() + self.success() + + def setup_mount_helper(self): --- calibre-0.6.12+dfsg.orig/debian/patches/fix_recipe_zeitde.patch +++ calibre-0.6.12+dfsg/debian/patches/fix_recipe_zeitde.patch @@ -0,0 +1,26 @@ +Index: calibre-0.6.12+dfsg/src/calibre/web/feeds/recipes/recipe_zeitde.py +=================================================================== +--- calibre-0.6.12+dfsg.orig/src/calibre/web/feeds/recipes/recipe_zeitde.py 2009-09-18 01:07:19.000000000 +0200 ++++ calibre-0.6.12+dfsg/src/calibre/web/feeds/recipes/recipe_zeitde.py 2009-09-18 01:07:23.000000000 +0200 +@@ -19,10 +19,12 @@ + timefmt = ' [%d %b %Y]' + max_articles_per_feed = 40 + no_stylesheets = True +- encoding = 'latin1' ++ encoding = 'utf8' + ++ remove_tags = [{'class': 'adwrap'}] ++ keep_only_tags = [{'name': 'div', 'class': 'content'}] + +- feeds = [ ('Kurznachrichten', 'http://newsfeed.zeit.de/news/index'), ++ feeds = [ ('Kurznachrichten', 'http://newsfeed.zeit.de/index'), + ('Politik', 'http://newsfeed.zeit.de/politik/index'), + ('Wirtschaft', 'http://newsfeed.zeit.de/wirtschaft/index'), + ('Meinung', 'http://newsfeed.zeit.de/meinung/index'), +@@ -32,5 +34,5 @@ + ] + + def print_version(self,url): +- return url.replace('http://www.zeit.de/', 'http://images.zeit.de/text/').replace('?from=rss', '') ++ return url.replace('http://www.zeit.de/', 'http://mobil.zeit.de/') + --- calibre-0.6.12+dfsg.orig/debian/patches/disable-podofo-extension.patch +++ calibre-0.6.12+dfsg/debian/patches/disable-podofo-extension.patch @@ -0,0 +1,19 @@ +# Description: Disable podofo extension, podofo is not yet packaged. +Index: calibre-0.6.12+dfsg/setup/extensions.py +=================================================================== +--- calibre-0.6.12+dfsg.orig/setup/extensions.py 2009-09-17 23:24:22.000000000 +0200 ++++ calibre-0.6.12+dfsg/setup/extensions.py 2009-09-17 23:24:32.000000000 +0200 +@@ -85,13 +85,6 @@ + error=poppler_error, + optional=True), + +- Extension('podofo', +- ['calibre/utils/podofo/podofo.cpp'], +- libraries=['podofo'], +- lib_dirs=[podofo_lib], +- inc_dirs=[podofo_inc], +- error=podofo_error), +- + Extension('pictureflow', + ['calibre/gui2/pictureflow/pictureflow.cpp'], + inc_dirs = ['calibre/gui2/pictureflow'], --- calibre-0.6.12+dfsg.orig/debian/patches/series +++ calibre-0.6.12+dfsg/debian/patches/series @@ -0,0 +1,8 @@ +setup.py-install-root-option.patch +fix-setup.py-install-root.patch +fix_recipe_zeitde.patch +disable-podofo-extension.patch +remove_postinstall.patch +no_updates_dialog.patch +manpages-installation.patch +bundled_cssutils_profiles.patch --- calibre-0.6.12+dfsg.orig/debian/patches/setup.py-install-root-option.patch +++ calibre-0.6.12+dfsg/debian/patches/setup.py-install-root-option.patch @@ -0,0 +1,25 @@ +# Description: Bring back ./setup.py install --root option; it's convenient for +# packaging and also a standard option in distutils/setuptools. +# (from upstream bzr head) +=== modified file 'setup/install.py' +--- a/setup/install.py 2009-09-11 19:35:46 +0000 ++++ b/setup/install.py 2009-09-12 20:25:05 +0000 +@@ -43,7 +43,7 @@ + sub_commands = ['build', 'resources', 'gui'] + + def add_options(self, parser): +- parser.add_option('--prefix', ++ parser.add_option('--prefix', '--root', + help='Binaries will be installed in /bin') + + def pre_sub_commands(self, opts): +@@ -137,7 +137,7 @@ + sub_commands = ['build', 'gui'] + + def add_options(self, parser): +- parser.add_option('--prefix', help='Installation prefix') ++ parser.add_option('--prefix', '--root', help='Installation prefix') + parser.add_option('--libdir', help='Where to put calibre library files') + parser.add_option('--bindir', help='Where to install calibre binaries') + parser.add_option('--sharedir', help='Where to install calibre data files') + --- calibre-0.6.12+dfsg.orig/debian/patches/manpages-installation.patch +++ calibre-0.6.12+dfsg/debian/patches/manpages-installation.patch @@ -0,0 +1,26 @@ +# Description: Do not compress manpages with bz2 (debhelper compresses them with gzip), and do not put them into section "1calibre" but "1". +Index: calibre-0.5.14+dfsg/src/calibre/linux.py +=================================================================== +--- calibre-0.5.14+dfsg.orig/src/calibre/linux.py 2009-06-06 16:58:04.000000000 +0200 ++++ calibre-0.5.14+dfsg/src/calibre/linux.py 2009-06-06 16:58:10.000000000 +0200 +@@ -431,7 +431,7 @@ + continue + parser = parser() + raw = create_man_page(prog, parser) +- manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2') ++ manfile = os.path.join(manpath, prog+'.1') + print '\tInstalling MAN page for', prog + open(manfile, 'wb').write(raw) + manifest.append(manfile) +Index: calibre-0.5.14+dfsg/src/calibre/utils/help2man.py +=================================================================== +--- calibre-0.5.14+dfsg.orig/src/calibre/utils/help2man.py 2009-05-29 19:25:45.000000000 +0200 ++++ calibre-0.5.14+dfsg/src/calibre/utils/help2man.py 2009-06-06 16:58:37.000000000 +0200 +@@ -57,6 +57,6 @@ + lines = [x if isinstance(x, unicode) else unicode(x, 'utf-8', 'replace') for + x in lines] + +- return bz2.compress((u'\n'.join(lines)).encode('utf-8')) ++ return '\n'.join(lines).encode('utf-8') + + --- calibre-0.6.12+dfsg.orig/debian/patches/fix-setup.py-install-root.patch +++ calibre-0.6.12+dfsg/debian/patches/fix-setup.py-install-root.patch @@ -0,0 +1,76 @@ +# Description: Fix setup.py install --root option to do what --root should do +# Upstream: http://calibre.kovidgoyal.net/ticket/3523 +Index: calibre-0.6.12+dfsg/setup/install.py +=================================================================== +--- calibre-0.6.12+dfsg.orig/setup/install.py 2009-09-18 00:04:17.000000000 +0200 ++++ calibre-0.6.12+dfsg/setup/install.py 2009-09-18 00:11:18.000000000 +0200 +@@ -43,8 +43,11 @@ + sub_commands = ['build', 'resources', 'gui'] + + def add_options(self, parser): +- parser.add_option('--prefix', '--root', ++ parser.add_option('--prefix', + help='Binaries will be installed in /bin') ++ parser.add_option('--root', ++ help='Use a different installation root (mainly for packaging)') ++ self.root = '' + + def pre_sub_commands(self, opts): + if not islinux: +@@ -76,7 +79,7 @@ + return warn() + import stat + src = os.path.join(self.SRC, 'calibre', 'devices', 'linux_mount_helper.c') +- dest = os.path.join(self.bindir, 'calibre-mount-helper') ++ dest = self.root + os.path.join(self.bindir, 'calibre-mount-helper') + self.info('Installing mount helper to '+ dest) + p = subprocess.Popen(['gcc', '-Wall', src, '-o', dest]) + ret = p.wait() +@@ -118,7 +121,7 @@ + module=mod, func=func, + path=self.path, resources=self.resources, + extensions=self.extensions) +- path = self.j(self.bindir, name) ++ path = self.root + self.j(self.bindir, name) + self.info('Installing binary:', path) + open(path, 'wb').write(script) + os.chmod(path, self.MODE) +@@ -137,10 +140,13 @@ + sub_commands = ['build', 'gui'] + + def add_options(self, parser): +- parser.add_option('--prefix', '--root', help='Installation prefix') ++ parser.add_option('--prefix', help='Installation prefix') + parser.add_option('--libdir', help='Where to put calibre library files') + parser.add_option('--bindir', help='Where to install calibre binaries') + parser.add_option('--sharedir', help='Where to install calibre data files') ++ parser.add_option('--root', ++ help='Use a different installation root (mainly for packaging)') ++ self.root = '' + + def find_locations(self, opts): + if opts.prefix is None: +@@ -151,18 +157,21 @@ + opts.bindir = self.j(opts.prefix, 'bin') + if opts.sharedir is None: + opts.sharedir = self.j(opts.prefix, 'share', 'calibre') ++ if opts.root is None: ++ opts.root = '' + self.prefix = opts.prefix + self.bindir = opts.bindir + self.path = opts.libdir + self.resources = opts.sharedir + self.extensions = self.j(self.path, 'calibre', 'plugins') ++ self.root = opts.root + + def install_files(self, opts): +- dest = self.path ++ dest = self.root + self.path + if os.path.exists(dest): + shutil.rmtree(dest) + shutil.copytree(self.SRC, dest) +- dest = self.resources ++ dest = self.root + self.resources + if os.path.exists(dest): + shutil.rmtree(dest) + shutil.copytree(self.RESOURCES, dest) --- calibre-0.6.12+dfsg.orig/debian/patches/bundled_cssutils_profiles.patch +++ calibre-0.6.12+dfsg/debian/patches/bundled_cssutils_profiles.patch @@ -0,0 +1,14 @@ +# Description: Our packaged python-cssutils does not yet have cssutils.profiles; ship local version as calibre.cssutils_profiles for now. +Index: calibre-0.6.5+dfsg/src/calibre/ebooks/oeb/stylizer.py +=================================================================== +--- calibre-0.6.5+dfsg.orig/src/calibre/ebooks/oeb/stylizer.py 2009-08-06 20:58:16.128621162 +0200 ++++ calibre-0.6.5+dfsg/src/calibre/ebooks/oeb/stylizer.py 2009-08-06 20:58:40.095791078 +0200 +@@ -18,7 +18,7 @@ + import cssutils + from cssutils.css import CSSStyleRule, CSSPageRule, CSSStyleDeclaration, \ + CSSValueList, CSSFontFaceRule, cssproperties +-from cssutils import profile as cssprofiles ++import cssutils_profiles as cssprofiles + from lxml import etree + from lxml.cssselect import css_to_xpath, ExpressionError, SelectorSyntaxError + from calibre.ebooks.oeb.base import XHTML, XHTML_NS, CSS_MIME, OEB_STYLES