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

Conflicts:
	community-testing/collectd/PKGBUILD
	community-testing/collectd/install
	community-testing/collectd/libperl.patch
	community-testing/collectd/rc.d
	community-testing/collectd/rtnl_dump_filter.patch
	community-testing/freeradius/PKGBUILD
	community-testing/freeradius/freeradius.install
	community-testing/freeradius/krb5-build-fix.patch
	community-testing/freeradius/radiusd
	community-testing/inn/PKGBUILD
	community-testing/inn/inn.install
	community-testing/inn/innd.conf
	community-testing/inn/innd.rc
	community-testing/inn/nnrpd.conf
	community-testing/inn/nnrpd.rc
	community-testing/inn/site.make.patch
	community-testing/libvirt/PKGBUILD
	community-testing/linux-tools/PKGBUILD
	community-testing/linux-tools/cpupower.conf
	community-testing/linux-tools/cpupower.rc
	community-testing/linux-tools/cpupower.service
	community-testing/perl-berkeleydb/PKGBUILD
	community-testing/perl-class-methodmaker/PKGBUILD
	community-testing/perl-clone/PKGBUILD
	community-testing/perl-crypt-blowfish/PKGBUILD
	community-testing/perl-crypt-des/PKGBUILD
	community-testing/perl-curses/PKGBUILD
	community-testing/perl-data-structure-util/PKGBUILD
	community-testing/perl-datetime/PKGBUILD
	community-testing/perl-device-serialport/PKGBUILD
	community-testing/perl-file-rsyncp/PKGBUILD
	community-testing/perl-fuse/PKGBUILD
	community-testing/perl-gd/PKGBUILD
	community-testing/perl-gssapi/PKGBUILD
	community-testing/perl-html-strip/PKGBUILD
	community-testing/perl-inline-java/PKGBUILD
	community-testing/perl-io-dirent/PKGBUILD
	community-testing/perl-io-tty/PKGBUILD
	community-testing/perl-json-xs/PKGBUILD
	community-testing/perl-libapreq2/PKGBUILD
	community-testing/perl-mail-box-parser-c/PKGBUILD
	community-testing/perl-mail-transport-dbx/PKGBUILD
	community-testing/perl-net-dbus/PKGBUILD
	community-testing/perl-net-libidn/PKGBUILD
	community-testing/perl-params-classify/PKGBUILD
	community-testing/perl-params-validate/PKGBUILD
	community-testing/perl-string-crc32/PKGBUILD
	community-testing/perl-text-charwidth/PKGBUILD
	community-testing/perl-text-kakasi/ChangeLog
	community-testing/perl-text-kakasi/PKGBUILD
	community-testing/perl-tie-hash-indexed/PKGBUILD
	community-testing/perl-www-curl/PKGBUILD
	community-testing/perl-xmms/PKGBUILD
	community-testing/pork/PKGBUILD
	community-testing/rxvt-unicode/PKGBUILD
	community-testing/rxvt-unicode/urxvt-tabbed.desktop
	community-testing/rxvt-unicode/urxvt.desktop
	community-testing/rxvt-unicode/urxvtc.desktop
	community-testing/znc/PKGBUILD
	community/blackbox/PKGBUILD
	community/ccrtp/PKGBUILD
	community/gambas2/poppler-0.20.patch
	community/gambas3/poppler-0-20.patch
	community/libunistring/PKGBUILD
	community/libzrtpcpp/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2djvu/poppler-0.20.patch
	community/sword/PKGBUILD
	community/xiphos/PKGBUILD
	core/procps/PKGBUILD
	extra/dvdrip/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/inkscape/poppler20.patch
	extra/iperf/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libreoffice/fix_broken_hebrew_wordwrapping.diff
	extra/libreoffice/libreoffice-base.install
	extra/libreoffice/libreoffice-calc.install
	extra/libreoffice/libreoffice-common.install
	extra/libreoffice/libreoffice-draw.install
	extra/libreoffice/libreoffice-impress.install
	extra/libreoffice/libreoffice-writer.install
	extra/mail-notification/PKGBUILD
	extra/nxserver/PKGBUILD
	extra/php-suhosin/PKGBUILD
	extra/poppler/PKGBUILD
	extra/streamtuner/PKGBUILD
	extra/systemd/PKGBUILD
	extra/tunepimp/PKGBUILD
	mozilla-testing/iceweasel-libre/iceweasel.install
	multilib/wine/PKGBUILD
	staging/gimp-devel/gimp-devel.install
	testing/consolekit/PKGBUILD
	testing/cryptsetup/PKGBUILD
	testing/cryptsetup/encrypt_hook
	testing/cryptsetup/encrypt_install
	testing/dmraid/PKGBUILD
	testing/dmraid/dmraid_install
	testing/graphviz/PKGBUILD
	testing/imagemagick/PKGBUILD
	testing/imagemagick/perlmagick.rpath.patch
	testing/irssi/PKGBUILD
	testing/kdebindings-perlkde/PKGBUILD
	testing/kdebindings-perlqt/PKGBUILD
	testing/lvm2/PKGBUILD
	testing/lvm2/lvm2_hook
	testing/lvm2/lvm2_install
	testing/mdadm/PKGBUILD
	testing/mdadm/mdadm_install
	testing/mdadm/mdadm_udev_install
	testing/mkinitcpio-nfs-utils/PKGBUILD
	testing/net-snmp/snmpd.rc
	testing/perl-bit-vector/PKGBUILD
	testing/perl-compress-bzip2/PKGBUILD
	testing/perl-crypt-openssl-bignum/PKGBUILD
	testing/perl-crypt-openssl-random/PKGBUILD
	testing/perl-crypt-openssl-rsa/PKGBUILD
	testing/perl-crypt-ssleay/PKGBUILD
	testing/perl-dbd-mysql/PKGBUILD
	testing/perl-dbi/PKGBUILD
	testing/perl-fcgi/PKGBUILD
	testing/perl-locale-gettext/PKGBUILD
	testing/perl-locale-gettext/compatibility-with-POSIX-module.patch
	testing/perl-net-ssleay/PKGBUILD
	testing/perl-time-hires/PKGBUILD
	testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
	testing/perl/ChangeLog
	testing/perl/PKGBUILD
	testing/perl/digest_eval_hole.diff
	testing/perl/fix-h2ph-and-tests.patch
	testing/perl/perl.install
	testing/perl/perlbin.csh
	testing/perl/perlbin.sh
	testing/perl/provides.pl
	testing/php/PKGBUILD
	testing/php/logrotate.d.php-fpm
	testing/php/rc.d.php-fpm
	testing/pidgin/pidgin.install
	testing/pinentry/pinentry.install
	testing/postgresql/postgresql.pam
	testing/slim/logrotate
	testing/subversion/PKGBUILD
	testing/vim/PKGBUILD
	testing/vim/archlinux.vim
	testing/vim/gvim.desktop
	testing/vim/gvim.install
	testing/vim/vimrc
	testing/weechat/PKGBUILD
	testing/xf86-video-ati/PKGBUILD
	testing/xf86-video-intel/PKGBUILD
	testing/xf86-video-nouveau/PKGBUILD
	testing/xorg-server/PKGBUILD

