From 2e94faa700e44cf8abb02fdbd40920cc3484599c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 10 May 2011 08:37:27 -0600
Subject: [PATCH 1/3] Welt der Physik by schuster

---
 recipes/welt_der_physik.recipe | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 recipes/welt_der_physik.recipe

diff --git a/recipes/welt_der_physik.recipe b/recipes/welt_der_physik.recipe
new file mode 100644
index 0000000000..b3ce9cce1b
--- /dev/null
+++ b/recipes/welt_der_physik.recipe
@@ -0,0 +1,20 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AdvancedUserRecipe1303841067(BasicNewsRecipe):
+
+    title          = u'Welt der Physik'
+    __author__  = 'schuster'
+    remove_tags_befor = [dict(name='div', attrs={'class':'inhalt_bild_text_printonly'})]
+    remove_tags_after = [dict(name='span', attrs={'class':'clearinhalt_bild'})]
+    remove_tags = [dict(attrs={'class':['invisible', 'searchfld', 'searchbtn', 'topnavi', 'topsearch']}),
+	dict(id=['naservice', 'phservicemenu', '',]),
+	dict(name=['naservice'])]
+    oldest_article = 7
+    max_articles_per_feed = 100
+    no_stylesheets         = True
+    use_embedded_content   = False
+    language               = 'de'
+    remove_javascript      = True
+
+
+    feeds          = [(u'Nachrichten und Neuigkeiten', u'http://www.weltderphysik.de/rss/alles.xml')]

From 839c2e909a0f53cb43b60022c4a76a6f57b848c9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 10 May 2011 08:46:57 -0600
Subject: [PATCH 2/3] Replica Vedetelor by Silviu Cotoara

---
 recipes/icons/replicavedetelor.png | Bin 0 -> 709 bytes
 recipes/replicavedetelor.recipe    |  53 +++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 recipes/icons/replicavedetelor.png
 create mode 100644 recipes/replicavedetelor.recipe

diff --git a/recipes/icons/replicavedetelor.png b/recipes/icons/replicavedetelor.png
new file mode 100644
index 0000000000000000000000000000000000000000..57ba42c64ca752ecd07d720f292f7adf44e92997
GIT binary patch
literal 709
zcmWlWQAiqb9LF!Z2MMD|wvFX5;u;0k!;n1;8P&|KFjwY|brWgsIHH+BNQ6iXxtHQ#
zO|B7k*fN*HnS&uc#1T^tqi|+*i>RAWyU8Zb29qA*&)D_w`~CR7e7~O`-|0TngX*dq
zRS*PKcR$pdrF-RaWR=oxZmk)Bpo+OZqoqrd>5L%eixz?uPQ_xW2)3i;yZ|nWz>fpB
z2C>tj4c_5rfnClfd7aq>VjfK=9{t3D5hW-Hni&?Luw#k_UL82%U?RkA^YmI85OP%y
z3EtrNIK`%T#765d3YUCrFulTB#+mp=T8>iufuNj-f*u$TaL8S&#ZH2M0JycGq@cgd
zBGVaO$cZj5BPST<GE|NjJop5~W&}Ov5%Xd>!!i-p>ZFQ=B5Y%{?hr7+WRNYN@=7~x
zw0p|uWyC}RzZJL<m7UfSG_%foW*A_Hjov7mOzTW85OI;~JaP}`GD0ZE0z#=V;2Ml#
zw#9NmNasYAHxA6O!%c%JZ8^uo1jD6xBj%wcBmx%CfvU#?d^ql;z_==&;#C->!^mQe
zr;>uv&jAbu>ogsV8=Xviof9Qglp=j0t--<ViArY(1aM%0tw9dCWA*&~wkQ=-;WC>B
zp!WPBA&FeKzQb~T?)mWjO8Ld;``M-5&(rVLb_dmw_Qk|8wK~`_`}Jz`hq2`vi-Pd`
zPD`cmZ&i`GxizqtYS@pyXbqx?Km&>fUNfsZ4T+os`LVOvA6VKyqIX9US@iL*z{)`y
zIi{aQ3x$=fY+h5>Xj3fMma(v3tQ*?QrkJ*CjV+~3WvH&OY!zgd1lq4qG`7vxtA8p!
zs=mA(Tg)`IV2Ae6C#`1-;S(-<fS&b5#Q7ccyHXuCH$lqbTG^}GiT;s48LI8}%gNYk
gulnR^^CR^w8RX;9vHHn&i}Wef-DT3pI)}Xf0rYii9{>OV

literal 0
HcmV?d00001

diff --git a/recipes/replicavedetelor.recipe b/recipes/replicavedetelor.recipe
new file mode 100644
index 0000000000..b6f1a51d67
--- /dev/null
+++ b/recipes/replicavedetelor.recipe
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = u'2011, '
+'''
+replicavedetelor.ro
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class ReplicaVedetelor(BasicNewsRecipe):
+    title                 = u'Replica Vedetelor'
+    __author__            = u'Silviu Cotoara'
+    description           = u'Ofer\u0103 vedetelor dreptul la replic\u0103'
+    publisher             = 'Replica Vedetelor'
+    oldest_article        = 5
+    language              = 'ro'
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    category              = 'Ziare,Reviste,Vedete'
+    encoding              = 'utf-8'
+    cover_url       	  = 'http://www.webart-software.eu/_pics/lucrari_referinta/medium/84/1-Replica-Vedetelor.jpg'
+
+    conversion_options = {
+                             'comments'   : description
+                            ,'tags'       : category
+                            ,'language'   : language
+							,'publisher'  : publisher
+                         }
+
+    keep_only_tags = [
+            dict(name='div', attrs={'id':'zona-continut'})
+                     ]
+
+    remove_tags = [
+             dict(name='ul', attrs={'id':['lista-imagini']})
+           , dict(name='form', attrs={'id':['f-trimite-unui-prieten']})
+
+                  ]
+
+    remove_tags_after = [
+              dict(name='form', attrs={'id':['f-trimite-unui-prieten']})
+            ]
+
+    feeds          = [
+            (u'Feeds', u'http://www.replicavedetelor.ro/feed')
+                 ]
+
+    def preprocess_html(self, soup):
+        return self.adeify_images(soup)
+

From a325f9e8d6e1b0e6363823739b778fa611e393ba Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 10 May 2011 08:49:55 -0600
Subject: [PATCH 3/3] Fix #780459 (Kobo not recognized)

---
 src/calibre/devices/kobo/driver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index 3a0254ef20..f5c9a74733 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -38,7 +38,7 @@ class KOBO(USBMS):
 
     VENDOR_ID   = [0x2237]
     PRODUCT_ID  = [0x4161]
-    BCD         = [0x0110]
+    BCD         = [0x0110, 0x0323]
 
     VENDOR_NAME = ['KOBO_INC', 'KOBO']
     WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = ['.KOBOEREADER', 'EREADER']