Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/clementine/PKGBUILD
	community-testing/gedit-plugins/PKGBUILD
	community-testing/giggle/PKGBUILD
	community-testing/gimmie/PKGBUILD
	community-testing/glipper/PKGBUILD
	community-testing/gnome-system-tools/PKGBUILD
	community-testing/gnote/PKGBUILD
	community-testing/gnubiff/PKGBUILD
	community-testing/google-gadgets/PKGBUILD
	community-testing/gphpedit/PKGBUILD
	community-testing/ibus/PKGBUILD
	community-testing/inputattach/PKGBUILD
	community-testing/liboobs/PKGBUILD
	community-testing/perl-gtk2-webkit/PKGBUILD
	community-testing/shotwell/PKGBUILD
	community-testing/surf/PKGBUILD
	community-testing/system-tools-backends/PKGBUILD
	community-testing/uzbl/PKGBUILD
	community-testing/workrave/PKGBUILD
	community/cherrypy/PKGBUILD
	community/llvm/PKGBUILD
	community/xonotic/PKGBUILD
	extra/ntfs-3g/PKGBUILD
	extra/ntfsprogs/PKGBUILD
	extra/rhino/PKGBUILD
	testing/accountsservice/PKGBUILD
	testing/anjuta/PKGBUILD
	testing/ardour/PKGBUILD
	testing/at-spi/PKGBUILD
	testing/at-spi2-atk/PKGBUILD
	testing/at-spi2-core/PKGBUILD
	testing/atk/PKGBUILD
	testing/atkmm/PKGBUILD
	testing/avahi/PKGBUILD
	testing/banshee/PKGBUILD
	testing/brasero/PKGBUILD
	testing/cairomm/PKGBUILD
	testing/cheese/PKGBUILD
	testing/claws-mail-extra-plugins/PKGBUILD
	testing/clutter-gst/PKGBUILD
	testing/clutter-gtk/PKGBUILD
	testing/clutter-gtk2/PKGBUILD
	testing/clutter/PKGBUILD
	testing/cups-pk-helper/PKGBUILD
	testing/dconf/PKGBUILD
	testing/devhelp/PKGBUILD
	testing/ekiga/PKGBUILD
	testing/empathy/PKGBUILD
	testing/eog-plugins/PKGBUILD
	testing/eog/PKGBUILD
	testing/epiphany-extensions/PKGBUILD
	testing/epiphany/PKGBUILD
	testing/evince/PKGBUILD
	testing/evolution-data-server/PKGBUILD
	testing/evolution-exchange/PKGBUILD
	testing/evolution/PKGBUILD
	testing/farsight2/PKGBUILD
	testing/file-roller/PKGBUILD
	testing/folks/PKGBUILD
	testing/gcalctool/PKGBUILD
	testing/gconf-editor/PKGBUILD
	testing/gconf/PKGBUILD
	testing/gdk-pixbuf2/PKGBUILD
	testing/gdl/PKGBUILD
	testing/gdm/PKGBUILD
	testing/gedit/PKGBUILD
	testing/gimp-devel/PKGBUILD
	testing/gimp/PKGBUILD
	testing/gjs/PKGBUILD
	testing/glade/PKGBUILD
	testing/glib-networking/PKGBUILD
	testing/glib2/PKGBUILD
	testing/glibmm/PKGBUILD
	testing/gnome-applets/PKGBUILD
	testing/gnome-bluetooth/PKGBUILD
	testing/gnome-color-manager/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/gnome-desktop/PKGBUILD
	testing/gnome-disk-utility/PKGBUILD
	testing/gnome-games/PKGBUILD
	testing/gnome-keyring/PKGBUILD
	testing/gnome-media/PKGBUILD
	testing/gnome-menus/PKGBUILD
	testing/gnome-nettool/PKGBUILD
	testing/gnome-panel/PKGBUILD
	testing/gnome-pilot/PKGBUILD
	testing/gnome-power-manager/PKGBUILD
	testing/gnome-screensaver/PKGBUILD
	testing/gnome-session/PKGBUILD
	testing/gnome-settings-daemon/PKGBUILD
	testing/gnome-sharp/PKGBUILD
	testing/gnome-shell/PKGBUILD
	testing/gnome-system-monitor/PKGBUILD
	testing/gnome-terminal/PKGBUILD
	testing/gnome-themes-standard/PKGBUILD
	testing/gnome-user-share/PKGBUILD
	testing/gnome-utils/PKGBUILD
	testing/gobject-introspection/PKGBUILD
	testing/gthumb/PKGBUILD
	testing/gtk-vnc/PKGBUILD
	testing/gtk2/PKGBUILD
	testing/gtk3/PKGBUILD
	testing/gtkhtml4/PKGBUILD
	testing/gtkmm/PKGBUILD
	testing/gtkmm3/PKGBUILD
	testing/gtksourceview3/PKGBUILD
	testing/gucharmap/PKGBUILD
	testing/gvfs/PKGBUILD
	testing/kdeplasma-applets-networkmanagement/PKGBUILD
	testing/kismet/PKGBUILD
	testing/lcms2/PKGBUILD
	testing/libcanberra/PKGBUILD
	testing/libchamplain/PKGBUILD
	testing/libdmapsharing/PKGBUILD
	testing/libgda/PKGBUILD
	testing/libgdata/PKGBUILD
	testing/libgnome-keyring/PKGBUILD
	testing/libgnome-media-profiles/PKGBUILD
	testing/libgnomekbd/PKGBUILD
	testing/libgpod/PKGBUILD
	testing/libgweather/PKGBUILD
	testing/libimobiledevice/PKGBUILD
	testing/liblrdf/PKGBUILD
	testing/libnice/PKGBUILD
	testing/libnotify/PKGBUILD
	testing/libpeas/PKGBUILD
	testing/librsvg/PKGBUILD
	testing/libsocialweb/PKGBUILD
	testing/libsoup/PKGBUILD
	testing/libunique/PKGBUILD
	testing/libunique3/PKGBUILD
	testing/libwebkit/PKGBUILD
	testing/libwnck/PKGBUILD
	testing/libwnck3/PKGBUILD
	testing/libxklavier/PKGBUILD
	testing/liferea/PKGBUILD
	testing/mail-notification/PKGBUILD
	testing/metacity/PKGBUILD
	testing/midori/PKGBUILD
	testing/miro/PKGBUILD
	testing/mousetweaks/PKGBUILD
	testing/mpd/PKGBUILD
	testing/mutter/PKGBUILD
	testing/mx/PKGBUILD
	testing/nautilus-open-terminal/PKGBUILD
	testing/nautilus-sendto/PKGBUILD
	testing/nautilus/PKGBUILD
	testing/network-manager-applet/PKGBUILD
	testing/networkmanager-openvpn/PKGBUILD
	testing/networkmanager-pptp/PKGBUILD
	testing/networkmanager-vpnc/PKGBUILD
	testing/networkmanager/PKGBUILD
	testing/notification-daemon/PKGBUILD
	testing/opal/PKGBUILD
	testing/pangomm/PKGBUILD
	testing/pidgin/PKGBUILD
	testing/polkit-gnome/PKGBUILD
	testing/polkit/PKGBUILD
	testing/ptlib/PKGBUILD
	testing/pygobject/PKGBUILD
	testing/pygtk/PKGBUILD
	testing/pywebkitgtk/PKGBUILD
	testing/raptor/PKGBUILD
	testing/raptor1/PKGBUILD
	testing/rasqal/PKGBUILD
	testing/redland/PKGBUILD
	testing/rest/PKGBUILD
	testing/rhythmbox/PKGBUILD
	testing/seahorse/PKGBUILD
	testing/slv2/PKGBUILD
	testing/soprano/PKGBUILD
	testing/sound-juicer/PKGBUILD
	testing/telepathy-gabble/PKGBUILD
	testing/telepathy-glib/PKGBUILD
	testing/telepathy-logger/PKGBUILD
	testing/telepathy-mission-control/PKGBUILD
	testing/tomboy/PKGBUILD
	testing/totem-plparser/PKGBUILD
	testing/totem/PKGBUILD
	testing/udisks/PKGBUILD
	testing/upower/PKGBUILD
	testing/vinagre/PKGBUILD
	testing/vino/PKGBUILD
	testing/vte/PKGBUILD
	testing/yelp/PKGBUILD
	testing/zenity/PKGBUILD