1 files changed, 0 insertions, 127 deletions

diff --git a/community/netsurf/netsurf.desktop b/community/netsurf/netsurf.desktop
deleted file mode 100644
index aca4deefc..000000000
--- a/community/netsurf/netsurf.desktop
+++ /dev/null
@@ -1,127 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Netsurf
-Name[ar]=صافي تصفح
-Name[ast]=Netsurf
-Name[ca]=Netsurf
-Name[cs]=Netsurf
-Name[da]=Netsurf
-Name[de]=Netsurf
-Name[el]=καθαρού σερφ
-Name[en_GB]=Netsurf
-Name[es]=Netsurf
-Name[et]=Netsurf
-Name[fi]=Netsurf
-Name[fr]=Netsurf
-Name[gl]=Netsurf
-Name[he]=Netsurf
-Name[hr]=Netsurf
-Name[hu]=Netsurf
-Name[id]=Netsurf
-Name[it]=Netsurf
-Name[ja]=Netsurf
-Name[ko]=인터넷 서핑
-Name[lt]=Netsurf
-Name[nl]=Netsurf
-Name[no]=Netsurf
-Name[pl]=Netsurf
-Name[pt]=Netsurf
-Name[pt_BR]=Netsurf
-Name[ro]=Netsurf
-Name[ru]=Netsurf
-Name[sk]=Netsurf
-Name[sr]=нетсурф
-Name[sr@latin]=Netsurf
-Name[sv]=Netsurf
-Name[tr]=Netsurf
-Name[ug]=Netsurf
-Name[uk]=Інтернет серфінгу
-Name[zh_CN]=Netsurf 网冲浪
-Name[zh_TW]=Netsurf 網衝浪
-GenericName=Web Browser
-GenericName[ar]=متصفح الوب
-GenericName[ast]=Restolador
-GenericName[ca]=Navegador web
-GenericName[cs]=Internetový prohlížeč
-GenericName[da]=Webbrowser
-GenericName[de]=Internetbetrachter
-GenericName[el]=Περιηγητής Ιστού
-GenericName[en_GB]=Web Browser
-GenericName[es]=Navegador web
-GenericName[et]=Veebibrauser
-GenericName[fi]=Verkkoselain
-GenericName[fr]=Navigateur Internet
-GenericName[gl]=Navegador web
-GenericName[he]=דפדפן
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[id]=Peramban Web
-GenericName[it]=Browser web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[lt]=Interneto naršyklė
-GenericName[nl]=Webbrowser
-GenericName[no]=Nettleser
-GenericName[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ਰ
-GenericName[pl]=Przeglądarka internetowa
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador web
-GenericName[ro]=Navigator web
-GenericName[ru]=Интернет-обозреватель
-GenericName[sk]=Internetový prehliadač
-GenericName[sr]=Интернет прегледник
-GenericName[sr@latin]=Internet preglednik
-GenericName[sv]=Webbläsare
-GenericName[tr]=Web Tarayıcı
-GenericName[ug]=توركۆرگۈ
-GenericName[uk]=Переглядач Веб
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_TW]=網頁瀏覽器
-Comment=Lightweight web browser
-Comment[ar]=منصفح الوب الخفيف
-Comment[ast]=Restolador llixeru
-Comment[ca]=Navegador web lleuger
-Comment[cs]=Odlehčený prohlížeč
-Comment[da]=Letvægtig webbrowser
-Comment[de]=Schlanker Internetbetrachter
-Comment[el]=Ελαφρύς περιηγητής ιστού
-Comment[en_GB]=Lightweight web browser
-Comment[es]=Navegador web ligero
-Comment[et]=Kergekaaluline veebibrauser
-Comment[fi]=Kevyt verkkoselain
-Comment[fr]=Navigateur Internet léger
-Comment[gl]=Navegador web lixeiro
-Comment[he]=דפדפן קל משקל
-Comment[hr]=Lagani web preglednik
-Comment[hu]=Könnyűsúlyú webböngésző
-Comment[id]=Peramban web ringan
-Comment[it]=Browser web leggero
-Comment[ja]=軽量級ウェブブラウザ
-Comment[ko]=가벼운 웹 브라우저
-Comment[lt]=Paprasta interneto naršyklė
-Comment[nl]=Lichtgewicht webbrowser
-Comment[no]=Lettvektig nettleser
-Comment[pa]=ਲਾਈਟਵੇਟ ਵੈੱਬ ਬਰਾਊਜ਼ਰ
-Comment[pl]=Umożliwia przeglądanie zawartości sieci internetowej
-Comment[pt]=Navegador Web rápido
-Comment[pt_BR]=Navegador web leve
-Comment[ro]=Mic navigator web
-Comment[ru]=Легковесный Интернет-обозреватель
-Comment[sk]=Ľahký internetový prehliadač
-Comment[sr]=Једноставан Интернет прегледник
-Comment[sr@latin]=Jednostavan Internet preglednik
-Comment[sv]=Resurssnål webbläsare
-Comment[tr]=Hafif web tarayıcı 
-Comment[ug]=يېنىك توركۆرگۈ
-Comment[uk]=Легкий переглядач Веб
-Comment[zh_CN]=轻量级网页浏览器
-Comment[zh_TW]=輕量級網頁瀏覽器
-Categories=GTK;Network;WebBrowser;
-MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo;
-Exec=netsurf %U
-Icon=netsurf
-Terminal=false
-StartupNotify=true
-X-Osso-Type=application/x-executable
-X-Osso-Service=netsurf