pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/45493: [update with patch] misc/calibre 0.8.22



>Number:         45493
>Category:       pkg
>Synopsis:       [update with patch] misc/calibre 0.8.22
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Oct 18 21:50:01 +0000 2011
>Originator:     Rhialto
>Release:        NetBSD 5.1
>Organization:
        
>Environment:
        
        
System: NetBSD radl.falu.nl 5.1 NetBSD 5.1 
(Radl-s_Pervasion_of_the_Incorrect_Chord) #0: Mon Jan 24 20:25:13 CET 2011 
root%vargaz.falu.nl@localhost:/usr/src/sys/arch/amd64/compile/RADL5.1 amd64
Architecture: x86_64
Machine: amd64
>Description:
        Calibre releases a new version about every week. Here is 0.8.22.
>How-To-Repeat:
        
>Fix:
        Removed patches that are incorporated upstream.
        Updated lists of file names.

cvs diff: cannot find patches/patch-setup_____init____.py
cvs diff: cannot find patches/patch-setup_extensions.py
cvs diff: cannot find patches/patch-setup_install.py
cvs diff: cannot find patches/patch-src_calibre_____init____.py
cvs diff: cannot find patches/patch-src_calibre_constants.py
cvs diff: cannot find patches/patch-src_calibre_linux.py
cvs diff: cannot find patches/patch-src_calibre_utils_help2man.py

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/misc/calibre/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile    10 Jun 2011 09:39:56 -0000      1.21
+++ Makefile    18 Oct 2011 21:42:14 -0000
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.21 2011/06/10 09:39:56 obache Exp $
 #
 
-DISTNAME=      calibre-0.8.2
-PKGREVISION=   1
+DISTNAME=      calibre-0.8.22
+#PKGREVISION=  1
 CATEGORIES=    misc
 MASTER_SITES=  http://status.calibre-ebook.com/dist/src/ \
                http://calibre-ebook.googlecode.com/files/
@@ -19,7 +19,7 @@
 DEPENDS+=      ${PYPKGPREFIX}-dns>=1.6.0:../../net/py-dns
 DEPENDS+=      ${PYPKGPREFIX}-lxml>=2.2.1:../../textproc/py-lxml
 DEPENDS+=      ${PYPKGPREFIX}-dateutil>=1.4.1:../../time/py-dateutil
-DEPENDS+=      ${PYPKGPREFIX}-ClientForm-[0-9]*:../../www/py-ClientForm
+#DEPENDS+=     ${PYPKGPREFIX}-ClientForm-[0-9]*:../../www/py-ClientForm
 DEPENDS+=      ${PYPKGPREFIX}-beautifulsoup>=3.0.5:../../www/py-beautifulsoup
 DEPENDS+=      ${PYPKGPREFIX}-mechanize>=0.1.11:../../www/py-mechanize
 DEPENDS+=      ${PYPKGPREFIX}-cssutils>=0.9.7:../../textproc/py-cssutils
@@ -46,7 +46,6 @@
 FIX_PYTHON+=   recipes/adevarul.recipe
 FIX_PYTHON+=   recipes/adnkronos.recipe
 FIX_PYTHON+=   recipes/ajc.recipe
-FIX_PYTHON+=   recipes/ambito.recipe
 FIX_PYTHON+=   recipes/apcom.recipe
 FIX_PYTHON+=   recipes/arcamax.recipe
 FIX_PYTHON+=   recipes/asia_one.recipe
@@ -66,8 +65,6 @@
 FIX_PYTHON+=   recipes/borba.recipe
 FIX_PYTHON+=   recipes/brand_eins.recipe
 FIX_PYTHON+=   recipes/bucataras.recipe
-FIX_PYTHON+=   recipes/buenosaireseconomico.recipe
-FIX_PYTHON+=   recipes/business_week.recipe
 FIX_PYTHON+=   recipes/calgary_herald.recipe
 FIX_PYTHON+=   recipes/capital.recipe
 FIX_PYTHON+=   recipes/catavencu.recipe
@@ -89,7 +86,6 @@
 FIX_PYTHON+=   recipes/courrierinternational.recipe
 FIX_PYTHON+=   recipes/craigslist.recipe
 FIX_PYTHON+=   recipes/credit_slips.recipe
-FIX_PYTHON+=   recipes/criticadigital.recipe
 FIX_PYTHON+=   recipes/csid.recipe
 FIX_PYTHON+=   recipes/curierulnational.recipe
 FIX_PYTHON+=   recipes/daily_telegraph.recipe
@@ -105,15 +101,16 @@
 FIX_PYTHON+=   recipes/diagonales.recipe
 FIX_PYTHON+=   recipes/diario_cordoba.recipe
 FIX_PYTHON+=   recipes/digital_arts.recipe
-FIX_PYTHON+=   recipes/dilemaveche.recipe
 FIX_PYTHON+=   recipes/discover_magazine.recipe
 FIX_PYTHON+=   recipes/divahair.recipe
 FIX_PYTHON+=   recipes/dn_se.recipe
 FIX_PYTHON+=   recipes/dnevni_avaz.recipe
 FIX_PYTHON+=   recipes/dnevnik_cro.recipe
+FIX_PYTHON+=   recipes/dnevnik_mk.recipe
 FIX_PYTHON+=   recipes/eclicto.recipe
 FIX_PYTHON+=   recipes/ecogeek.recipe
 FIX_PYTHON+=   recipes/economist.recipe
+FIX_PYTHON+=   recipes/economist_free.recipe
 FIX_PYTHON+=   recipes/ecuisine.recipe
 FIX_PYTHON+=   recipes/editor_and_publisher.recipe
 FIX_PYTHON+=   recipes/edmonton_journal.recipe
@@ -126,7 +123,6 @@
 FIX_PYTHON+=   recipes/el_periodico.recipe
 FIX_PYTHON+=   recipes/el_publico.recipe
 FIX_PYTHON+=   recipes/elargentino.recipe
-FIX_PYTHON+=   recipes/elcronista.recipe
 FIX_PYTHON+=   recipes/ele.recipe
 FIX_PYTHON+=   recipes/elperiodico_catalan.recipe
 FIX_PYTHON+=   recipes/elperiodico_spanish.recipe
@@ -142,7 +138,6 @@
 FIX_PYTHON+=   recipes/fastcompany.recipe
 FIX_PYTHON+=   recipes/felicia.recipe
 FIX_PYTHON+=   recipes/fhmro.recipe
-FIX_PYTHON+=   recipes/financial_times.recipe
 FIX_PYTHON+=   recipes/financiarul.recipe
 FIX_PYTHON+=   recipes/fr_online.recipe
 FIX_PYTHON+=   recipes/frazpc.recipe
@@ -156,12 +151,14 @@
 FIX_PYTHON+=   recipes/globe_and_mail.recipe
 FIX_PYTHON+=   recipes/go4it.recipe
 FIX_PYTHON+=   recipes/go_comics.recipe
+FIX_PYTHON+=   recipes/gosc_niedzielny.recipe
 FIX_PYTHON+=   recipes/granma.recipe
 FIX_PYTHON+=   recipes/gsp.recipe
 FIX_PYTHON+=   recipes/guardian.recipe
 FIX_PYTHON+=   recipes/gva_be.recipe
 FIX_PYTHON+=   recipes/h2.recipe
 FIX_PYTHON+=   recipes/h3.recipe
+FIX_PYTHON+=   recipes/hackernews.recipe
 FIX_PYTHON+=   recipes/heraldo.recipe
 FIX_PYTHON+=   recipes/histmag.recipe
 FIX_PYTHON+=   recipes/historiaro.recipe
@@ -188,14 +185,12 @@
 FIX_PYTHON+=   recipes/interia_sport.recipe
 FIX_PYTHON+=   recipes/intrefete.recipe
 FIX_PYTHON+=   recipes/jakarta_post.recipe
-FIX_PYTHON+=   recipes/japan_times.recipe
 FIX_PYTHON+=   recipes/javalobby.recipe
 FIX_PYTHON+=   recipes/jb_online.recipe
 FIX_PYTHON+=   recipes/joelonsoftware.recipe
 FIX_PYTHON+=   recipes/journalgazette.recipe
 FIX_PYTHON+=   recipes/jurnalulnational.recipe
 FIX_PYTHON+=   recipes/jutarnji.recipe