1 files changed, 0 insertions, 143 deletions

diff --git a/extra/liferea/ChangeLog b/extra/liferea/ChangeLog
deleted file mode 100644
index c0861a7ae..000000000
--- a/extra/liferea/ChangeLog
+++ /dev/null
@@ -1,143 +0,0 @@
-2011-03-07  Jan Steffens  <jan.steffens@gmail.com>
-
-	* liferea 1.6.5-2
-	* Add patch for libnotify-0.7
-	* Add hicolor-icon-theme dependency
-
-2010-09-29  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.6.5-1
-	* Upstream update
-
-2010-06-30  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.6.4-1
-	* Upstream update
-	* Changed libnotify depends to optdepends
-	* Tidied up package description
-
-2010-02-22  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.6.3-1
-	* Upstream update
-
-2010-01-23  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.6.2-1
-	* Upstream update
-
-2009-11-20  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.6.1-1
-	* Upstream update
-
-2009-07-26  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.6.0-1
-	* Upstream update
-	* Updated depends
-	* Added lua support
-
-2009-07-01 Jan de Groot  <jgc@archlinux.org>
-
-	* liferea 1.4.28-2
-	* Rebuild for xulrunner 1.9.1
-	* Remove networkmanager dependencies
-
-2009-04-13  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.28-1
-	* Upstream update
-
-2009-03-15  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.27-1
-	* Upstream update
-
-2009-02-21  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.25-1
-	* Upstream update
-
-2009-02-01  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.24-1
-	* Upstream update
-
-2008-12-29  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.23-1
-	* Upstream update
-
-2008-11-14  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.22d-1
-	* Upstream update
-
-2008-10-27  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.20-1
-	* Forced downgrade (close FS#11899)
-
-2008-10-26  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.21b-1
-	* Upstream update
-
-2008-10-01  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.20-1
-	* Upstream update
-
-2008-09-06  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.19-1
-	* Upstream update
-
-2008-08-03  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.18-2
-	* Rebuilt against gnutls 2.4.1
-
-2008-07-28  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.18-1
-	* Upstream update
-	* Updated xulrunner 1.9 support patch
-	* Added intltool makedepends
-	* Removed force option
-	
-2008-06-22  Jan de Groot  <jgc@archlinux.org>
-	
-	* liferea 1.4.16b-2
-	* Build with xulrunner 1.9
-	* Add patch from gentoo to fix xulrunner 1.9 support
-	* Make versioned dependencies more strict
-	* Drop dependencies covered by xulrunner 1.9
-
-2008-06-17  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.16b-1
-	* Upstream update
-	* Added force option
-
-2008-06-13  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.16-1
-	* Upstream update
-
-2008-04-17  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.15-1
-	* Upstream update
-
-2008-03-12  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.14-1
-	* Upstream update
-
-2008-03-06  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.13-1
-	* Upstream update
-	* Cleaned install scriptlet