← Back to branch summary

~ubuntu-branches/ubuntu/vivid/liferea/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu-example-feeds

  • Committer: Package Import Robot
  • Author(s): bojo42
  • Date: 2012-03-29 14:17:21 UTC
  • mfrom: (1.3.9) (3.2.5 sid)
  • Revision ID: package-import@ubuntu.com-20120329141721-tbfopcrc5797wxt7
Tags: 1.8.3-0.1ubuntu1
https://launchpad.net/bugs/290666
https://launchpad.net/bugs/371754
https://launchpad.net/bugs/741543
https://launchpad.net/bugs/716688
https://launchpad.net/bugs/935147
* New upstream release (LP: #290666, #371754, #741543, #716688)
* Merge from Debian unstable (LP: #935147), remaining changes:
* debian/patches:
  - drop gtk-status-icon.patch & notification-append as in upstream
  - drop fix_systray_behavior as mostly upstreamed and rest seems unused
  - 01_ubuntu_feedlists: update & rename, move planets to "Open Source"  
  - add_X-Ubuntu-Gettext-Domain: rebase
  - libunity.patch: rebase, apply before indicator patch (liferea_shell.c)
  - libindicate_increase_version.patch: exclude from libindicate.patch
  - deactivate libindicate.patch, seems partly upstreamed and needs rework
* debian/control: libindicate-dev, libindicate-gtk-dev & libunity-dev
* debian/liferea.indicate & liferea.install: ship indicator desktop file
* debian/rules: enable libindicate

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ubuntu-example-feeds
 
1
Description: Let's put some Ubuntu English and localized feeds in the default feedlist.
 
2
Origin: Ubuntu
 
3
Author: Emilio Pozuelo Monfort <pochu@ubuntu.com>
 
4
Bug-Ubuntu: https://bugs.launchpad.net/bugs/51604
 
5
Forwarded: not-needed
 
6
Reviewed-By: bojo42 <bojo42@gmail.com>
 
7
Last-Update: 2012-02-19
 
8
 
 
9
--- liferea-1.8.0.orig/opml/feedlist_gl.opml
 
10
+++ liferea-1.8.0/opml/feedlist_gl.opml
 
11
@@ -24,8 +24,8 @@
 
12
                        <outline text="Science" htmlUrl="http://www.sciencenews.org" xmlUrl="http://www.sciencenews.org/view/feed/type/news/name/news.rss"/>
 
13
                </outline>
 
14
                <outline text="Open Source">            <!-- translate this title for localized feed list -->
 
15
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
 
16
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
 
17
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
 
18
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 
19
                        <outline text="Liferea Blog" htmlUrl="http://liferea.blogspot.com/" xmlUrl="http://liferea.blogspot.com/feeds/posts/default" />
 
20
                        <outline text="Planet GNOME" htmlUrl="http://planet.gnome.org/" xmlUrl="http://planet.gnome.org/atom.xml" />    
 
21
                </outline>
 
22
--- liferea-1.8.0.orig/opml/feedlist_ru.opml
 
23
+++ liferea-1.8.0/opml/feedlist_ru.opml
 
24
@@ -23,8 +23,8 @@
 
25
                        <outline text="Science" htmlUrl="http://www.sciencenews.org" xmlUrl="http://www.sciencenews.org/view/feed/type/news/name/news.rss"/>
 
26
                </outline>
 
27
                <outline text="Open Source">            <!-- translate this title for localized feed list -->
 
28
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
 
29
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
 
30
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
 
31
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 
32
                        <outline text="Liferea Blog" htmlUrl="http://liferea.blogspot.com/" xmlUrl="http://liferea.blogspot.com/feeds/posts/default" />
 
33
                        <outline text="Planet GNOME" htmlUrl="http://planet.gnome.org/" xmlUrl="http://planet.gnome.org/atom.xml" />    
 
34
                </outline>
 
35
--- liferea-1.8.0.orig/opml/feedlist_he.opml
 
36
+++ liferea-1.8.0/opml/feedlist_he.opml
 
37
@@ -35,8 +35,8 @@
 
38
                                <outline text="Science" htmlUrl="http://www.sciencenews.org" xmlUrl="http://www.sciencenews.org/view/feed/type/news/name/news.rss"/>
 
39
                        </outline>
 
40
                        <outline text="קוד פתוח">               <!-- translate this for localized feed list -->
 
41
-                               <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
 
42
-                               <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
 
43
+                               <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
 
44
+                               <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 
45
                                <outline text="Liferea Blog" htmlUrl="http://liferea.blogspot.com/" xmlUrl="http://liferea.blogspot.com/feeds/posts/default" />
 
46
                                <outline text="Planet GNOME" htmlUrl="http://planet.gnome.org/" xmlUrl="http://planet.gnome.org/atom.xml" />    
 
47
                        </outline>      
 
48
--- liferea-1.8.0.orig/opml/feedlist_ca.opml
 
49
+++ liferea-1.8.0/opml/feedlist_ca.opml
 
50
@@ -25,8 +25,9 @@
 
51
                        <outline text="Science" htmlUrl="http://www.sciencenews.org" xmlUrl="http://www.sciencenews.org/view/feed/type/news/name/news.rss"/>
 
52
                </outline>
 
53
                <outline text="Open Source">            <!-- translate this title for localized feed list -->
 
54
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
 
55
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
 
56
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
 
57
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 
58
+                       <outline text="Planeta Ubuntu.cat" htmlUrl="http://planet.ubuntu.cat/" xmlUrl="http://planet.ubuntu.cat/rss20.xml" />
 
59
                        <outline text="Liferea Blog" htmlUrl="http://liferea.blogspot.com/" xmlUrl="http://liferea.blogspot.com/feeds/posts/default" />
 
60
                        <outline text="Planet GNOME" htmlUrl="http://planet.gnome.org/" xmlUrl="http://planet.gnome.org/atom.xml" />    
 
61
                </outline>
 
62
--- liferea-1.8.0.orig/opml/feedlist_de.opml
 
63
+++ liferea-1.8.0/opml/feedlist_de.opml
 
64
@@ -26,9 +26,9 @@
 
65
                                <outline text="Science" htmlUrl="http://www.sciencenews.org" xmlUrl="http://www.sciencenews.org/view/feed/type/news/name/news.rss"/>
 
66
                        </outline>
 
67
                        <outline text="Open Source">            <!-- translate this title for localized feed list -->
 
68
-                               <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
 
69
-                               <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
 
70
-                               <outline text="German Debian community planet" htmlUrl="http://debian-community.org/planets/de/" xmlUrl="http://debian-community.org/planets/de/index.rss" />
 
71
+                               <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
 
72
+                               <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 
73
+                               <outline text="Ubuntuusers Ikhaya" htmlUrl="http://ikhaya.ubuntuusers.de/" xmlUrl="http://ikhaya.ubuntuusers.de/feeds/full/20/" />
 
74
                                <outline text="Liferea Blog" htmlUrl="http://liferea.blogspot.com/" xmlUrl="http://liferea.blogspot.com/feeds/posts/default" />
 
75
                                <outline text="Planet GNOME" htmlUrl="http://planet.gnome.org/" xmlUrl="http://planet.gnome.org/atom.xml" />    
 
76
                        </outline>
 
77
--- liferea-1.8.0.orig/opml/feedlist_pt.opml
 
78
+++ liferea-1.8.0/opml/feedlist_pt.opml
 
79
@@ -36,9 +36,8 @@
 
80
                        <outline text="Science" htmlUrl="http://www.sciencenews.org" xmlUrl="http://www.sciencenews.org/view/feed/type/news/name/news.rss"/>
 
81
                </outline>
 
82
                <outline text="Open Source">            <!-- translate this title for localized feed list -->
 
83
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
 
84
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
 
85
-            <outline text="Planeta DebianPT.org" htmlUrl="http://planet.debianpt.org/" xmlUrl="http://planet.debianpt.org/atom.xml" />
 
86
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
 
87
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 
88
                        <outline text="Liferea Blog" htmlUrl="http://liferea.blogspot.com/" xmlUrl="http://liferea.blogspot.com/feeds/posts/default" />
 
89
                        <outline text="Planet GNOME" htmlUrl="http://planet.gnome.org/" xmlUrl="http://planet.gnome.org/atom.xml" />    
 
90
                </outline>
 
91
--- liferea-1.8.0.orig/opml/feedlist_es.opml
 
92
+++ liferea-1.8.0/opml/feedlist_es.opml
 
93
@@ -21,9 +21,9 @@
 
94
                        <outline text="Science" htmlUrl="http://www.sciencenews.org" xmlUrl="http://www.sciencenews.org/view/feed/type/news/name/news.rss"/>
 
95
                </outline>
 
96
                <outline text="Open Source">            <!-- translate this title for localized feed list -->
 
97
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
 
98
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
 
99
-                       <outline text="Planeta Debian en espa&#xF1;ol" htmlUrl="http://planeta.debian.net/" xmlUrl="http://planeta.debian.net/rss20.xml" />
 
100
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
 
101
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 
102
+                       <outline text="PlanetUbuntu.Es" htmlUrl="http://planetubuntu.es/" xmlUrl="http://feeds.feedburner.com/PlanetUbuntuEs" />
 
103
                        <outline text="Liferea Blog" htmlUrl="http://liferea.blogspot.com/" xmlUrl="http://liferea.blogspot.com/feeds/posts/default" />
 
104
                        <outline text="Planet GNOME" htmlUrl="http://planet.gnome.org/" xmlUrl="http://planet.gnome.org/atom.xml" />    
 
105
                </outline>
 
106
--- liferea-1.8.0.orig/opml/feedlist_pl.opml
 
107
+++ liferea-1.8.0/opml/feedlist_pl.opml
 
108
@@ -20,8 +20,9 @@
 
109
                        <outline text="Science" htmlUrl="http://www.sciencenews.org" xmlUrl="http://www.sciencenews.org/view/feed/type/news/name/news.rss"/>
 
110
                </outline>
 
111
                <outline text="Open Source">            <!-- translate this title for localized feed list -->
 
112
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
 
113
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
 
114
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
 
115
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 
116
+                       <outline text="Planet Ubuntu-pl" htmlUrl="http://planet.ubuntu-pl.org/" xmlUrl="http://planet.ubuntu-pl.org/rss20.xml" />
 
117
                        <outline text="Liferea Blog" htmlUrl="http://liferea.blogspot.com/" xmlUrl="http://liferea.blogspot.com/feeds/posts/default" />
 
118
                        <outline text="Planet GNOME" htmlUrl="http://planet.gnome.org/" xmlUrl="http://planet.gnome.org/atom.xml" />    
 
119
                </outline>
 
120
--- liferea-1.8.0.orig/opml/feedlist_pt_BR.opml
 
121
+++ liferea-1.8.0/opml/feedlist_pt_BR.opml
 
122
@@ -18,9 +18,9 @@
 
123
                        <outline text="Science" htmlUrl="http://www.sciencenews.org" xmlUrl="http://www.sciencenews.org/view/feed/type/news/name/news.rss"/>
 
124
                </outline>
 
125
                <outline text="Open Source">            <!-- translate this title for localized feed list -->
 
126
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
 
127
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
 
128
-                       <outline text="Planeta Debian Brasil" htmlUrl="http://www.debianbrasil.org/planeta/" xmlUrl="http://www.debianbrasil.org/planeta/rss20.xml" />
 
129
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
 
130
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 
131
+                       <outline text="Planeta Ubuntu Brasil" htmlUrl="http://planeta.ubuntu-br.org/" xmlUrl="http://planeta.ubuntu-br.org/atom.xml" />
 
132
                        <outline text="Liferea Blog" htmlUrl="http://liferea.blogspot.com/" xmlUrl="http://liferea.blogspot.com/feeds/posts/default" />
 
133
                        <outline text="Planet GNOME" htmlUrl="http://planet.gnome.org/" xmlUrl="http://planet.gnome.org/atom.xml" />    
 
134
                </outline>
 
135
--- liferea-1.8.0.orig/opml/feedlist_sv.opml
 
136
+++ liferea-1.8.0/opml/feedlist_sv.opml
 
137
@@ -22,8 +22,8 @@
 
138
                        <outline text="Science" htmlUrl="http://www.sciencenews.org" xmlUrl="http://www.sciencenews.org/view/feed/type/news/name/news.rss"/>
 
139
                </outline>
 
140
                <outline text="Open Source">            <!-- translate this title for localized feed list -->
 
141
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
 
142
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
 
143
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
 
144
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 
145
                        <outline text="Liferea Blog" htmlUrl="http://liferea.blogspot.com/" xmlUrl="http://liferea.blogspot.com/feeds/posts/default" />
 
146
                        <outline text="Planet GNOME" htmlUrl="http://planet.gnome.org/" xmlUrl="http://planet.gnome.org/atom.xml" />    
 
147
                </outline>
 
148
--- liferea-1.8.0.orig/opml/feedlist_sk.opml
 
149
+++ liferea-1.8.0/opml/feedlist_sk.opml
 
150
@@ -15,8 +15,8 @@
 
151
                                        <outline text="Science" htmlUrl="http://www.sciencenews.org" xmlUrl="http://www.sciencenews.org/view/feed/type/news/name/news.rss"/>
 
152
                                </outline>
 
153
                                <outline text="Open Source">            <!-- translate this title for localized feed list -->
 
154
-                                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
 
155
-                                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
 
156
+                                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
 
157
+                                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 
158
                                        <outline text="Liferea Blog" htmlUrl="http://liferea.blogspot.com/" xmlUrl="http://liferea.blogspot.com/feeds/posts/default" />
 
159
                                        <outline text="Planet GNOME" htmlUrl="http://planet.gnome.org/" xmlUrl="http://planet.gnome.org/atom.xml" />    
 
160
                                </outline>
 
161
--- liferea-1.8.0.orig/opml/feedlist_bg.opml
 
162
+++ liferea-1.8.0/opml/feedlist_bg.opml
 
163
@@ -20,8 +20,8 @@
 
164
                        <outline text="Science" htmlUrl="http://www.sciencenews.org" xmlUrl="http://www.sciencenews.org/view/feed/type/news/name/news.rss"/>
 
165
                </outline>
 
166
                <outline text="Open Source">            <!-- translate this title for localized feed list -->
 
167
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
 
168
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
 
169
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
 
170
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 
171
                        <outline text="Liferea Blog" htmlUrl="http://liferea.blogspot.com/" xmlUrl="http://liferea.blogspot.com/feeds/posts/default" />
 
172
                        <outline text="Planet GNOME" htmlUrl="http://planet.gnome.org/" xmlUrl="http://planet.gnome.org/atom.xml" />    
 
173
                </outline>
 
174
--- liferea-1.8.0.orig/opml/feedlist_hu.opml
 
175
+++ liferea-1.8.0/opml/feedlist_hu.opml
 
176
@@ -14,8 +14,8 @@
 
177
                        <outline text="HWSW" htmlUrl="http://hwsw.hu/" xmlUrl="http://www.hwsw.hu/xml/latest_news_rss.xml" />
 
178
                </outline>
 
179
                <outline text="Nyílt forrás">           <!-- translate this for localized feed list -->
 
180
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
 
181
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
 
182
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
 
183
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 
184
                        <outline text="Liferea Blog" htmlUrl="http://liferea.blogspot.com/" xmlUrl="http://liferea.blogspot.com/feeds/posts/default" />
 
185
                        <outline text="Planet GNOME" htmlUrl="http://planet.gnome.org/" xmlUrl="http://planet.gnome.org/atom.xml" />
 
186
                        <outline text="HUP" htmlUrl="http://hup.hu/" xmlUrl="http://feeds.feedburner.com/HUP" />
 
187
--- liferea-1.8.0.orig/opml/feedlist_fr.opml
 
188
+++ liferea-1.8.0/opml/feedlist_fr.opml
 
189
@@ -29,10 +29,9 @@
 
190
                        <outline text="Science" htmlUrl="http://www.sciencenews.org" xmlUrl="http://www.sciencenews.org/view/feed/type/news/name/news.rss"/>
 
191
                </outline>
 
192
                <outline text="Open Source">            <!-- translate this title for localized feed list -->
 
193
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
 
194
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
 
195
-                       <outline text="Planet Debian-FR" htmlUrl="http://planet-fr.debian.net/" xmlUrl="http://planet-fr.debian.net/rss20.xml" />
 
196
-                       <outline text="Planète des utilisateurs Debian" htmlUrl="http://planet-fr.debian.net/users/" xmlUrl="http://planet-fr.debian.net/users/rss20.xml" />
 
197
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
 
198
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 
199
+                       <outline text="Planet Ubuntu-fr" htmlUrl="http://planet.ubuntu-fr.org/" xmlUrl="http://planet.ubuntu-fr.org/feed/rss2" />
 
200
                        <outline text="Liferea Blog" htmlUrl="http://liferea.blogspot.com/" xmlUrl="http://liferea.blogspot.com/feeds/posts/default" />
 
201
                        <outline text="Planet GNOME" htmlUrl="http://planet.gnome.org/" xmlUrl="http://planet.gnome.org/atom.xml" />    
 
202
                </outline>
 
203
--- liferea-1.8.0.orig/opml/feedlist_it.opml
 
204
+++ liferea-1.8.0/opml/feedlist_it.opml
 
205
@@ -28,8 +28,8 @@
 
206
                        <outline text="Science" htmlUrl="http://www.sciencenews.org" xmlUrl="http://www.sciencenews.org/view/feed/type/news/name/news.rss"/>
 
207
                </outline>
 
208
                <outline text="Open Source">
 
209
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
 
210
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
 
211
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
 
212
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 
213
                        <outline text="Liferea Blog" htmlUrl="http://liferea.blogspot.com/" xmlUrl="http://liferea.blogspot.com/feeds/posts/default" />
 
214
                        <outline text="Planet GNOME" htmlUrl="http://planet.gnome.org/" xmlUrl="http://planet.gnome.org/atom.xml" />    
 
215
                </outline>
 
216
--- liferea-1.8.0.orig/opml/feedlist_en.opml
 
217
+++ liferea-1.8.0/opml/feedlist_en.opml
 
218
@@ -13,9 +13,8 @@
 
219
                        <outline text="Science" htmlUrl="http://www.sciencenews.org" xmlUrl="http://www.sciencenews.org/view/feed/type/news/name/news.rss"/>
 
220
                </outline>
 
221
                <outline text="Open Source">            <!-- translate this title for localized feed list -->
 
222
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
 
223
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
 
224
-                       <outline text="debian-community.org English language planet" htmlUrl="http://debian-community.org/planets/en/" xmlUrl="http://debian-community.org/planets/en/index.rss" />
 
225
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
 
226
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 
227
                        <outline text="Liferea Blog" htmlUrl="http://liferea.blogspot.com/" xmlUrl="http://liferea.blogspot.com/feeds/posts/default" />
 
228
                        <outline text="Planet GNOME" htmlUrl="http://planet.gnome.org/" xmlUrl="http://planet.gnome.org/atom.xml" />    
 
229
                </outline>
 
230
--- liferea-1.8.0.orig/opml/feedlist_nl.opml
 
231
+++ liferea-1.8.0/opml/feedlist_nl.opml
 
232
@@ -13,8 +13,9 @@
 
233
                        <outline text="Science" htmlUrl="http://www.sciencenews.org" xmlUrl="http://www.sciencenews.org/view/feed/type/news/name/news.rss"/>
 
234
                </outline>
 
235
                <outline text="Open Source">            <!-- translate this title for localized feed list -->
 
236
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
 
237
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
 
238
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
 
239
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 
240
+                       <outline text="Planet Ubuntu NL" htmlUrl="http://planet.ubuntu-nl.org/" xmlUrl="http://planet.ubuntu-nl.org/rss20.xml" />
 
241
                        <outline text="Liferea Blog" htmlUrl="http://liferea.blogspot.com/" xmlUrl="http://liferea.blogspot.com/feeds/posts/default" />
 
242
                        <outline text="Planet GNOME" htmlUrl="http://planet.gnome.org/" xmlUrl="http://planet.gnome.org/atom.xml" />    
 
243
                </outline>
 
244
--- liferea-1.8.0.orig/opml/feedlist_eu.opml
 
245
+++ liferea-1.8.0/opml/feedlist_eu.opml
 
246
@@ -26,8 +26,8 @@
 
247
                        <outline text="Science" htmlUrl="http://www.sciencenews.org" xmlUrl="http://www.sciencenews.org/view/feed/type/news/name/news.rss"/>
 
248
                </outline>
 
249
                <outline text="Software librea">                <!-- translate this title for localized feed list -->
 
250
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
 
251
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
 
252
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
 
253
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 
254
                        <outline text="Liferea Blog" htmlUrl="http://liferea.blogspot.com/" xmlUrl="http://liferea.blogspot.com/feeds/posts/default" />
 
255
                        <outline text="Planet GNOME" htmlUrl="http://planet.gnome.org/" xmlUrl="http://planet.gnome.org/atom.xml" />    
 
256
                </outline>