#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_ubuntu_feedlists.dpatch by Emilio Pozuelo Monfort <pochu@ubuntu.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Let's put some Ubuntu English and localized feeds in the default feedlist.
## DP: https://bugs.launchpad.net/ubuntu/+source/liferea/+bug/51604
## DP: http://emilio.pozuelo.org/?p=24

@DPATCH@

--- liferea-1.6.4.orig/opml/feedlist_es.opml
+++ liferea-1.6.4/opml/feedlist_es.opml
@@ -6,7 +6,7 @@
   <body>
      <outline text="Fuentes de ejemplo (castellano)">
       <outline text="OSS">
-        <outline text="Planeta Debian en espa&#xF1;ol" htmlUrl="http://planeta.debian.net/" xmlUrl="http://planeta.debian.net/rss20.xml" />
+        <outline text="PlanetUbuntu.Es" htmlUrl="http://planetubuntu.es/" xmlUrl="http://feeds.feedburner.com/PlanetUbuntuEs" />
         <outline text="Hispalinux" htmlUrl="http://www.hispalinux.es/" xmlUrl="http://www.hispalinux.es/node/feed" />
 	<outline text="Barrapunto" htmlUrl="http://barrapunto.com/" xmlUrl="http://backends.barrapunto.com/barrapunto.rss" />
 	<outline text="BulmaLUG" htmlUrl="http://bulma.net/" xmlUrl="http://bulma.net/xml.php" />
@@ -16,8 +16,8 @@
 	<!-- lets keep this default English block in sync over all feed lists! -->
 	<outline text="Fuentes de ejemplo (inglés)">
 	      <outline text="Open Source">
-			<outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
-			<outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
+			<outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
+			<outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 			<outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
 			<outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
 			<outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
--- liferea-1.6.4.orig/opml/feedlist_fr.opml
+++ liferea-1.6.4/opml/feedlist_fr.opml
@@ -6,6 +6,7 @@
   <body>
     <outline text="Exemples de flux">
      <outline text="Français">
+       <outline text="Planet Ubuntu-fr" htmlUrl="http://planet.ubuntu-fr.org/" xmlUrl="http://planet.ubuntu-fr.org/feed/rss2" />
        <outline text="Standblog" htmlUrl="http://standblog.org/blog/" xmlUrl="http://standblog.org/dotclear/rss.php" />
        <outline text="Formats Ouverts" htmlUrl="http://formats-ouverts.org/blog/" xmlUrl="http://formats-ouverts.org/rss.php" />
        <outline text="Liberation.fr" htmlUrl="http://www.liberation.fr/" xmlUrl="http://www.liberation.fr/rss.php" />
@@ -24,8 +25,8 @@
 	<!-- lets keep this default English block in sync over all feed lists! -->
 	<outline text="International">		<!-- translate this for localized feed list -->
 		<outline text="Open Source">		<!-- translate this for localized feed list -->
-			<outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
-			<outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
+			<outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
+			<outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 			<outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
 			<outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
 			<outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
--- liferea-1.6.4.orig/opml/feedlist_nl.opml
+++ liferea-1.6.4/opml/feedlist_nl.opml
@@ -7,8 +7,8 @@
 	<!-- lets keep this default English block in sync over all feed lists! -->
 	<outline text="International">		<!-- translate this for localized feed list -->
 		<outline text="Open Source">		<!-- translate this for localized feed list -->
-			<outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
-			<outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
+			<outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
+			<outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 			<outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
 			<outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
 			<outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
@@ -22,6 +22,7 @@
 	<!-- end of default block -->
 
     <outline text="Nederlandse feeds">
+      <outline text="Planet Ubuntu NL" htmlUrl="http://planet.ubuntu-nl.org/" xmlUrl="http://planet.ubuntu-nl.org/rss20.xml" />
       <outline text="Nieuws">
         <outline text="NRC Handelsblad | Binnenland" htmlUrl="http://www.nrc.nl/binnenland/" xmlUrl="http://www.nrc.nl/rss/binnenland/" />
         <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" />
