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

Conflicts:
	community/abe/PKGBUILD
	community/account-plugins/PKGBUILD
	community/adesklets/PKGBUILD
	community/aircrack-ng/PKGBUILD
	community/audit/PKGBUILD
	community/bchunk/PKGBUILD
	community/bibutils/PKGBUILD
	community/cantata/PKGBUILD
	community/cdck/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/clusterssh/PKGBUILD
	community/consonance/PKGBUILD
	community/credentials-preferences/PKGBUILD
	community/dee/PKGBUILD
	community/dosbox/PKGBUILD
	community/drbd/PKGBUILD
	community/dvdisaster/PKGBUILD
	community/ekg/PKGBUILD
	community/ekg2/PKGBUILD
	community/emelfm2/PKGBUILD
	community/erlang/PKGBUILD
	community/ettercap/PKGBUILD
	community/evilwm/PKGBUILD
	community/fatrat/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/fcrackzip/PKGBUILD
	community/ffmpegsource/PKGBUILD
	community/fssos-nsvs/PKGBUILD
	community/geda-gaf/PKGBUILD
	community/gnome-applets/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gwibber/PKGBUILD
	community/html2text/PKGBUILD
	community/intellij-idea-libs/PKGBUILD
	community/libcgns2/PKGBUILD
	community/libmatio/PKGBUILD
	community/librcc/PKGBUILD
	community/libsignon-glib/PKGBUILD
	community/linux-tools/PKGBUILD
	community/minitube/PKGBUILD
	community/mpdscribble/PKGBUILD
	community/mplayer2/PKGBUILD
	community/musepack-tools/PKGBUILD
	community/nginx/PKGBUILD
	community/pam_pwcheck/PKGBUILD
	community/portaudio/PKGBUILD
	community/portaudio_cpp/PKGBUILD
	community/prelink/PKGBUILD
	community/projectm/PKGBUILD
	community/prosody/PKGBUILD
	community/python-basemap/PKGBUILD
	community/qgit/PKGBUILD
	community/raptor1/PKGBUILD
	community/sensors-applet/PKGBUILD
	community/signon-keyring-extension/PKGBUILD
	community/signon-plugin-oauth2/PKGBUILD
	community/signon-ui/PKGBUILD
	community/sshguard/PKGBUILD
	community/tea/PKGBUILD
	community/tint2/PKGBUILD
	community/tremulous/PKGBUILD
	community/vobcopy/PKGBUILD
	community/windowlab/PKGBUILD
	community/xdelta/PKGBUILD
	community/xmms2/PKGBUILD
	community/xosd/PKGBUILD
	core/gdbm/PKGBUILD
	core/heirloom-mailx/PKGBUILD
	core/libffi/PKGBUILD
	core/procps-ng/PKGBUILD
	core/systemd/PKGBUILD
	core/tar/PKGBUILD
	cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
	extra/arj/PKGBUILD
	extra/audacity/PKGBUILD
	extra/cdparanoia/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gstreamer/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/indent/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/lcms/PKGBUILD
	extra/lesstif/PKGBUILD
	extra/libchewing/PKGBUILD
	extra/libdrm/PKGBUILD
	extra/libmodplug/PKGBUILD
	extra/libnotify/PKGBUILD
	extra/libsm/PKGBUILD
	extra/libxmu/PKGBUILD
	extra/libxpm/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/neon/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	extra/php-xcache/PKGBUILD
	extra/polkit/PKGBUILD
	extra/pycups/PKGBUILD
	extra/python-cairo/PKGBUILD
	extra/python/PKGBUILD
	extra/ruby/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/talloc/PKGBUILD
	extra/thunar-archive-plugin/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/totem/PKGBUILD
	extra/vinagre/PKGBUILD
	extra/vino/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wget/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-twm/PKGBUILD
	extra/xorg-xclipboard/PKGBUILD
	extra/xorg-xclock/PKGBUILD
	extra/xorg-xkill/PKGBUILD
	extra/xorg-xlsclients/PKGBUILD
	extra/xorg-xman/PKGBUILD
	extra/xorg-xrdb/PKGBUILD
	extra/xpdf/PKGBUILD
	extra/xvidcore/PKGBUILD
	extra/yelp/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD
	libre/mc-libre/PKGBUILD
	libre/python2-reportlab-libre/PKGBUILD

3 files changed, 8 insertions, 108 deletions