-FIX_PYTHON+=   recipes/juventudrebelde.recipe
 FIX_PYTHON+=   recipes/juventudrebelde_english.recipe
 FIX_PYTHON+=   recipes/kamikaze.recipe
 FIX_PYTHON+=   recipes/kellog_faculty.recipe
@@ -239,7 +234,6 @@
 FIX_PYTHON+=   recipes/mac_world_uk.recipe
 FIX_PYTHON+=   recipes/macleans.recipe
 FIX_PYTHON+=   recipes/malaysian_mirror.recipe
-FIX_PYTHON+=   recipes/marca.recipe
 FIX_PYTHON+=   recipes/mayra.recipe
 FIX_PYTHON+=   recipes/mediafax.recipe
 FIX_PYTHON+=   recipes/mediaindonesia.recipe
@@ -284,6 +278,7 @@
 FIX_PYTHON+=   recipes/osnews_pl.recipe
 FIX_PYTHON+=   recipes/ottawa_citizen.recipe
 FIX_PYTHON+=   recipes/outlook_india.recipe
+FIX_PYTHON+=   recipes/pagina_12_print_ed.recipe
 FIX_PYTHON+=   recipes/panorama.recipe
 FIX_PYTHON+=   recipes/pc_advisor.recipe
 FIX_PYTHON+=   recipes/pc_lab.recipe
@@ -293,7 +288,7 @@
 FIX_PYTHON+=   recipes/pcworldro.recipe
 FIX_PYTHON+=   recipes/people_us_mashup.recipe
 FIX_PYTHON+=   recipes/phd_comics.recipe
-FIX_PYTHON+=   recipes/philly.recipe
+FIX_PYTHON+=   recipes/plus_info.recipe
 FIX_PYTHON+=   recipes/pobjeda.recipe
 FIX_PYTHON+=   recipes/politico.recipe
 FIX_PYTHON+=   recipes/polityka.recipe
@@ -322,7 +317,6 @@
 FIX_PYTHON+=   recipes/romanialibera.recipe
 FIX_PYTHON+=   recipes/rstones.recipe
 FIX_PYTHON+=   recipes/rts.recipe
-FIX_PYTHON+=   recipes/runa.recipe
 FIX_PYTHON+=   recipes/salon.recipe
 FIX_PYTHON+=   recipes/san_fran_chronicle.recipe
 FIX_PYTHON+=   recipes/sanjosemercurynews.recipe
@@ -343,11 +337,11 @@
 FIX_PYTHON+=   recipes/slate.recipe
 FIX_PYTHON+=   recipes/smashing.recipe
 FIX_PYTHON+=   recipes/socialdiva.recipe
-FIX_PYTHON+=   recipes/spiegel_int.recipe
 FIX_PYTHON+=   recipes/spiegelde.recipe
 FIX_PYTHON+=   recipes/st_petersburg_times.recipe
 FIX_PYTHON+=   recipes/stackoverflow.recipe
 FIX_PYTHON+=   recipes/standardmoney.recipe
+FIX_PYTHON+=   recipes/stiintasitehnica.recipe
 FIX_PYTHON+=   recipes/superbebe.recipe
 FIX_PYTHON+=   recipes/svd_se.recipe
 FIX_PYTHON+=   recipes/swiatkindle.recipe
@@ -376,7 +370,6 @@
 FIX_PYTHON+=   recipes/tuttosport.recipe
 FIX_PYTHON+=   recipes/tvmania.recipe
 FIX_PYTHON+=   recipes/tweakers.recipe
-FIX_PYTHON+=   recipes/twitchfilms.recipe
 FIX_PYTHON+=   recipes/tyzden.recipe
 FIX_PYTHON+=   recipes/uncrate.recipe
 FIX_PYTHON+=   recipes/unica.recipe
@@ -384,6 +377,7 @@
 FIX_PYTHON+=   recipes/usatoday.recipe
 FIX_PYTHON+=   recipes/usnews.recipe
 FIX_PYTHON+=   recipes/utne.recipe
+FIX_PYTHON+=   recipes/utrinski.recipe
 FIX_PYTHON+=   recipes/vancouver_provice.recipe
 FIX_PYTHON+=   recipes/vancouver_sun.recipe
 FIX_PYTHON+=   recipes/vecernji_list.recipe
@@ -417,6 +411,7 @@
 FIX_PYTHON+=   setup/commands.py
 FIX_PYTHON+=   setup/extensions.py
 FIX_PYTHON+=   setup/gui.py
+FIX_PYTHON+=   setup/install.py
 FIX_PYTHON+=   setup/installer/__init__.py
 FIX_PYTHON+=   setup/installer/linux/__init__.py
 FIX_PYTHON+=   setup/installer/linux/freeze.py
@@ -430,13 +425,24 @@
 FIX_PYTHON+=   setup/installer/windows/site.py
 FIX_PYTHON+=   setup/installer/windows/wix.py
 FIX_PYTHON+=   setup/publish.py
-FIX_PYTHON+=   setup/pygettext.py
 FIX_PYTHON+=   setup/pypi.py
 FIX_PYTHON+=   setup/resources.py
 FIX_PYTHON+=   setup/server.py
 FIX_PYTHON+=   setup/translations.py
 FIX_PYTHON+=   setup/upload.py
 FIX_PYTHON+=   src/calibre/customize/zipplugin.py
+FIX_PYTHON+=   src/calibre/db/__init__.py
+FIX_PYTHON+=   src/calibre/db/backend.py
+FIX_PYTHON+=   src/calibre/db/cache.py
+FIX_PYTHON+=   src/calibre/db/errors.py
+FIX_PYTHON+=   src/calibre/db/fields.py
+FIX_PYTHON+=   src/calibre/db/locking.py
+FIX_PYTHON+=   src/calibre/db/schema_upgrades.py
+FIX_PYTHON+=   src/calibre/db/tables.py
+FIX_PYTHON+=   src/calibre/db/tests/__init__.py
+FIX_PYTHON+=   src/calibre/db/tests/base.py
+FIX_PYTHON+=   src/calibre/db/tests/reading.py
+FIX_PYTHON+=   src/calibre/db/view.py
 FIX_PYTHON+=   src/calibre/debug.py
 FIX_PYTHON+=   src/calibre/devices/android/__init__.py
 FIX_PYTHON+=   src/calibre/devices/eslick/__init__.py
@@ -448,6 +454,8 @@
 FIX_PYTHON+=   src/calibre/devices/kobo/driver.py
 FIX_PYTHON+=   src/calibre/devices/misc.py
 FIX_PYTHON+=   src/calibre/devices/prs505/sony_cache.py
+FIX_PYTHON+=   src/calibre/devices/prst1/__init__.py
+FIX_PYTHON+=   src/calibre/devices/prst1/driver.py
 FIX_PYTHON+=   src/calibre/devices/teclast/__init__.py
 FIX_PYTHON+=   src/calibre/devices/udisks.py
 FIX_PYTHON+=   src/calibre/ebooks/chm/__init__.py
@@ -457,6 +465,9 @@
 FIX_PYTHON+=   src/calibre/ebooks/conversion/config.py
 FIX_PYTHON+=   src/calibre/ebooks/conversion/preprocess.py
 FIX_PYTHON+=   src/calibre/ebooks/conversion/utils.py
+FIX_PYTHON+=   src/calibre/ebooks/djvu/__init__.py
+FIX_PYTHON+=   src/calibre/ebooks/djvu/djvu.py
+FIX_PYTHON+=   src/calibre/ebooks/djvu/djvubzzdec.py
 FIX_PYTHON+=   src/calibre/ebooks/epub/fix/__init__.py
 FIX_PYTHON+=   src/calibre/ebooks/epub/fix/container.py
 FIX_PYTHON+=   src/calibre/ebooks/epub/fix/epubcheck.py
@@ -466,6 +477,7 @@
 FIX_PYTHON+=   src/calibre/ebooks/epub/periodical.py
 FIX_PYTHON+=   src/calibre/ebooks/html/__init__.py
 FIX_PYTHON+=   src/calibre/ebooks/html/input.py