--- liferea-1.6.4.orig/opml/feedlist_sk.opml
+++ liferea-1.6.4/opml/feedlist_sk.opml
@@ -9,8 +9,8 @@
  			<!-- lets keep this default English block in sync over all feed lists! -->
 			<outline text="International">		<!-- translate this for localized feed list -->
 				<outline text="Open Source">		<!-- translate this for localized feed list -->
-			<outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
-			<outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
+					<outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
+					<outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 					<outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
 					<outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
 					<outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
--- liferea-1.6.4.orig/opml/feedlist_pl.opml
+++ liferea-1.6.4/opml/feedlist_pl.opml
@@ -6,6 +6,7 @@
   <body>
     <outline text="Przykładowe Subskrypcje">
       <outline text="polskie">
+        <outline text="Planet Ubuntu-pl" htmlUrl="http://planet.ubuntu-pl.org/" xmlUrl="http://planet.ubuntu-pl.org/rss20.xml" />
         <outline text="7thGuard.net" htmlUrl="http://www.7thguard.net/" xmlUrl="http://rss.7thguard.net/7thguard.xml" />
         <outline text="Linux.pl" htmlUrl="http://linux.pl/" xmlUrl="http://www.linux.pl/rss.php" />
       <outline text="Hacking.pl" htmlUrl="http://hacking.pl/" xmlUrl="http://rss.hacking.pl/" />
@@ -13,8 +14,8 @@
       <!-- lets keep this English block in sync over all feed lists! -->
       <outline text="międzynarodowe">
 	      <outline text="Open Source">
-			<outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
-			<outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
+			<outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
+			<outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 			<outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
 			<outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
 			<outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
--- liferea-1.6.4.orig/opml/feedlist_ca.opml
+++ liferea-1.6.4/opml/feedlist_ca.opml
@@ -5,6 +5,9 @@
   </head>
   <body>
      <outline text="Canals d'exemple (català)">
+
+      <outline text="Planeta Ubuntu.cat" htmlUrl="http://planet.ubuntu.cat/" xmlUrl="http://planet.ubuntu.cat/rss20.xml" />
+
       <outline text="Notícies">
         <outline text="Vilaweb" htmlUrl="http://www.vilaweb.cat" xmlUrl="http://www.vilaweb.cat/media/rss/noticies_edicio_333_rss.xml" />
         <outline text="Avui" htmlUrl="http://www.avui.cat" xmlUrl="http://www.avui.cat/rss/articles.php" />
@@ -19,8 +22,8 @@
 	<!-- lets keep this English block in sync over all feed lists! -->
 	<outline text="Fuentes de ejemplo (inglés)">
 		<outline text="Open Source">
-			<outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
-			<outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
+			<outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
+			<outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 			<outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
 			<outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
 			<outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
--- liferea-1.6.4.orig/opml/feedlist_ru.opml
+++ liferea-1.6.4/opml/feedlist_ru.opml
@@ -17,8 +17,8 @@
     <outline text="Международные ленты новостей">
       <outline text="Свободное программное обеспечение">
 	      <outline text="Open source">
-			<outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
-			<outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
+			<outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
+			<outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 			<outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
 			<outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
 			<outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
--- liferea-1.6.4.orig/opml/feedlist_pt_BR.opml
+++ liferea-1.6.4/opml/feedlist_pt_BR.opml
@@ -6,14 +6,14 @@
 <body>
     <outline text="Exemplos de Canais de Notícias">
         <outline text="Notícias">
-            <outline text="Planeta Debian Brasil" htmlUrl="http://www.debianbrasil.org/planeta/" xmlUrl="http://www.debianbrasil.org/planeta/rss20.xml" />
+            <outline text="Planeta Ubuntu Brasil" htmlUrl="http://planeta.ubuntu-br.org/" xmlUrl="http://planeta.ubuntu-br.org/atom.xml" />
             <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" />
         </outline>
         <!-- lets keep this English block in sync over all feed lists! -->
         <outline text="internacional">
             <outline text="Open Source">
-			<outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
-			<outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
+			<outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
+			<outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 			<outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
 			<outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
 			<outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
