Merge branch 'etiona_liferea' into 'etiona'

Liferea changes for etiona

See merge request !225

helpers/make-liferea

@@ -17,23 +17,14 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=4
+VERSION=5
 
 . ./config
 
-sed 's/^_Name=Liferea/_Name=Liferea Feed Reader/' -i liferea.desktop.in
-
-#remove references to Opera and Mozilla
-sed '/opera/ s/^.*$/<description>Selects which browser to use to open external links.<\/description>/' -i net.sf.liferea.gschema.xml*
-sed 's/Firefox/Abrowser/g; s/firefox/abrowser/g; /google-chrome/,/{/d; /opera/,/{/d' -i src/browser.c
-
 rm debian/patches/ubuntu-example-feeds.patch debian/patches/debian-example-feeds.patch
 sed '/ubuntu-example-feeds/d; /debian-example-feeds/d;' debian/patches/series -i
-
-
-#rm opml/feedlist_*
-#sed '/feedlist_/d; s/\(.*feedlist.opml.*\)/\1\n\tfeedlist_es.opml/;' opml/Makefile.* -i
-
+sed '/ubuntu-example-feeds/d;' debian/patches/ubuntu.additions -i
+sed '/ubuntu-example-feeds/d; /debian-example-feeds/d;' debian/patches/ubuntu.series -i
 
 cat << EOF > opml/feedlist
 <?xml version="1.0"?>