+FIX_PYTHON+=   src/calibre/ebooks/html/to_zip.py
 FIX_PYTHON+=   src/calibre/ebooks/iterator/__init__.py
 FIX_PYTHON+=   src/calibre/ebooks/lit/input.py
 FIX_PYTHON+=   src/calibre/ebooks/lit/output.py
@@ -473,8 +485,9 @@
 FIX_PYTHON+=   src/calibre/ebooks/lrf/input.py
 FIX_PYTHON+=   src/calibre/ebooks/lrf/output.py
 FIX_PYTHON+=   src/calibre/ebooks/lrf/pylrs/pylrf.py
-FIX_PYTHON+=   src/calibre/ebooks/markdown/markdown.py
-FIX_PYTHON+=   src/calibre/ebooks/markdown/mdx_tables.py
+FIX_PYTHON+=   src/calibre/ebooks/markdown/extensions/extra.py
+FIX_PYTHON+=   src/calibre/ebooks/markdown/extensions/fenced_code.py
+FIX_PYTHON+=   src/calibre/ebooks/markdown/extensions/wikilinks.py
 FIX_PYTHON+=   src/calibre/ebooks/metadata/__init__.py
 FIX_PYTHON+=   src/calibre/ebooks/metadata/archive.py
 FIX_PYTHON+=   src/calibre/ebooks/metadata/book/__init__.py
@@ -506,6 +519,11 @@
 FIX_PYTHON+=   src/calibre/ebooks/mobi/huffcdic.py
 FIX_PYTHON+=   src/calibre/ebooks/mobi/langcodes.py
 FIX_PYTHON+=   src/calibre/ebooks/mobi/output.py
+FIX_PYTHON+=   src/calibre/ebooks/mobi/utils.py
+FIX_PYTHON+=   src/calibre/ebooks/mobi/writer2/__init__.py
+FIX_PYTHON+=   src/calibre/ebooks/mobi/writer2/indexer.py
+FIX_PYTHON+=   src/calibre/ebooks/mobi/writer2/main.py
+FIX_PYTHON+=   src/calibre/ebooks/mobi/writer2/serializer.py
 FIX_PYTHON+=   src/calibre/ebooks/odt/__init__.py
 FIX_PYTHON+=   src/calibre/ebooks/oeb/transforms/__init__.py
 FIX_PYTHON+=   src/calibre/ebooks/oeb/transforms/cover.py
@@ -519,6 +537,7 @@
 FIX_PYTHON+=   src/calibre/ebooks/oeb/transforms/structure.py
 FIX_PYTHON+=   src/calibre/ebooks/pdf/__init__.py
 FIX_PYTHON+=   src/calibre/ebooks/pdf/reflow.py
+FIX_PYTHON+=   src/calibre/ebooks/readability/readability.py
 FIX_PYTHON+=   src/calibre/ebooks/rtf/preprocess.py
 FIX_PYTHON+=   src/calibre/ebooks/rtf2xml/ParseRtf.py
 FIX_PYTHON+=   src/calibre/ebooks/rtf2xml/check_encoding.py
@@ -541,10 +560,13 @@
 FIX_PYTHON+=   src/calibre/gui2/actions/help.py
 FIX_PYTHON+=   src/calibre/gui2/actions/next_match.py
 FIX_PYTHON+=   src/calibre/gui2/actions/open.py
+FIX_PYTHON+=   src/calibre/gui2/actions/plugin_updates.py
 FIX_PYTHON+=   src/calibre/gui2/actions/preferences.py
+FIX_PYTHON+=   src/calibre/gui2/actions/random.py
 FIX_PYTHON+=   src/calibre/gui2/actions/restart.py
 FIX_PYTHON+=   src/calibre/gui2/actions/save_to_disk.py
 FIX_PYTHON+=   src/calibre/gui2/actions/show_book_details.py
+FIX_PYTHON+=   src/calibre/gui2/actions/show_quickview.py
 FIX_PYTHON+=   src/calibre/gui2/actions/similar_books.py
 FIX_PYTHON+=   src/calibre/gui2/actions/tweak_epub.py
 FIX_PYTHON+=   src/calibre/gui2/actions/view.py
@@ -586,15 +608,20 @@
 FIX_PYTHON+=   src/calibre/gui2/dialogs/drm_error.py
 FIX_PYTHON+=   src/calibre/gui2/dialogs/edit_authors_dialog.py
 FIX_PYTHON+=   src/calibre/gui2/dialogs/message_box.py
+FIX_PYTHON+=   src/calibre/gui2/dialogs/plugin_updater.py
 FIX_PYTHON+=   src/calibre/gui2/dialogs/progress.py
+FIX_PYTHON+=   src/calibre/gui2/dialogs/quickview.py
 FIX_PYTHON+=   src/calibre/gui2/dialogs/restore_library.py
 FIX_PYTHON+=   src/calibre/gui2/dialogs/select_formats.py
 FIX_PYTHON+=   src/calibre/gui2/dialogs/template_dialog.py
+FIX_PYTHON+=   src/calibre/gui2/dialogs/template_line_editor.py
 FIX_PYTHON+=   src/calibre/gui2/dialogs/tweak_epub.py
 FIX_PYTHON+=   src/calibre/gui2/dnd.py
 FIX_PYTHON+=   src/calibre/gui2/email.py
 FIX_PYTHON+=   src/calibre/gui2/init.py
 FIX_PYTHON+=   src/calibre/gui2/jobs.py
+FIX_PYTHON+=   src/calibre/gui2/keyboard.py
+FIX_PYTHON+=   src/calibre/gui2/languages.py
 FIX_PYTHON+=   src/calibre/gui2/layout.py
 FIX_PYTHON+=   src/calibre/gui2/library/__init__.py
 FIX_PYTHON+=   src/calibre/gui2/library/delegates.py
@@ -610,12 +637,14 @@
 FIX_PYTHON+=   src/calibre/gui2/preferences/__init__.py
 FIX_PYTHON+=   src/calibre/gui2/preferences/adding.py
 FIX_PYTHON+=   src/calibre/gui2/preferences/behavior.py
+FIX_PYTHON+=   src/calibre/gui2/preferences/coloring.py
 FIX_PYTHON+=   src/calibre/gui2/preferences/columns.py
 FIX_PYTHON+=   src/calibre/gui2/preferences/conversion.py
 FIX_PYTHON+=   src/calibre/gui2/preferences/device_debug.py
 FIX_PYTHON+=   src/calibre/gui2/preferences/device_user_defined.py
 FIX_PYTHON+=   src/calibre/gui2/preferences/emailp.py
 FIX_PYTHON+=   src/calibre/gui2/preferences/history.py
+FIX_PYTHON+=   src/calibre/gui2/preferences/keyboard.py
 FIX_PYTHON+=   src/calibre/gui2/preferences/look_feel.py
 FIX_PYTHON+=   src/calibre/gui2/preferences/main.py
 FIX_PYTHON+=   src/calibre/gui2/preferences/metadata_sources.py
@@ -633,7 +662,10 @@
 FIX_PYTHON+=   src/calibre/gui2/progress_indicator/__init__.py
 FIX_PYTHON+=   src/calibre/gui2/search_box.py
 FIX_PYTHON+=   src/calibre/gui2/shortcuts.py
-FIX_PYTHON+=   src/calibre/gui2/tag_view.py
+FIX_PYTHON+=   src/calibre/gui2/tag_browser/__init__.py
+FIX_PYTHON+=   src/calibre/gui2/tag_browser/model.py
+FIX_PYTHON+=   src/calibre/gui2/tag_browser/ui.py
+FIX_PYTHON+=   src/calibre/gui2/tag_browser/view.py
 FIX_PYTHON+=   src/calibre/gui2/threaded_jobs.py
 FIX_PYTHON+=   src/calibre/gui2/throbber.py
 FIX_PYTHON+=   src/calibre/gui2/tools.py
@@ -651,6 +683,7 @@
 FIX_PYTHON+=   src/calibre/library/caches.py
 FIX_PYTHON+=   src/calibre/library/check_library.py
 FIX_PYTHON+=   src/calibre/library/cli.py
