diffstat of debian/ for calibre_0.9.0+dfsg-1 calibre_0.9.19-SprezzOS1 changelog | 84 ++++++++++++++++++++++++++++++++++++ control | 7 ++- patches/series | 6 -- patches/use-system-feedparser.patch | 69 ----------------------------- 4 files changed, 89 insertions(+), 77 deletions(-) --- calibre-0.9.0+dfsg/debian/changelog 2012-10-03 21:18:37.000000000 +0000 +++ calibre-0.9.19/debian/changelog 2013-02-17 18:57:09.000000000 +0000 @@ -1,3 +1,87 @@ +calibre (0.9.19-SprezzOS1) unstable; urgency=low + + * New upstream + + -- Nick Black Sun, 17 Feb 2013 13:56:30 -0500 + +calibre (0.9.18-SprezzOS1) unstable; urgency=low + + * New upstream + + -- Nick Black Thu, 14 Feb 2013 04:23:42 -0500 + +calibre (0.9.17-SprezzOS1) unstable; urgency=low + + * New upstream + + -- Nick Black Fri, 01 Feb 2013 21:24:27 -0500 + +calibre (0.9.16-SprezzOS1) unstable; urgency=low + + * New upstream + + -- Nick Black Sun, 27 Jan 2013 05:10:53 -0500 + +calibre (0.9.15-SprezzOS1) unstable; urgency=low + + * New upstream 0.9.15 + + -- Nick Black Sat, 19 Jan 2013 18:56:34 -0500 + +calibre (0.9.14-SprezzOS1) unstable; urgency=low + + * New upstream 0.9.14 + + -- Nick Black Sat, 12 Jan 2013 12:21:30 -0500 + +calibre (0.9.13-SprezzOS1) unstable; urgency=low + + * New upstream 0.9.13 + + -- Nick Black Sat, 05 Jan 2013 03:06:52 -0500 + +calibre (0.9.12-SprezzOS1) unstable; urgency=low + + * New upstream 0.9.12 + + -- Nick Black Fri, 28 Dec 2012 21:30:33 -0500 + +calibre (0.9.11-SprezzOS1) unstable; urgency=low + + * New upstream 0.9.11 + + -- nick black Mon, 24 Dec 2012 19:33:03 -0500 + +calibre (0.9.10-SprezzOS1) unstable; urgency=low + + * New upstream 0.9.10 + + -- Nick Black Sat, 15 Dec 2012 20:29:11 -0500 + +calibre (0.9.9-SprezzOS1) unstable; urgency=low + + * New upstream 0.9.9 + + -- Nick Black Fri, 07 Dec 2012 16:45:29 -0500 + +calibre (0.9.8-SprezzOS1) unstable; urgency=low + + * New upstream 0.9.8 + + -- nick black Mon, 03 Dec 2012 01:58:56 -0500 + +calibre (0.9.7-SprezzOS1) unstable; urgency=low + + * New upstream 0.9.7 + + -- nick black Sat, 24 Nov 2012 10:52:02 -0500 + +calibre (0.9.6-SprezzOS1) unstable; urgency=low + + * New upstream 0.9.6 + + -- nick black Mon, 12 Nov 2012 02:06:17 -0500 + calibre (0.9.0+dfsg-1) unstable; urgency=low * New upstream release. --- calibre-0.9.0+dfsg/debian/control 2012-10-03 21:18:37.000000000 +0000 +++ calibre-0.9.19/debian/control 2013-02-17 18:57:09.000000000 +0000 @@ -25,13 +25,16 @@ libsqlite3-dev, python-sip-dev, libqt4-dev, + libqt4-private-dev, libicu-dev, libmtp-dev, poppler-utils, libpodofo-dev, libboost-dev, - libchm-dev -Maintainer: Miriam Ruiz + libchm-dev, + xdg-utils +Maintainer: Nick Black +XSBC-Original-Maintainer: Miriam Ruiz Uploaders: Martin Pitt Standards-Version: 3.9.3 XS-Python-Version: >= 2.7 --- calibre-0.9.0+dfsg/debian/patches/series 2012-10-03 21:18:37.000000000 +0000 +++ calibre-0.9.19/debian/patches/series 2013-02-17 18:57:09.000000000 +0000 @@ -1,8 +1,2 @@ -# cherrypicked from/accepted into trunk: - -# sent upstream - -# local packaging fixes no_updates_dialog.patch disable_plugins.py -use-system-feedparser.patch --- calibre-0.9.0+dfsg/debian/patches/use-system-feedparser.patch 2012-10-03 21:18:37.000000000 +0000 +++ calibre-0.9.19/debian/patches/use-system-feedparser.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -Index: calibre-0.8.60+dfsg/recipes/economist_free.recipe -=================================================================== ---- calibre-0.8.60+dfsg.orig/recipes/economist_free.recipe 2012-07-20 06:26:28.000000000 +0200 -+++ calibre-0.8.60+dfsg/recipes/economist_free.recipe 2012-07-21 17:53:59.096926047 +0200 -@@ -8,9 +8,13 @@ - from calibre.web.feeds.news import BasicNewsRecipe - from calibre.ebooks.BeautifulSoup import Tag, NavigableString - from collections import OrderedDict -+from feedparser import parse -+from functools import partial - - import time, re - -+parse = partial(parse, agent='Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2.11) Gecko/20101012 Firefox/3.6.11') -+ - class Economist(BasicNewsRecipe): - - title = 'The Economist' -@@ -185,7 +189,6 @@ - lambda x:'')] - - def parse_index(self): -- from calibre.web.feeds.feedparser import parse - if self.test: - self.oldest_article = 14.0 - raw = self.index_to_soup( -Index: calibre-0.8.60+dfsg/recipes/lenta_ru.recipe -=================================================================== ---- calibre-0.8.60+dfsg.orig/recipes/lenta_ru.recipe 2012-07-20 06:26:28.000000000 +0200 -+++ calibre-0.8.60+dfsg/recipes/lenta_ru.recipe 2012-07-21 17:53:59.100926047 +0200 -@@ -4,11 +4,14 @@ - Lenta.ru - ''' - --from calibre.web.feeds.feedparser import parse - from calibre.ebooks.BeautifulSoup import Tag - from calibre.web.feeds.news import BasicNewsRecipe -+from feedparser import parse -+from functools import partial - import re - -+parse = partial(parse, agent='Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2.11) Gecko/20101012 Firefox/3.6.11') -+ - class LentaRURecipe(BasicNewsRecipe): - title = u'Lenta.ru: \u041d\u043e\u0432\u043e\u0441\u0442\u0438' - __author__ = 'Nikolai Kotchetkov' -Index: calibre-0.8.60+dfsg/src/calibre/web/feeds/__init__.py -=================================================================== ---- calibre-0.8.60+dfsg.orig/src/calibre/web/feeds/__init__.py 2012-07-20 06:26:28.000000000 +0200 -+++ calibre-0.8.60+dfsg/src/calibre/web/feeds/__init__.py 2012-07-21 17:53:59.100926047 +0200 -@@ -11,6 +11,10 @@ - from calibre import entity_to_unicode, strftime - from calibre.utils.date import dt_factory, utcnow, local_tz - from calibre.utils.cleantext import clean_ascii_chars -+from feedparser import parse -+from functools import partial -+ -+parse = partial(parse, agent='Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2.11) Gecko/20101012 Firefox/3.6.11') - - class Article(object): - -@@ -318,7 +322,6 @@ - max_articles_per_feed=100, - get_article_url=lambda item: item.get('link', None), - log=default_log): -- from calibre.web.feeds.feedparser import parse - # Handle unclosed escaped entities. They trip up feedparser and HBR for one - # generates them - raw_xml = re.sub(r'(&#\d+)([^0-9;])', r'\1;\2', raw_xml)