Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/cdemu-client/PKGBUILD
	community/dcron/PKGBUILD
	community/freevo/PKGBUILD
	community/gmerlin-avdecoder/PKGBUILD
	community/hacburn/PKGBUILD
	community/htmldoc/PKGBUILD
	community/ibus-table/PKGBUILD
	community/iksemel/PKGBUILD
	community/isomaster/PKGBUILD
	community/libmatio/PKGBUILD
	community/libtlen/PKGBUILD
	community/luarocks/PKGBUILD
	community/lxde-common/PKGBUILD
	community/multipath-tools/PKGBUILD
	community/nvclock/PKGBUILD
	community/pam-krb5/PKGBUILD
	community/pidgin-musictracker/PKGBUILD
	community/pkgfile/PKGBUILD
	community/pkgtools/PKGBUILD
	community/print-manager/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python-pyxmpp/PKGBUILD
	community/python2-simplejson/PKGBUILD
	community/rsnapshot/PKGBUILD
	community/setconf/PKGBUILD
	community/tagpy/PKGBUILD
	community/terminator/PKGBUILD
	community/udunits/PKGBUILD
	community/vlock/PKGBUILD
	community/winefish/PKGBUILD
	core/nss-myhostname/PKGBUILD
	extra/avfs/PKGBUILD
	extra/bmp-musepack/PKGBUILD
	extra/bmp-wma/PKGBUILD
	extra/bochs/PKGBUILD
	extra/botan/PKGBUILD
	extra/cdargs/PKGBUILD
	extra/cx_freeze/PKGBUILD
	extra/dcfldd/PKGBUILD
	extra/devilspie/PKGBUILD
	extra/emelfm2/PKGBUILD
	extra/evilwm/PKGBUILD
	extra/fssos-nsvs/PKGBUILD
	extra/gimp-dbp/PKGBUILD
	extra/gimp-gap/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gmpc/PKGBUILD
	extra/gtkpod/PKGBUILD
	extra/hercules/PKGBUILD
	extra/herqq/PKGBUILD
	extra/hydrogen/PKGBUILD
	extra/kdegames/PKGBUILD
	extra/kradio/PKGBUILD
	extra/kshutdown/PKGBUILD
	extra/libmusicbrainz4/PKGBUILD
	extra/mahjong/PKGBUILD
	extra/mcrypt/PKGBUILD
	extra/monica/PKGBUILD
	extra/mpck/PKGBUILD
	extra/mrtg/PKGBUILD
	extra/nicotine/PKGBUILD
	extra/normalize/PKGBUILD
	extra/oprofile/PKGBUILD
	extra/perl-event/PKGBUILD
	extra/perl-unicode-string/PKGBUILD
	extra/pidgin-encryption/PKGBUILD
	extra/proftpd/PKGBUILD
	extra/pymad/PKGBUILD
	extra/qiv/PKGBUILD
	extra/quodlibet/PKGBUILD
	extra/ratpoison/PKGBUILD
	extra/rox/PKGBUILD
	extra/scrot/PKGBUILD
	extra/stardict/PKGBUILD
	extra/terminal/PKGBUILD
	extra/usbview/PKGBUILD
	extra/xdelta/PKGBUILD
	extra/xdelta3/PKGBUILD
	extra/xorg-xlsfonts/PKGBUILD
	extra/zile/PKGBUILD
	mozilla-testing/iceweasel-libre/mozconfig
	mozilla-testing/iceweasel-libre/vendor.js
	social/tokyocabinet/PKGBUILD
	~fauno/notmuch/PKGBUILD
	~mtjm/thinkfan/PKGBUILD
	~mtjm/zbar/PKGBUILD

1 files changed, 0 insertions, 34 deletions

diff --git a/extra/gnome-phone-manager/phonemgr-gnome-bluetooth-3.3.patch b/extra/gnome-phone-manager/phonemgr-gnome-bluetooth-3.3.patch
deleted file mode 100644
index 2200f9dcf..000000000
--- a/extra/gnome-phone-manager/phonemgr-gnome-bluetooth-3.3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2877c3a41b7e8feeb6eb6d6f718f4556ffb0161c Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Mon, 05 Dec 2011 08:10:59 +0000
-Subject: Bug 665309: Adapt to gnome-bluetooth 3.3 API
-
----
-diff --git a/configure.in b/configure.in
-index 101a77f..d0a7651 100644
---- a/configure.in
-+++ b/configure.in
-@@ -13,7 +13,7 @@ dnl Initialize libtool
- AM_PROG_LIBTOOL
- 
- GNOKII_REQS="gnokii >= 0.6.28"
--GNOME_BLUETOOTH_REQS="gnome-bluetooth-1.0 >= 3.0"
-+GNOME_BLUETOOTH_REQS="gnome-bluetooth-1.0 >= 3.3"
- 
- AC_PROG_CC
- AC_PROG_INSTALL
-diff --git a/gnome-bluetooth/phonemgr.c b/gnome-bluetooth/phonemgr.c
-index 9ebac12..fecc367 100644
---- a/gnome-bluetooth/phonemgr.c
-+++ b/gnome-bluetooth/phonemgr.c
-@@ -44,7 +44,7 @@ get_type (const char *address)
- 	gboolean cont;
- 
- 	client = bluetooth_client_new (); 
--	model = bluetooth_client_get_device_model (client, NULL);
-+	model = bluetooth_client_get_device_model (client);
- 	if (model == NULL) {
- 		g_object_unref (client);
- 		return type;
---
-cgit v0.9.0.2