+FIX_PYTHON+=   src/calibre/library/coloring.py
 FIX_PYTHON+=   src/calibre/library/comments.py
 FIX_PYTHON+=   src/calibre/library/custom_columns.py
 FIX_PYTHON+=   src/calibre/library/move.py
@@ -659,6 +692,7 @@
 FIX_PYTHON+=   src/calibre/library/save_to_disk.py
 FIX_PYTHON+=   src/calibre/library/schema_upgrades.py
 FIX_PYTHON+=   src/calibre/library/server/__init__.py
+FIX_PYTHON+=   src/calibre/library/server/ajax.py
 FIX_PYTHON+=   src/calibre/library/server/base.py
 FIX_PYTHON+=   src/calibre/library/server/browse.py
 FIX_PYTHON+=   src/calibre/library/server/cache.py
@@ -677,6 +711,8 @@
 FIX_PYTHON+=   src/calibre/manual/plugin_examples/interface_demo/config.py
 FIX_PYTHON+=   src/calibre/manual/plugin_examples/interface_demo/main.py
 FIX_PYTHON+=   src/calibre/manual/plugin_examples/interface_demo/ui.py
+FIX_PYTHON+=   src/calibre/manual/template_ref_generate.py
+FIX_PYTHON+=   src/calibre/test_build.py
 FIX_PYTHON+=   src/calibre/trac/bzr_commit_plugin.py
 FIX_PYTHON+=   src/calibre/translations/msgfmt.py
 FIX_PYTHON+=   src/calibre/utils/__init__.py
@@ -690,6 +726,7 @@
 FIX_PYTHON+=   src/calibre/utils/ipc/__init__.py
 FIX_PYTHON+=   src/calibre/utils/ipc/job.py
 FIX_PYTHON+=   src/calibre/utils/ipc/launch.py
+FIX_PYTHON+=   src/calibre/utils/ipc/proxy.py
 FIX_PYTHON+=   src/calibre/utils/ipc/server.py
 FIX_PYTHON+=   src/calibre/utils/ipc/worker.py
 FIX_PYTHON+=   src/calibre/utils/localization.py
@@ -726,6 +763,11 @@
 FIX_PYTHON+=   src/calibre/web/feeds/recipes/model.py
 FIX_PYTHON+=   src/calibre/web/feeds/templates.py
 FIX_PYTHON+=   src/calibre/web/fetch/simple.py
+FIX_PYTHON+=   src/calibre/web/jsbrowser/__init__.py
+FIX_PYTHON+=   src/calibre/web/jsbrowser/browser.py
+FIX_PYTHON+=   src/calibre/web/jsbrowser/forms.py
+FIX_PYTHON+=   src/calibre/web/jsbrowser/login.py
+FIX_PYTHON+=   src/calibre/web/jsbrowser/test.py
 FIX_PYTHON+=   src/cherrypy/cherryd
 FIX_PYTHON+=   src/templite/__init__.py
 
@@ -753,7 +795,7 @@
 BUILDLINK_API_DEPENDS.libusb+= libusb>=0.1.12
 .include "../../devel/libusb/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
-BUILDLINK_API_DEPENDS.ImageMagick+=    ImageMagick>=6.3.5
+BUILDLINK_API_DEPENDS.ImageMagick+=    ImageMagick>=6.5.9
 .include "../../graphics/ImageMagick/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pyimaging+=      ${PYPKGPREFIX}-imaging>=1.1.6
 .include "../../graphics/py-imaging/buildlink3.mk"
@@ -766,9 +808,10 @@
 _PYSETUPINSTALLARGS=   ${PYSETUPINSTALLARGS} ${PYSETUPOPTARGS} 
${_PYSETUPTOOLSINSTALLARGS}
 #.include "../../lang/python/extension.mk"
 .include "../../print/podofo/buildlink3.mk"
+# ??? BUILDLINK_API_DEPENDS.podofo+=   podofo>=0.8.2
 .include "../../print/poppler-includes/buildlink3.mk"
 .include "../../print/poppler/buildlink3.mk"
-BUILDLINK_API_DEPENDS.poppler-qt4+=    poppler-qt4>=0.10.6
+BUILDLINK_API_DEPENDS.poppler-qt4+=    poppler-qt4>=0.12.0
 .include "../../print/poppler-qt4/buildlink3.mk"
 .include "../../sysutils/hal/buildlink3.mk"
 BUILDLINK_API_DEPENDS.py-dbus+=        ${PYPKGPREFIX}-dbus>=0.82.2
@@ -776,8 +819,8 @@
 .include "../../textproc/py-elementtree/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../x11/py-sip/buildlink3.mk"
-BUILDLINK_API_DEPENDS.py-qt4+= ${PYPKGPREFIX}-qt4>=4.5.1
+BUILDLINK_API_DEPENDS.py-qt4+= ${PYPKGPREFIX}-qt4>=4.7.0
 .include "../../x11/py-qt4/buildlink3.mk"
-BUILDLINK_API_DEPENDS.qt4-tools+=      qt4-tools>=4.5.1
+BUILDLINK_API_DEPENDS.qt4-tools+=      qt4-tools>=4.7.0
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/misc/calibre/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- PLIST       21 May 2011 15:07:48 -0000      1.5
+++ PLIST       18 Oct 2011 21:42:14 -0000
@@ -16,7 +16,6 @@
 bin/ebook-viewer
 bin/epub-fix
 bin/fetch-ebook-metadata
-bin/librarything
 bin/lrf2lrs
 bin/lrfviewer
 bin/lrs2lrf
@@ -31,6 +30,18 @@
 lib/calibre/calibre/customize/profiles.py
 lib/calibre/calibre/customize/ui.py
 lib/calibre/calibre/customize/zipplugin.py
+lib/calibre/calibre/db/__init__.py
+lib/calibre/calibre/db/backend.py
+lib/calibre/calibre/db/cache.py
+lib/calibre/calibre/db/errors.py
+lib/calibre/calibre/db/fields.py
+lib/calibre/calibre/db/locking.py
+lib/calibre/calibre/db/schema_upgrades.py
+lib/calibre/calibre/db/tables.py
+lib/calibre/calibre/db/tests/__init__.py
+lib/calibre/calibre/db/tests/base.py
+lib/calibre/calibre/db/tests/reading.py
+lib/calibre/calibre/db/view.py
 lib/calibre/calibre/debug.py
 lib/calibre/calibre/devices/__init__.py
 lib/calibre/calibre/devices/android/__init__.py
@@ -97,6 +108,8 @@
 lib/calibre/calibre/devices/prs505/__init__.py
 lib/calibre/calibre/devices/prs505/driver.py
 lib/calibre/calibre/devices/prs505/sony_cache.py
+lib/calibre/calibre/devices/prst1/__init__.py
+lib/calibre/calibre/devices/prst1/driver.py
 lib/calibre/calibre/devices/scanner.py
 lib/calibre/calibre/devices/sne/__init__.py
 lib/calibre/calibre/devices/sne/driver.py
@@ -114,6 +127,9 @@
 lib/calibre/calibre/devices/user_defined/driver.py
 lib/calibre/calibre/ebooks/BeautifulSoup.py
 lib/calibre/calibre/ebooks/__init__.py
+lib/calibre/calibre/ebooks/azw4/__init__.py
+lib/calibre/calibre/ebooks/azw4/input.py
+lib/calibre/calibre/ebooks/azw4/reader.py
 lib/calibre/calibre/ebooks/chardet/__init__.py
 lib/calibre/calibre/ebooks/chardet/big5freq.py
 lib/calibre/calibre/ebooks/chardet/big5prober.py
@@ -164,6 +180,11 @@
 lib/calibre/calibre/ebooks/conversion/plumber.py
 lib/calibre/calibre/ebooks/conversion/preprocess.py
 lib/calibre/calibre/ebooks/conversion/utils.py
+lib/calibre/calibre/ebooks/cssselect.py
+lib/calibre/calibre/ebooks/djvu/__init__.py
+lib/calibre/calibre/ebooks/djvu/djvu.py
+lib/calibre/calibre/ebooks/djvu/djvubzzdec.py
+lib/calibre/calibre/ebooks/djvu/input.py
 lib/calibre/calibre/ebooks/epub/__init__.py
 lib/calibre/calibre/ebooks/epub/fix/__init__.py
 lib/calibre/calibre/ebooks/epub/fix/container.py
@@ -182,6 +203,7 @@
 lib/calibre/calibre/ebooks/html/input.py
 lib/calibre/calibre/ebooks/html/meta.py
 lib/calibre/calibre/ebooks/html/output.py
+lib/calibre/calibre/ebooks/html/to_zip.py
 lib/calibre/calibre/ebooks/htmlz/__init__.py
 lib/calibre/calibre/ebooks/htmlz/input.py
 lib/calibre/calibre/ebooks/htmlz/oeb2html.py
@@ -221,10 +243,30 @@
 lib/calibre/calibre/ebooks/lrf/pylrs/pylrs.py
 lib/calibre/calibre/ebooks/lrf/tags.py
 lib/calibre/calibre/ebooks/markdown/__init__.py
+lib/calibre/calibre/ebooks/markdown/blockparser.py
+lib/calibre/calibre/ebooks/markdown/blockprocessors.py
+lib/calibre/calibre/ebooks/markdown/commandline.py
+lib/calibre/calibre/ebooks/markdown/etree_loader.py
+lib/calibre/calibre/ebooks/markdown/extensions/__init__.py
+lib/calibre/calibre/ebooks/markdown/extensions/abbr.py
+lib/calibre/calibre/ebooks/markdown/extensions/codehilite.py
+lib/calibre/calibre/ebooks/markdown/extensions/def_list.py
+lib/calibre/calibre/ebooks/markdown/extensions/extra.py
+lib/calibre/calibre/ebooks/markdown/extensions/fenced_code.py
+lib/calibre/calibre/ebooks/markdown/extensions/footnotes.py
+lib/calibre/calibre/ebooks/markdown/extensions/headerid.py
+lib/calibre/calibre/ebooks/markdown/extensions/meta.py
+lib/calibre/calibre/ebooks/markdown/extensions/rss.py
+lib/calibre/calibre/ebooks/markdown/extensions/tables.py
+lib/calibre/calibre/ebooks/markdown/extensions/toc.py
+lib/calibre/calibre/ebooks/markdown/extensions/wikilinks.py
+lib/calibre/calibre/ebooks/markdown/html4.py
+lib/calibre/calibre/ebooks/markdown/inlinepatterns.py
 lib/calibre/calibre/ebooks/markdown/markdown.py
-lib/calibre/calibre/ebooks/markdown/mdx_footnotes.py
-lib/calibre/calibre/ebooks/markdown/mdx_tables.py
-lib/calibre/calibre/ebooks/markdown/mdx_toc.py
+lib/calibre/calibre/ebooks/markdown/odict.py
+lib/calibre/calibre/ebooks/markdown/postprocessors.py
+lib/calibre/calibre/ebooks/markdown/preprocessors.py
+lib/calibre/calibre/ebooks/markdown/treeprocessors.py
 lib/calibre/calibre/ebooks/metadata/__init__.py
 lib/calibre/calibre/ebooks/metadata/archive.py
 lib/calibre/calibre/ebooks/metadata/book/__init__.py
@@ -264,6 +306,7 @@
 lib/calibre/calibre/ebooks/metadata/sources/isbndb.py
 lib/calibre/calibre/ebooks/metadata/sources/openlibrary.py
 lib/calibre/calibre/ebooks/metadata/sources/overdrive.py
+lib/calibre/calibre/ebooks/metadata/sources/ozon.py
 lib/calibre/calibre/ebooks/metadata/sources/test.py
 lib/calibre/calibre/ebooks/metadata/toc.py
 lib/calibre/calibre/ebooks/metadata/topaz.py
@@ -279,7 +322,12 @@
 lib/calibre/calibre/ebooks/mobi/mobiml.py
 lib/calibre/calibre/ebooks/mobi/output.py
 lib/calibre/calibre/ebooks/mobi/reader.py
+lib/calibre/calibre/ebooks/mobi/utils.py
 lib/calibre/calibre/ebooks/mobi/writer.py
+lib/calibre/calibre/ebooks/mobi/writer2/__init__.py
+lib/calibre/calibre/ebooks/mobi/writer2/indexer.py
+lib/calibre/calibre/ebooks/mobi/writer2/main.py
+lib/calibre/calibre/ebooks/mobi/writer2/serializer.py
 lib/calibre/calibre/ebooks/odt/__init__.py
 lib/calibre/calibre/ebooks/odt/input.py
 lib/calibre/calibre/ebooks/oeb/__init__.py
@@ -305,6 +353,7 @@
 lib/calibre/calibre/ebooks/oeb/transforms/split.py
 lib/calibre/calibre/ebooks/oeb/transforms/structure.py
 lib/calibre/calibre/ebooks/oeb/transforms/trimmanifest.py
+lib/calibre/calibre/ebooks/oeb/transforms/unsmarten.py
 lib/calibre/calibre/ebooks/oeb/writer.py
 lib/calibre/calibre/ebooks/pdb/__init__.py
 lib/calibre/calibre/ebooks/pdb/ereader/__init__.py
@@ -358,6 +407,11 @@
 lib/calibre/calibre/ebooks/rb/rbml.py
 lib/calibre/calibre/ebooks/rb/reader.py
 lib/calibre/calibre/ebooks/rb/writer.py
+lib/calibre/calibre/ebooks/readability/__init__.py
+lib/calibre/calibre/ebooks/readability/cleaners.py
+lib/calibre/calibre/ebooks/readability/debug.py
+lib/calibre/calibre/ebooks/readability/htmls.py
+lib/calibre/calibre/ebooks/readability/readability.py
 lib/calibre/calibre/ebooks/rtf/__init__.py
 lib/calibre/calibre/ebooks/rtf/input.py
 lib/calibre/calibre/ebooks/rtf/output.py
@@ -423,6 +477,7 @@
 lib/calibre/calibre/ebooks/tcr/output.py
 lib/calibre/calibre/ebooks/textile/__init__.py
 lib/calibre/calibre/ebooks/textile/functions.py
+lib/calibre/calibre/ebooks/textile/unsmarten.py
 lib/calibre/calibre/ebooks/txt/__init__.py
 lib/calibre/calibre/ebooks/txt/input.py
 lib/calibre/calibre/ebooks/txt/markdownml.py
@@ -431,7 +486,6 @@
 lib/calibre/calibre/ebooks/txt/processor.py
 lib/calibre/calibre/ebooks/txt/textileml.py
 lib/calibre/calibre/ebooks/txt/txtml.py
-lib/calibre/calibre/ebooks/txt/unsmarten.py
 lib/calibre/calibre/ebooks/unihandecode/__init__.py
 lib/calibre/calibre/ebooks/unihandecode/jacodepoints.py
 lib/calibre/calibre/ebooks/unihandecode/jadecoder.py
@@ -465,10 +519,13 @@
 lib/calibre/calibre/gui2/actions/help.py
 lib/calibre/calibre/gui2/actions/next_match.py
 lib/calibre/calibre/gui2/actions/open.py
+lib/calibre/calibre/gui2/actions/plugin_updates.py
 lib/calibre/calibre/gui2/actions/preferences.py
+lib/calibre/calibre/gui2/actions/random.py
 lib/calibre/calibre/gui2/actions/restart.py
 lib/calibre/calibre/gui2/actions/save_to_disk.py
 lib/calibre/calibre/gui2/actions/show_book_details.py
+lib/calibre/calibre/gui2/actions/show_quickview.py
 lib/calibre/calibre/gui2/actions/similar_books.py
 lib/calibre/calibre/gui2/actions/store.py
 lib/calibre/calibre/gui2/actions/tweak_epub.py
@@ -495,6 +552,8 @@
 lib/calibre/calibre/gui2/convert/comic_input_ui.py
 lib/calibre/calibre/gui2/convert/debug.py
 lib/calibre/calibre/gui2/convert/debug_ui.py
+lib/calibre/calibre/gui2/convert/djvu_input.py
+lib/calibre/calibre/gui2/convert/djvu_input_ui.py
 lib/calibre/calibre/gui2/convert/epub_output.py
 lib/calibre/calibre/gui2/convert/epub_output_ui.py
 lib/calibre/calibre/gui2/convert/fb2_input.py
@@ -583,6 +642,8 @@
 lib/calibre/calibre/gui2/dialogs/conversion_error_ui.py
 lib/calibre/calibre/gui2/dialogs/delete_matching_from_device.py
 lib/calibre/calibre/gui2/dialogs/delete_matching_from_device_ui.py
+lib/calibre/calibre/gui2/dialogs/device_category_editor.py
+lib/calibre/calibre/gui2/dialogs/device_category_editor_ui.py
 lib/calibre/calibre/gui2/dialogs/drm_error.py
 lib/calibre/calibre/gui2/dialogs/drm_error_ui.py
 lib/calibre/calibre/gui2/dialogs/edit_authors_dialog.py
@@ -595,8 +656,11 @@
 lib/calibre/calibre/gui2/dialogs/metadata_bulk_ui.py
 lib/calibre/calibre/gui2/dialogs/password.py
 lib/calibre/calibre/gui2/dialogs/password_ui.py
+lib/calibre/calibre/gui2/dialogs/plugin_updater.py
 lib/calibre/calibre/gui2/dialogs/progress.py
 lib/calibre/calibre/gui2/dialogs/progress_ui.py
+lib/calibre/calibre/gui2/dialogs/quickview.py
+lib/calibre/calibre/gui2/dialogs/quickview_ui.py
 lib/calibre/calibre/gui2/dialogs/restore_library.py
 lib/calibre/calibre/gui2/dialogs/saved_search_editor.py
 lib/calibre/calibre/gui2/dialogs/saved_search_editor_ui.py
@@ -614,6 +678,7 @@
 lib/calibre/calibre/gui2/dialogs/tag_list_editor_ui.py
 lib/calibre/calibre/gui2/dialogs/template_dialog.py
 lib/calibre/calibre/gui2/dialogs/template_dialog_ui.py
+lib/calibre/calibre/gui2/dialogs/template_line_editor.py
 lib/calibre/calibre/gui2/dialogs/test_email_ui.py
 lib/calibre/calibre/gui2/dialogs/tweak_epub.py
 lib/calibre/calibre/gui2/dialogs/tweak_epub_ui.py
@@ -625,6 +690,8 @@
 lib/calibre/calibre/gui2/filename_pattern_ui.py
 lib/calibre/calibre/gui2/init.py
 lib/calibre/calibre/gui2/jobs.py
+lib/calibre/calibre/gui2/keyboard.py
+lib/calibre/calibre/gui2/languages.py
 lib/calibre/calibre/gui2/layout.py
 lib/calibre/calibre/gui2/library/__init__.py
 lib/calibre/calibre/gui2/library/delegates.py
@@ -651,6 +718,7 @@
 lib/calibre/calibre/gui2/preferences/adding_ui.py
 lib/calibre/calibre/gui2/preferences/behavior.py
 lib/calibre/calibre/gui2/preferences/behavior_ui.py
+lib/calibre/calibre/gui2/preferences/coloring.py
 lib/calibre/calibre/gui2/preferences/columns.py
 lib/calibre/calibre/gui2/preferences/columns_ui.py
 lib/calibre/calibre/gui2/preferences/conversion.py
@@ -663,6 +731,7 @@
 lib/calibre/calibre/gui2/preferences/email_ui.py
 lib/calibre/calibre/gui2/preferences/emailp.py
 lib/calibre/calibre/gui2/preferences/history.py
+lib/calibre/calibre/gui2/preferences/keyboard.py
 lib/calibre/calibre/gui2/preferences/look_feel.py
 lib/calibre/calibre/gui2/preferences/look_feel_ui.py
 lib/calibre/calibre/gui2/preferences/main.py
@@ -696,40 +765,24 @@
 lib/calibre/calibre/gui2/shortcuts.py
 lib/calibre/calibre/gui2/shortcuts_ui.py
 lib/calibre/calibre/gui2/store/__init__.py
-lib/calibre/calibre/gui2/store/amazon_de_plugin.py
-lib/calibre/calibre/gui2/store/amazon_plugin.py
-lib/calibre/calibre/gui2/store/amazon_uk_plugin.py
-lib/calibre/calibre/gui2/store/archive_org_plugin.py
-lib/calibre/calibre/gui2/store/baen_webscription_plugin.py
 lib/calibre/calibre/gui2/store/basic_config.py
 lib/calibre/calibre/gui2/store/basic_config_widget_ui.py
-lib/calibre/calibre/gui2/store/beam_ebooks_de_plugin.py
-lib/calibre/calibre/gui2/store/bewrite_plugin.py
-lib/calibre/calibre/gui2/store/bn_plugin.py
-lib/calibre/calibre/gui2/store/diesel_ebooks_plugin.py
-lib/calibre/calibre/gui2/store/ebooks_com_plugin.py
-lib/calibre/calibre/gui2/store/eharlequin_plugin.py
-lib/calibre/calibre/gui2/store/epubbuy_de_plugin.py
-lib/calibre/calibre/gui2/store/feedbooks_plugin.py
-lib/calibre/calibre/gui2/store/foyles_uk_plugin.py
-lib/calibre/calibre/gui2/store/gandalf_plugin.py
-lib/calibre/calibre/gui2/store/google_books_plugin.py
-lib/calibre/calibre/gui2/store/gutenberg_plugin.py
-lib/calibre/calibre/gui2/store/kobo_plugin.py
-lib/calibre/calibre/gui2/store/manybooks_plugin.py
-lib/calibre/calibre/gui2/store/mobileread/__init__.py
-lib/calibre/calibre/gui2/store/mobileread/cache_progress_dialog.py
-lib/calibre/calibre/gui2/store/mobileread/cache_progress_dialog_ui.py
-lib/calibre/calibre/gui2/store/mobileread/cache_update_thread.py
-lib/calibre/calibre/gui2/store/mobileread/mobileread_plugin.py
-lib/calibre/calibre/gui2/store/mobileread/models.py
-lib/calibre/calibre/gui2/store/mobileread/store_dialog.py
-lib/calibre/calibre/gui2/store/mobileread/store_dialog_ui.py
+lib/calibre/calibre/gui2/store/config/__init__.py
+lib/calibre/calibre/gui2/store/config/chooser/__init__.py
+lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder.py
+lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder_ui.py
+lib/calibre/calibre/gui2/store/config/chooser/chooser_dialog.py
+lib/calibre/calibre/gui2/store/config/chooser/chooser_widget.py
+lib/calibre/calibre/gui2/store/config/chooser/chooser_widget_ui.py
+lib/calibre/calibre/gui2/store/config/chooser/models.py
+lib/calibre/calibre/gui2/store/config/chooser/results_view.py
+lib/calibre/calibre/gui2/store/config/search/__init__.py
+lib/calibre/calibre/gui2/store/config/search/search_widget.py
+lib/calibre/calibre/gui2/store/config/search/search_widget_ui.py
+lib/calibre/calibre/gui2/store/config/search_widget_ui.py
+lib/calibre/calibre/gui2/store/config/store.py
 lib/calibre/calibre/gui2/store/mobileread_store_dialog_ui.py
-lib/calibre/calibre/gui2/store/nexto_plugin.py
-lib/calibre/calibre/gui2/store/open_library_plugin.py
-lib/calibre/calibre/gui2/store/oreilly_plugin.py
-lib/calibre/calibre/gui2/store/pragmatic_bookshelf_plugin.py
+lib/calibre/calibre/gui2/store/opensearch_store.py
 lib/calibre/calibre/gui2/store/search/__init__.py
 lib/calibre/calibre/gui2/store/search/adv_search_builder.py
 lib/calibre/calibre/gui2/store/search/adv_search_builder_ui.py
@@ -740,14 +793,66 @@
 lib/calibre/calibre/gui2/store/search/search_ui.py
 lib/calibre/calibre/gui2/store/search_result.py
 lib/calibre/calibre/gui2/store/search_ui.py
