← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/01_ubuntu_feedlists

  • 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/01_ubuntu_feedlists
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## 01_ubuntu_feedlists.dpatch by Emilio Pozuelo Monfort <pochu@ubuntu.com>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: Let's put some Ubuntu English and localized feeds in the default feedlist.
6
 
## DP: https://bugs.launchpad.net/ubuntu/+source/liferea/+bug/51604
7
 
## DP: http://emilio.pozuelo.org/?p=24
8
 
 
9
 
@DPATCH@
10
 
 
11
 
--- liferea-1.6.4.orig/opml/feedlist_es.opml
12
 
+++ liferea-1.6.4/opml/feedlist_es.opml
13
 
@@ -6,7 +6,7 @@
14
 
   <body>
15
 
      <outline text="Fuentes de ejemplo (castellano)">
16
 
       <outline text="OSS">
17
 
-        <outline text="Planeta Debian en espa&#xF1;ol" htmlUrl="http://planeta.debian.net/" xmlUrl="http://planeta.debian.net/rss20.xml" />
18
 
+        <outline text="PlanetUbuntu.Es" htmlUrl="http://planetubuntu.es/" xmlUrl="http://feeds.feedburner.com/PlanetUbuntuEs" />
19
 
         <outline text="Hispalinux" htmlUrl="http://www.hispalinux.es/" xmlUrl="http://www.hispalinux.es/node/feed" />
20
 
        <outline text="Barrapunto" htmlUrl="http://barrapunto.com/" xmlUrl="http://backends.barrapunto.com/barrapunto.rss" />
21
 
        <outline text="BulmaLUG" htmlUrl="http://bulma.net/" xmlUrl="http://bulma.net/xml.php" />
22
 
@@ -16,8 +16,8 @@
23
 
        <!-- lets keep this default English block in sync over all feed lists! -->
24
 
        <outline text="Fuentes de ejemplo (inglés)">
25
 
              <outline text="Open Source">
26
 
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
27
 
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
28
 
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
29
 
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
30
 
                        <outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
31
 
                        <outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
32
 
                        <outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
33
 
--- liferea-1.6.4.orig/opml/feedlist_fr.opml
34
 
+++ liferea-1.6.4/opml/feedlist_fr.opml
35
 
@@ -6,6 +6,7 @@
36
 
   <body>
37
 
     <outline text="Exemples de flux">
38
 
      <outline text="Français">
39
 
+       <outline text="Planet Ubuntu-fr" htmlUrl="http://planet.ubuntu-fr.org/" xmlUrl="http://planet.ubuntu-fr.org/feed/rss2" />
40
 
        <outline text="Standblog" htmlUrl="http://standblog.org/blog/" xmlUrl="http://standblog.org/dotclear/rss.php" />
41
 
        <outline text="Formats Ouverts" htmlUrl="http://formats-ouverts.org/blog/" xmlUrl="http://formats-ouverts.org/rss.php" />
42
 
        <outline text="Liberation.fr" htmlUrl="http://www.liberation.fr/" xmlUrl="http://www.liberation.fr/rss.php" />
43
 
@@ -24,8 +25,8 @@
44
 
        <!-- lets keep this default English block in sync over all feed lists! -->
45
 
        <outline text="International">          <!-- translate this for localized feed list -->
46
 
                <outline text="Open Source">            <!-- translate this for localized feed list -->
47
 
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
48
 
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
49
 
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
50
 
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
51
 
                        <outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
52
 
                        <outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
53
 
                        <outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
54
 
--- liferea-1.6.4.orig/opml/feedlist_nl.opml
55
 
+++ liferea-1.6.4/opml/feedlist_nl.opml
56
 
@@ -7,8 +7,8 @@
57
 
        <!-- lets keep this default English block in sync over all feed lists! -->
58
 
        <outline text="International">          <!-- translate this for localized feed list -->
59
 
                <outline text="Open Source">            <!-- translate this for localized feed list -->
60
 
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
61
 
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
62
 
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
63
 
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
64
 
                        <outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
65
 
                        <outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
66
 
                        <outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
67
 
@@ -22,6 +22,7 @@
68
 
        <!-- end of default block -->
69
 
 
70
 
     <outline text="Nederlandse feeds">
71
 
+      <outline text="Planet Ubuntu NL" htmlUrl="http://planet.ubuntu-nl.org/" xmlUrl="http://planet.ubuntu-nl.org/rss20.xml" />
72
 
       <outline text="Nieuws">
73
 
         <outline text="NRC Handelsblad | Binnenland" htmlUrl="http://www.nrc.nl/binnenland/" xmlUrl="http://www.nrc.nl/rss/binnenland/" />