diff --git a/extra/sane/1.0.23-hp2400c.patch b/extra/sane/1.0.23-hp2400c.patch
deleted file mode 100644
index 8bfd29b66..000000000
--- a/extra/sane/1.0.23-hp2400c.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 9a8b640d8da2190ff1695169bfa45ce633b5e8c2 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?St=C3=A9phane=20Voltz?= <stef.dev@free.fr>
-Date: Mon, 3 Jun 2013 06:33:08 +0200
-Subject: [PATCH] bug 314293 fix
-
-- don't use non-existent end of records
----
- ChangeLog               |    3 +++
- backend/genesys_gl646.c |   14 +++++++-------
- 2 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/backend/genesys_gl646.c b/backend/genesys_gl646.c
-index c6a5af5..2d5cddc 100644
---- a/backend/genesys_gl646.c
-+++ b/backend/genesys_gl646.c
-@@ -550,7 +550,7 @@ get_lowest_resolution (int sensor, SANE_Bool color)
-   i = 0;
-   dpi = 9600;
-   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
--  while (sensor_master[i].sensor != -1 && i < nb)
-+  while (i < nb)
-     {
-       /* computes distance and keep mode if it is closer than previous */
-       if (sensor == sensor_master[i].sensor
-@@ -584,7 +584,7 @@ get_closest_resolution (int sensor, int required, SANE_Bool color)
-   dpi = 0;
-   dist = 9600;
-   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
--  while (sensor_master[i].sensor != -1 && i < nb)
-+  while (i < nb)
-     {
-       /* exit on perfect match */
-       if (sensor == sensor_master[i].sensor
-@@ -627,7 +627,7 @@ is_half_ccd (int sensor, int required, SANE_Bool color)
- 
-   i = 0;
-   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
--  while (sensor_master[i].sensor != -1 && i < nb)
-+  while (i < nb)
-     {
-       /* exit on perfect match */
-       if (sensor == sensor_master[i].sensor
-@@ -658,7 +658,7 @@ get_cksel (int sensor, int required, SANE_Bool color)
- 
-   i = 0;
-   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
--  while (sensor_master[i].sensor != -1 && i < nb)
-+  while (i < nb)
-     {
-       /* exit on perfect match */
-       if (sensor == sensor_master[i].sensor
-@@ -746,7 +746,7 @@ gl646_setup_registers (Genesys_Device * dev,
-    * sensor mode setting */
-   i = 0;
-   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
--  while (sensor_master[i].sensor != -1 && i < nb)
-+  while (i < nb)
-     {
-       if (dev->model->ccd_type == sensor_master[i].sensor
- 	  && sensor_master[i].dpi == xresolution
-@@ -768,7 +768,7 @@ gl646_setup_registers (Genesys_Device * dev,
-    * motor mode setting */
-   i = 0;
-   nb = sizeof (motor_master) / sizeof (Motor_Master);
--  while (motor_master[i].motor != -1 && i < nb)
-+  while (i < nb)
-     {
-       if (dev->model->motor_type == motor_master[i].motor
- 	  && motor_master[i].dpi == resolution
-@@ -789,7 +789,7 @@ gl646_setup_registers (Genesys_Device * dev,
-   /* now we can search for the specific sensor settings */
-   i = 0;
-   nb = sizeof (sensor_settings) / sizeof (Sensor_Settings);
--  while (sensor_settings[i].sensor != -1 && i < nb)
-+  while (i < nb)
-     {
-       if (sensor->sensor == sensor_settings[i].sensor
- 	  && sensor->cksel == sensor_settings[i].cksel)
--- 
-1.7.2.5
-
diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD
index 82f211b7b..571a56270 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 187017 2013-06-03 10:25:11Z tpowa $
+# $Id: PKGBUILD 195946 2013-10-06 06:58:15Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Simo L. <neotuli@yahoo.com>
 # Contributor: eric <eric@archlinux.org>
 
 pkgname=sane
-pkgver=1.0.23
-pkgrel=7
+pkgver=1.0.24
+pkgrel=2
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,17 +18,11 @@ source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz
         'sane.xinetd'
         'saned.socket'
         'saned.service'
-        'kodakaio.c.patch'
-        'network.patch'
-        '1.0.23-hp2400c.patch')
+        'network.patch')
 options=(!libtool)
 
 prepare() {
   cd "${srcdir}/${pkgname}-backends-${pkgver}"
-   # fix FS#35549
-   patch -Np1 -i ${srcdir}/1.0.23-hp2400c.patch
-   # fix FS#33657
-   patch -Np0 -i ${srcdir}/kodakaio.c.patch
    # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186
    patch -Np1 -i ${srcdir}/network.patch
 }
@@ -55,9 +49,9 @@ package () {
   echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf"
   # install udev files
   install -D -m0644 tools/udev/libsane.rules \
-    "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules"
+    "${pkgdir}/usr/lib/udev/rules.d/49-sane.rules"
   # fix udev rules
-  sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules"
+  sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/49-sane.rules"
   
   # install xinetd file
   install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane"
@@ -71,10 +65,8 @@ package () {
   install -D -m644 ${srcdir}/saned.service \
       "${pkgdir}/usr/lib/systemd/system/saned@.service"
 }
-md5sums=('e226a89c54173efea80e91e9a5eb6573'
+md5sums=('1ca68e536cd7c1852322822f5f6ac3a4'
          'bc2c8b4f7b3012c8936c7da21f60e2ac'
          'e57e9e15528f47f5f1b3f1411135ed5d'
          '3f9fe36b0c4ff0b01b53b1cffa5d9700'
-         'e65dbefb7c3d69955fb6eb3ace14aa12'
-         '44e77692c52db15b0f530a1d9a8e1296'
-         '0c8bfabcaa499c4a2583aa2fe53d1686')
+         '44e77692c52db15b0f530a1d9a8e1296')
diff --git a/extra/sane/kodakaio.c.patch b/extra/sane/kodakaio.c.patch
deleted file mode 100644
index 95cb1ee9a..000000000
--- a/extra/sane/kodakaio.c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- backend/kodakaio.c.bad	2013-01-31 20:42:10.627296894 +0100
-+++ backend/kodakaio.c	2013-01-31 20:42:46.040397213 +0100
-@@ -2197,7 +2197,7 @@
- 
- 	reply = cupsGetDevices(CUPS_HTTP_DEFAULT, CUPS_TIMEOUT_DEFAULT, 
- 		"dnssd", CUPS_EXCLUDE_NONE, ProcessDevice, Dummy);
--	if(reply != IPP_OK) printf("Failed cupsGetDevices\n");
-+	if(reply != IPP_OK) DBG(1, "Failed cupsGetDevices\n");
- 
- 	return 0;
- }