-lib/calibre/calibre/gui2/store/smashwords_plugin.py
-lib/calibre/calibre/gui2/store/waterstones_uk_plugin.py
+lib/calibre/calibre/gui2/store/stores/__init__.py
+lib/calibre/calibre/gui2/store/stores/amazon_de_plugin.py
+lib/calibre/calibre/gui2/store/stores/amazon_fr_plugin.py
+lib/calibre/calibre/gui2/store/stores/amazon_plugin.py
+lib/calibre/calibre/gui2/store/stores/amazon_uk_plugin.py
+lib/calibre/calibre/gui2/store/stores/archive_org_plugin.py
+lib/calibre/calibre/gui2/store/stores/baen_webscription_plugin.py
+lib/calibre/calibre/gui2/store/stores/beam_ebooks_de_plugin.py
+lib/calibre/calibre/gui2/store/stores/bewrite_plugin.py
+lib/calibre/calibre/gui2/store/stores/bn_plugin.py
+lib/calibre/calibre/gui2/store/stores/bookoteka_plugin.py
+lib/calibre/calibre/gui2/store/stores/chitanka_plugin.py
+lib/calibre/calibre/gui2/store/stores/diesel_ebooks_plugin.py
+lib/calibre/calibre/gui2/store/stores/ebook_nl_plugin.py
+lib/calibre/calibre/gui2/store/stores/ebooks_com_plugin.py
+lib/calibre/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py
+lib/calibre/calibre/gui2/store/stores/eharlequin_plugin.py
+lib/calibre/calibre/gui2/store/stores/eknigi_plugin.py
+lib/calibre/calibre/gui2/store/stores/escapemagazine_plugin.py
+lib/calibre/calibre/gui2/store/stores/feedbooks_plugin.py
+lib/calibre/calibre/gui2/store/stores/foyles_uk_plugin.py
+lib/calibre/calibre/gui2/store/stores/gandalf_plugin.py
+lib/calibre/calibre/gui2/store/stores/google_books_plugin.py
+lib/calibre/calibre/gui2/store/stores/gutenberg_plugin.py
+lib/calibre/calibre/gui2/store/stores/kobo_plugin.py
+lib/calibre/calibre/gui2/store/stores/legimi_plugin.py
+lib/calibre/calibre/gui2/store/stores/libri_de_plugin.py
+lib/calibre/calibre/gui2/store/stores/manybooks_plugin.py
+lib/calibre/calibre/gui2/store/stores/mobileread/__init__.py
+lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder.py
+lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder_ui.py
+lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog.py
+lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog_ui.py
+lib/calibre/calibre/gui2/store/stores/mobileread/cache_update_thread.py
+lib/calibre/calibre/gui2/store/stores/mobileread/mobileread_plugin.py
+lib/calibre/calibre/gui2/store/stores/mobileread/models.py
+lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog.py
+lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog_ui.py
+lib/calibre/calibre/gui2/store/stores/nexto_plugin.py
+lib/calibre/calibre/gui2/store/stores/open_books_plugin.py
+lib/calibre/calibre/gui2/store/stores/oreilly_plugin.py
+lib/calibre/calibre/gui2/store/stores/ozon_ru_plugin.py
+lib/calibre/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py
+lib/calibre/calibre/gui2/store/stores/rw2010_plugin.py
+lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py
+lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py
+lib/calibre/calibre/gui2/store/stores/waterstones_uk_plugin.py
+lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py
+lib/calibre/calibre/gui2/store/stores/whsmith_uk_plugin.py
+lib/calibre/calibre/gui2/store/stores/wizards_tower_books_plugin.py
+lib/calibre/calibre/gui2/store/stores/woblink_plugin.py
+lib/calibre/calibre/gui2/store/stores/xinxii_plugin.py
+lib/calibre/calibre/gui2/store/stores/zixo_plugin.py
 lib/calibre/calibre/gui2/store/web_control.py
 lib/calibre/calibre/gui2/store/web_store_dialog.py
 lib/calibre/calibre/gui2/store/web_store_dialog_ui.py
-lib/calibre/calibre/gui2/store/weightless_books_plugin.py
-lib/calibre/calibre/gui2/store/wizards_tower_books_plugin.py
-lib/calibre/calibre/gui2/tag_view.py
+lib/calibre/calibre/gui2/tag_browser/__init__.py
+lib/calibre/calibre/gui2/tag_browser/model.py
+lib/calibre/calibre/gui2/tag_browser/ui.py
+lib/calibre/calibre/gui2/tag_browser/view.py
 lib/calibre/calibre/gui2/threaded_jobs.py
 lib/calibre/calibre/gui2/throbber.py
 lib/calibre/calibre/gui2/tools.py
@@ -780,6 +885,7 @@
 lib/calibre/calibre/library/catalog.py
 lib/calibre/calibre/library/check_library.py
 lib/calibre/calibre/library/cli.py
+lib/calibre/calibre/library/coloring.py
 lib/calibre/calibre/library/comments.py
 lib/calibre/calibre/library/custom_columns.py
 lib/calibre/calibre/library/database.py
@@ -791,6 +897,7 @@
 lib/calibre/calibre/library/save_to_disk.py
 lib/calibre/calibre/library/schema_upgrades.py
 lib/calibre/calibre/library/server/__init__.py
+lib/calibre/calibre/library/server/ajax.py
 lib/calibre/calibre/library/server/base.py
 lib/calibre/calibre/library/server/browse.py
 lib/calibre/calibre/library/server/cache.py
@@ -815,6 +922,7 @@
 lib/calibre/calibre/manual/plugin_examples/interface_demo/main.py
 lib/calibre/calibre/manual/plugin_examples/interface_demo/ui.py
 lib/calibre/calibre/manual/qthelp.py
+lib/calibre/calibre/manual/template_ref_generate.py
 lib/calibre/calibre/plugins/cPalmdoc.so
 lib/calibre/calibre/plugins/chm_extra.so
 lib/calibre/calibre/plugins/chmlib.so
@@ -831,6 +939,7 @@
 lib/calibre/calibre/plugins/sqlite_custom.so
 lib/calibre/calibre/ptempfile.py
 lib/calibre/calibre/startup.py
+lib/calibre/calibre/test_build.py
 lib/calibre/calibre/trac/__init__.py
 lib/calibre/calibre/trac/bzr_commit_plugin.py
 lib/calibre/calibre/trac/setup.py
@@ -860,6 +969,7 @@
 lib/calibre/calibre/utils/ipc/__init__.py
 lib/calibre/calibre/utils/ipc/job.py
 lib/calibre/calibre/utils/ipc/launch.py
+lib/calibre/calibre/utils/ipc/proxy.py
 lib/calibre/calibre/utils/ipc/server.py
 lib/calibre/calibre/utils/ipc/worker.py
 lib/calibre/calibre/utils/localization.py
@@ -872,6 +982,10 @@
 lib/calibre/calibre/utils/mem.py
 lib/calibre/calibre/utils/mreplace.py
 lib/calibre/calibre/utils/network.py
+lib/calibre/calibre/utils/opensearch/__init__.py
+lib/calibre/calibre/utils/opensearch/description.py
+lib/calibre/calibre/utils/opensearch/query.py
+lib/calibre/calibre/utils/opensearch/url.py
 lib/calibre/calibre/utils/ordered_dict.py
 lib/calibre/calibre/utils/osx_symlinks.py
 lib/calibre/calibre/utils/pdftk.py
@@ -897,6 +1011,7 @@
 lib/calibre/calibre/utils/text2int.py
 lib/calibre/calibre/utils/threadpool.py
 lib/calibre/calibre/utils/titlecase.py
+lib/calibre/calibre/utils/unsmarten.py
 lib/calibre/calibre/utils/winshell.py
 lib/calibre/calibre/utils/wmf/__init__.py
 lib/calibre/calibre/utils/wmf/parse.py
@@ -913,6 +1028,11 @@
 lib/calibre/calibre/web/feeds/templates.py
 lib/calibre/calibre/web/fetch/__init__.py
 lib/calibre/calibre/web/fetch/simple.py
+lib/calibre/calibre/web/jsbrowser/__init__.py
+lib/calibre/calibre/web/jsbrowser/browser.py
+lib/calibre/calibre/web/jsbrowser/forms.py
+lib/calibre/calibre/web/jsbrowser/login.py
+lib/calibre/calibre/web/jsbrowser/test.py
 lib/calibre/cherrypy/__init__.py
 lib/calibre/cherrypy/_cpcgifs.py
 lib/calibre/cherrypy/_cpchecker.py
@@ -1007,7 +1127,6 @@
 man/man1/ebook-meta.1
 man/man1/epub-fix.1
 man/man1/fetch-ebook-metadata.1
-man/man1/librarything.1
 man/man1/lrf2lrs.1
 man/man1/lrs2lrf.1
 man/man1/pdfmanipulate.1
@@ -1065,6 +1184,7 @@
 share/calibre/content_server/next.png
 share/calibre/content_server/previous.png
 share/calibre/content_server/read/monocle.js
+share/calibre/content_server/stacktrace.js
 share/calibre/content_server/star-half.png
 share/calibre/content_server/star-off.png
 share/calibre/content_server/star-on.png
@@ -1108,6 +1228,7 @@
 share/calibre/images/debug.png
 share/calibre/images/default_cover.png
 share/calibre/images/devices/bambook.png
+share/calibre/images/devices/boox.jpg
 share/calibre/images/devices/folder.png
 share/calibre/images/devices/ipad.png
 share/calibre/images/devices/italica.png
@@ -1164,6 +1285,8 @@
 share/calibre/images/identifiers.png
 share/calibre/images/insert-link.png
 share/calibre/images/jobs.png
+share/calibre/images/keyboard-prefs.png
+share/calibre/images/languages.png
 share/calibre/images/library.png
 share/calibre/images/list_remove.png
 share/calibre/images/lookfeel.png
@@ -1174,6 +1297,7 @@
 share/calibre/images/mimetypes/bmp.png
 share/calibre/images/mimetypes/computer.png
 share/calibre/images/mimetypes/dir.png
+share/calibre/images/mimetypes/djvu.png
 share/calibre/images/mimetypes/epub.png
 share/calibre/images/mimetypes/fb2.png
 share/calibre/images/mimetypes/gif.png
@@ -1192,6 +1316,7 @@
 share/calibre/images/mimetypes/svg.png
 share/calibre/images/mimetypes/txt.png
 share/calibre/images/mimetypes/unknown.png
+share/calibre/images/mimetypes/xps.png
 share/calibre/images/mimetypes/zero.png
 share/calibre/images/mimetypes/zip.png
 share/calibre/images/minus.png
@@ -1204,12 +1329,26 @@
 share/calibre/images/page.png
 share/calibre/images/plugboard.png
 share/calibre/images/plugins.png
+share/calibre/images/plugins/mobileread.png
+share/calibre/images/plugins/plugin_deprecated.png
+share/calibre/images/plugins/plugin_disabled_invalid.png
+share/calibre/images/plugins/plugin_disabled_ok.png
+share/calibre/images/plugins/plugin_disabled_valid.png
+share/calibre/images/plugins/plugin_new.png
+share/calibre/images/plugins/plugin_new_invalid.png
+share/calibre/images/plugins/plugin_new_valid.png
+share/calibre/images/plugins/plugin_updater.png
+share/calibre/images/plugins/plugin_updater_updates.png
+share/calibre/images/plugins/plugin_upgrade_invalid.png
+share/calibre/images/plugins/plugin_upgrade_ok.png
+share/calibre/images/plugins/plugin_upgrade_valid.png
 share/calibre/images/plus.png
 share/calibre/images/plusplus.png
 share/calibre/images/previous.png
 share/calibre/images/print-preview.png
 share/calibre/images/print.png
 share/calibre/images/publisher.png
+share/calibre/images/random.png
 share/calibre/images/rating.png
 share/calibre/images/reader.png
 share/calibre/images/save.png
@@ -1238,138 +1377,7 @@
 share/calibre/jacket/template.xhtml
 share/calibre/jquery.simulate.js
 share/calibre/localization/iso639.pickle
-share/calibre/localization/locales/af/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/af/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ar/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/ar/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ar/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/ast/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/ast/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/bg/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/bg/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/bn/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/bs/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/bs/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ca/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/ca/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/cs/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/cs/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/cs/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/da/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/da/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/da/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/de/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/de/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/de/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/el/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/el/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/en_AU/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/en_CA/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/en_GB/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/eo/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/eo/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/es/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/es/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/es/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/eu/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/eu/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/fa/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/fa/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/fi/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/fi/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/fo/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/fr/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/fr/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/fr/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/gl/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/gl/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/gl/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/he/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/he/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/he/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/hi/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/hi/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/hr/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/hr/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/hu/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/hu/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/hu/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/id/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/id/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/it/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/it/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ja/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/ja/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ja/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/ko/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/ko/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/lt/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/lt/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ltg/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/lv/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/lv/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ml/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/mr/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/mr/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ms/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/ms/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/nb/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/nb/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/nds/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/nl/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/nl/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/oc/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/oc/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/pa/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/pa/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/pl/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/pl/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/pl/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/pt/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/pt/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/pt/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/pt_BR/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/pt_BR/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ro/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/ro/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ru/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/ru/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ru/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/sc/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/sk/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/sk/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/sk/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/sl/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/sl/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/sl/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/sq/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/sr/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/sr/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/sv/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/sv/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/sv/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/ta/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/ta/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/te/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/th/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/th/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/tr/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/tr/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/uk/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/uk/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/uk/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/ur/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/vi/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/vi/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/yi/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/zh_CN/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/zh_CN/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/zh_CN/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/zh_HK/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/zh_HK/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/zh_TW/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/zh_TW/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/zh_TW/LC_MESSAGES/qt.qm
+share/calibre/localization/locales.zip
 share/calibre/localization/pykakasi/itaijidict2.pickle
 share/calibre/localization/pykakasi/kanadict2.pickle
 share/calibre/localization/pykakasi/kanwadict2.pickle
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/misc/calibre/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo    21 May 2011 15:07:48 -0000      1.4
+++ distinfo    18 Oct 2011 21:42:14 -0000
@@ -1,13 +1,6 @@
 $NetBSD: distinfo,v 1.4 2011/05/21 15:07:48 wiz Exp $
 
-SHA1 (calibre-0.8.2.tar.gz) = 4e5a19b063aa3f8a7af3fcbdd6c4bad5cfb28ca0
-RMD160 (calibre-0.8.2.tar.gz) = 05ef243ee65405f3243c74cd444278411b949b7c
-Size (calibre-0.8.2.tar.gz) = 28195417 bytes
-SHA1 (patch-setup_____init____.py) = 6ffa50a3a6e5d433da1f40de59d9306fe5b7c0fb
-SHA1 (patch-setup_extensions.py) = 6c2e584e6293bea1f160bc3361251785218a54d3
-SHA1 (patch-setup_install.py) = 254490c558a62a6130767c808cf732ad0b6e22ae
-SHA1 (patch-src_calibre_____init____.py) = 
a37dacbc90bc8333362c876100732ceef9c08173
-SHA1 (patch-src_calibre_constants.py) = 
288c5346a63dba967473b31a3b637d6cfa67b5cd
+SHA1 (calibre-0.8.22.tar.gz) = 38318ebc8f82e9d9abe503efaa45f71da11f753e
+RMD160 (calibre-0.8.22.tar.gz) = 8c94c8fd6b7d1fe79d6298be5662029999087bd9
+Size (calibre-0.8.22.tar.gz) = 37566048 bytes
 SHA1 (patch-src_calibre_ebooks_pdf_images.cpp) = 
950f0302f3c387fb9b4ee41cd96d7c5103b7ad45
-SHA1 (patch-src_calibre_linux.py) = bb9ae0099faf84a73ccbc0a876ff340d5be82963
-SHA1 (patch-src_calibre_utils_help2man.py) = 
d53a0522082793a7cd94fd97589c39bf24803bf7

-Olaf.
-- 
___ Olaf 'Rhialto' Seibert  -- There's no point being grown-up if you 
\X/ rhialto/at/xs4all.nl    -- can't be childish sometimes. -The 4th Doctor

>Unformatted:
        
        


Home | Main Index | Thread Index | Old Index