74
 
         <outline text="nu.nl | Het laatste nieuws lees je het eerst op NU.nl" htmlUrl="http://www.nu.nl/" xmlUrl="http://www.nu.nl/deeplink_rss2/index.jsp?r=Algemeen" />
75
 
--- liferea-1.6.4.orig/opml/feedlist_sk.opml
76
 
+++ liferea-1.6.4/opml/feedlist_sk.opml
77
 
@@ -9,8 +9,8 @@
78
 
                        <!-- lets keep this default English block in sync over all feed lists! -->
79
 
                        <outline text="International">          <!-- translate this for localized feed list -->
80
 
                                <outline text="Open Source">            <!-- translate this for localized feed list -->
81
 
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
82
 
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
83
 
+                                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
84
 
+                                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
85
 
                                        <outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
86
 
                                        <outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
87
 
                                        <outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
88
 
--- liferea-1.6.4.orig/opml/feedlist_pl.opml
89
 
+++ liferea-1.6.4/opml/feedlist_pl.opml
90
 
@@ -6,6 +6,7 @@
91
 
   <body>
92
 
     <outline text="Przykładowe Subskrypcje">
93
 
       <outline text="polskie">
94
 
+        <outline text="Planet Ubuntu-pl" htmlUrl="http://planet.ubuntu-pl.org/" xmlUrl="http://planet.ubuntu-pl.org/rss20.xml" />
95
 
         <outline text="7thGuard.net" htmlUrl="http://www.7thguard.net/" xmlUrl="http://rss.7thguard.net/7thguard.xml" />
96
 
         <outline text="Linux.pl" htmlUrl="http://linux.pl/" xmlUrl="http://www.linux.pl/rss.php" />
97
 
       <outline text="Hacking.pl" htmlUrl="http://hacking.pl/" xmlUrl="http://rss.hacking.pl/" />
98
 
@@ -13,8 +14,8 @@
99
 
       <!-- lets keep this English block in sync over all feed lists! -->
100
 
       <outline text="międzynarodowe">
101
 
              <outline text="Open Source">
102
 
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
103
 
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
104
 
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
105
 
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
106
 
                        <outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
107
 
                        <outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
108
 
                        <outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
109
 
--- liferea-1.6.4.orig/opml/feedlist_ca.opml
110
 
+++ liferea-1.6.4/opml/feedlist_ca.opml
111
 
@@ -5,6 +5,9 @@
112
 
   </head>
113
 
   <body>
114
 
      <outline text="Canals d'exemple (català)">
115
 
+
116
 
+      <outline text="Planeta Ubuntu.cat" htmlUrl="http://planet.ubuntu.cat/" xmlUrl="http://planet.ubuntu.cat/rss20.xml" />
117
 
+
118
 
       <outline text="Notícies">
119
 
         <outline text="Vilaweb" htmlUrl="http://www.vilaweb.cat" xmlUrl="http://www.vilaweb.cat/media/rss/noticies_edicio_333_rss.xml" />
120
 
         <outline text="Avui" htmlUrl="http://www.avui.cat" xmlUrl="http://www.avui.cat/rss/articles.php" />
121
 
@@ -19,8 +22,8 @@
122
 
        <!-- lets keep this English block in sync over all feed lists! -->
123
 
        <outline text="Fuentes de ejemplo (inglés)">
124
 
                <outline text="Open Source">
125
 
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
126
 
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
127
 
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
128
 
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
129
 
                        <outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
130
 
                        <outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
131
 
                        <outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
132
 
--- liferea-1.6.4.orig/opml/feedlist_ru.opml
133
 
+++ liferea-1.6.4/opml/feedlist_ru.opml
134
 
@@ -17,8 +17,8 @@
135
 
     <outline text="Международные ленты новостей">
136
 
       <outline text="Свободное программное обеспечение">
137
 
              <outline text="Open source">
138
 
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
139
 
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
140
 
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
141
 
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
142
 
                        <outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
143
 
                        <outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
144
 
                        <outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
145
 
--- liferea-1.6.4.orig/opml/feedlist_pt_BR.opml
146
 
+++ liferea-1.6.4/opml/feedlist_pt_BR.opml
147
 
@@ -6,14 +6,14 @@
148
 
 <body>
149
 
     <outline text="Exemplos de Canais de Notícias">
150
 
         <outline text="Notícias">
151
 
-            <outline text="Planeta Debian Brasil" htmlUrl="http://www.debianbrasil.org/planeta/" xmlUrl="http://www.debianbrasil.org/planeta/rss20.xml" />
152
 