--- liferea-1.6.4.orig/opml/feedlist_sv.opml
+++ liferea-1.6.4/opml/feedlist_sv.opml
@@ -13,8 +13,8 @@
         <outline title="Nyheter fr&#xE5;n Expressen" htmlUrl="http://expressen.se/1.573280.1175529352?standAlone=true" xmlUrl="http://expressen.se/1.573280?standAlone=true" />
       </outline>
       <outline title="&#xD6;ppen k&#xE4;llkod" text="&#xD6;ppen k&#xE4;llkod" description="&#xD6;ppen k&#xE4;llkod" type="folder">
-			<outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
-			<outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
+			<outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
+			<outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 			<outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
 			<outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
 			<outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
--- liferea-1.6.4.orig/opml/feedlist.opml
+++ liferea-1.6.4/opml/feedlist.opml
@@ -7,9 +7,8 @@
 	<!-- lets keep this default English block in sync over all feed lists! -->
 	<outline text="Example Feeds">		<!-- translate this for localized feed list -->
 		<outline text="Open Source">		<!-- translate this for localized feed list -->
-			<outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
-			<outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
-			<outline text="debian-community.org English language planet" htmlUrl="http://debian-community.org/planets/en/" xmlUrl="http://debian-community.org/planets/en/index.rss" />
+			<outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
+			<outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 			<outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
 			<outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
 			<outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
--- liferea-1.6.4.orig/opml/feedlist_de.opml
+++ liferea-1.6.4/opml/feedlist_de.opml
@@ -7,7 +7,7 @@
 	<outline text="Beispiel-Abonnements">
 		<outline text="Deutsch">
 			<outline text="News">
-                                <outline text="German Debian community planet" htmlUrl="http://debian-community.org/planets/de/" xmlUrl="http://debian-community.org/planets/de/index.rss" />
+                                <outline text="Ubuntuusers Ikhaya" htmlUrl="http://ikhaya.ubuntuusers.de/" xmlUrl="http://ikhaya.ubuntuusers.de/feeds/full/20/" />
 				<outline text="Tagesschau" htmlUrl="http://www.tagesschau.de/" xmlUrl="http://www.tagesschau.de/newsticker.rdf" />
 				<outline text="Netzeitung" htmlUrl="http://www.netzzeitung.de" xmlUrl="http://www.netzeitung.de/export/news/rss/titelseite.xml" />
 				<outline text="Heise Online" htmlUrl="http://www.heise.de" xmlUrl="http://www.heise.de/newsticker/heise-atom.xml" />
@@ -24,8 +24,8 @@
  		<!-- lets keep this default English block in sync over all feed lists! -->
 		<outline text="International">		<!-- translate this for localized feed list -->
 			<outline text="Open Source">		<!-- translate this for localized feed list -->
-			<outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
-			<outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
+				<outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
+				<outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 				<outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
 				<outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
 				<outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
--- liferea-1.6.4.orig/opml/feedlist_eu.opml
+++ liferea-1.6.4/opml/feedlist_eu.opml
@@ -20,8 +20,8 @@
 	<!-- lets keep this default English block in sync over all feed lists! -->
 	<outline text="International">		<!-- translate this for localized feed list -->
 		<outline text="Open Source">		<!-- translate this for localized feed list -->
-			<outline text="Planet Debian" htmlUrl="http://planet.debian.org/" xmlUrl="http://planet.debian.org/rss20.xml" />
-			<outline text="Debian Administration" htmlUrl="http://www.debian-administration.org/" xmlUrl="http://www.debian-administration.org/atom.xml" />
+			<outline text="Planet Ubuntu" htmlUrl="http://planet.ubuntu.com/" xmlUrl="http://planet.ubuntu.com/rss20.xml" />
+			<outline text="The Ubuntu Fridge" htmlUrl="http://fridge.ubuntu.com/" xmlUrl="http://fridge.ubuntu.com/node/feed" />
 			<outline text="Gnomefiles" htmlUrl="http://www.gnomefiles.org/" xmlUrl="http://www.gnomefiles.org/files/gnomefiles.rdf" />
 			<outline text="GNOME Footnotes" htmlUrl="http://www.gnomedesktop.org/" xmlUrl="http://www.gnomedesktop.org/backend.php" />
 			<outline text="GrokLaw" htmlUrl="http://www.groklaw.net/" xmlUrl="http://www.groklaw.net/backend/GrokLaw.rdf" />