+            <outline text="Planeta Ubuntu Brasil" htmlUrl="http://planeta.ubuntu-br.org/" xmlUrl="http://planeta.ubuntu-br.org/atom.xml" />
153
 
             <outline title="BR-Linux.org - Linux levado a sério desde 1996" text="BR-Linux.org - Linux levado a sério desde 1996" description="BR-Linux.org - Linux levado a sério desde 1996" type="rss" htmlUrl="http://br-linux.org/linux" xmlUrl="http://br-linux.org/linux/node/feed" />
154
 
         </outline>
155
 
         <!-- lets keep this English block in sync over all feed lists! -->
156
 
         <outline text="internacional">
157
 
             <outline text="Open Source">
158
 
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
159
 
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
160
 
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
161
 
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
162
 
                        <outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
163
 
                        <outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
164
 
                        <outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
165
 
--- liferea-1.6.4.orig/opml/feedlist_sv.opml
166
 
+++ liferea-1.6.4/opml/feedlist_sv.opml
167
 
@@ -13,8 +13,8 @@
168
 
         <outline title="Nyheter fr&#xE5;n Expressen" htmlUrl="http://expressen.se/1.573280.1175529352?standAlone=true" xmlUrl="http://expressen.se/1.573280?standAlone=true" />
169
 
       </outline>
170
 
       <outline title="&#xD6;ppen k&#xE4;llkod" text="&#xD6;ppen k&#xE4;llkod" description="&#xD6;ppen k&#xE4;llkod" type="folder">
171
 
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
172
 
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
173
 
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
174
 
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
175
 
                        <outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
176
 
                        <outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
177
 
                        <outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
178
 
--- liferea-1.6.4.orig/opml/feedlist.opml
179
 
+++ liferea-1.6.4/opml/feedlist.opml
180
 
@@ -7,9 +7,8 @@
181
 
        <!-- lets keep this default English block in sync over all feed lists! -->
182
 
        <outline text="Example Feeds">          <!-- translate this for localized feed list -->
183
 
                <outline text="Open Source">            <!-- translate this for localized feed list -->
184
 
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
185
 
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
186
 
-                       <outline text="debian-community.org English language planet" htmlUrl="http://debian-community.org/planets/en/" xmlUrl="http://debian-community.org/planets/en/index.rss" />
187
 
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
188
 
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
189
 
                        <outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
190
 
                        <outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
191
 
                        <outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
192
 
--- liferea-1.6.4.orig/opml/feedlist_de.opml
193
 
+++ liferea-1.6.4/opml/feedlist_de.opml
194
 
@@ -7,7 +7,7 @@
195
 
        <outline text="Beispiel-Abonnements">
196
 
                <outline text="Deutsch">
197
 
                        <outline text="News">
198
 
-                                <outline text="German Debian community planet" htmlUrl="http://debian-community.org/planets/de/" xmlUrl="http://debian-community.org/planets/de/index.rss" />
199
 
+                                <outline text="Ubuntuusers Ikhaya" htmlUrl="http://ikhaya.ubuntuusers.de/" xmlUrl="http://ikhaya.ubuntuusers.de/feeds/full/20/" />
200
 
                                <outline text="Tagesschau" htmlUrl="http://www.tagesschau.de/" xmlUrl="http://www.tagesschau.de/newsticker.rdf" />
201
 
                                <outline text="Netzeitung" htmlUrl="http://www.netzzeitung.de" xmlUrl="http://www.netzeitung.de/export/news/rss/titelseite.xml" />
202
 
                                <outline text="Heise Online" htmlUrl="http://www.heise.de" xmlUrl="http://www.heise.de/newsticker/heise-atom.xml" />
203
 
@@ -24,8 +24,8 @@
204
 
                <!-- lets keep this default English block in sync over all feed lists! -->
205
 
                <outline text="International">          <!-- translate this for localized feed list -->
206
 
                        <outline text="Open Source">            <!-- translate this for localized feed list -->
207
 
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
208
 
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
209
 
+                               <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
210
 
+                               <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
211
 
                                <outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
212
 
                                <outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
213
 
                                <outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
214
 
--- liferea-1.6.4.orig/opml/feedlist_eu.opml
215
 
+++ liferea-1.6.4/opml/feedlist_eu.opml
216
 
@@ -20,8 +20,8 @@
217
 
        <!-- lets keep this default English block in sync over all feed lists! -->
218
 
        <outline text="International">          <!-- translate this for localized feed list -->
219
 
                <outline text="Open Source">            <!-- translate this for localized feed list -->
220
 
-                       <outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
221
 
-                       <outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
222
 
+                       <outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
223
 
+                       <outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
224
 
                        <outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
225
 
                        <outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
226
 
                        <outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />