+++ /dev/null
-commit 1e12605eac293b12809ca2933622acc54515c237
-Author: Nils Philippsen <nils@redhat.com>
-Date: Mon Dec 28 17:00:25 2009 +0100
-
- patch: lockdir
-
- Squashed commit of the following:
-
- commit 7d26ebc2c0c0c8a8e3254834a700951b49648eeb
- Author: Nils Philippsen <nils@redhat.com>
- Date: Mon Dec 28 16:58:36 2009 +0100
-
- improve install-lockpath target
-
- make robust against problems with setting group on sane lock dir
-
-diff --git a/backend/Makefile.am b/backend/Makefile.am
-index 5165423..3c22cd4 100644
---- a/backend/Makefile.am
-+++ b/backend/Makefile.am
-@@ -137,7 +137,8 @@ install-firmware-path:
- done
-
- install-lockpath:
-- $(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir)
-+ $(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir) || \
-+ $(mkinstalldirs) -m 775 $(DESTDIR)$(locksanedir)
-
- uninstall-hook:
- rm -rf $(DESTDIR)$(libdir)/sane $(DESTDIR)$(configdir) $(DESTDIR)$(locksanedir)
+++ /dev/null
-From 305535e303032814b65bf6d889a95f00f08a9071 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Wed, 5 May 2010 12:49:02 +0200
-Subject: [PATCH] patch: epson-expression800
-
-Squashed commit of the following:
-
-commit 3b501d7499357438a1fbd63fefb2f977ae3051f5
-Author: Nils Philippsen <nils@redhat.com>
-Date: Wed May 5 12:14:23 2010 +0200
-
- Improve Epson Expression 800
-
- Epson Expression 800 models announce themselves as "processor", not
- "scanner".
----
- doc/descriptions/epson.desc | 1 +
- doc/descriptions/epson2.desc | 1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/doc/descriptions/epson.desc b/doc/descriptions/epson.desc
-index a22325c..55a0136 100644
---- a/doc/descriptions/epson.desc
-+++ b/doc/descriptions/epson.desc
-@@ -174,6 +174,7 @@
- :model "Expression 800"
- :interface "SCSI"
- :status :complete
-+:scsi "EPSON" "Expression800" "processor"
-
- :model "Expression 1600"
- :interface "SCSI USB IEEE-1394"
-diff --git a/doc/descriptions/epson2.desc b/doc/descriptions/epson2.desc
-index 9a14f4f..56cabcd 100644
---- a/doc/descriptions/epson2.desc
-+++ b/doc/descriptions/epson2.desc
-@@ -241,6 +241,7 @@
- :model "Expression 800" ; command spec
- :interface "SCSI"
- :status :complete
-+:scsi "EPSON" "Expression800" "processor"
- :comment "overseas version of the GT-9600"
-
- :model "Expression 836XL" ; command spec
---
-1.6.6.1
-
+++ /dev/null
-diff -Nur sane-backends-1.0.21/po/LINGUAS sane-backends-1.0.21.mod/po/LINGUAS
---- sane-backends-1.0.21/po/LINGUAS 1969-12-31 19:00:00.000000000 -0500
-+++ sane-backends-1.0.21.mod/po/LINGUAS 2010-04-27 03:38:23.000000000 -0400
-@@ -0,0 +1,21 @@
-+# List of languages
-+# try to keep this list ordered
-+bg
-+cs
-+da
-+de
-+en_GB
-+eo
-+es
-+fi
-+fr
-+gl
-+it
-+ja
-+nb
-+nl
-+pl
-+pt
-+ru
-+sv
-+uk
-diff -Nur sane-backends-1.0.21/po/POTFILES sane-backends-1.0.21.mod/po/POTFILES
---- sane-backends-1.0.21/po/POTFILES 1969-12-31 19:00:00.000000000 -0500
-+++ sane-backends-1.0.21.mod/po/POTFILES 2010-04-27 03:38:16.000000000 -0400
-@@ -0,0 +1,100 @@
-+# List of source files containing translatable strings
-+# paths relative to po
-+../include/sane/saneopts.h
-+../backend/sane_strstatus.c
-+
-+../backend/artec_eplus48u.c
-+
-+../backend/avision.h
-+
-+../backend/canon630u.c
-+../backend/canon.c
-+../backend/canon-sane.c
-+
-+../backend/canon_dr.c
-+../backend/canon_dr.h
-+
-+../backend/cardscan.c
-+../backend/cardscan.h
-+
-+../backend/epjitsu.c
-+../backend/epjitsu.h
-+
-+../backend/epson.c
-+../backend/epson.h
-+../backend/epson2.c
-+../backend/epson2.h
-+
-+../backend/fujitsu.c
-+../backend/fujitsu.h
-+
-+../backend/genesys.c
-+
-+../backend/kodak.c
-+../backend/kodak.h
-+
-+../backend/gt68xx.c
-+../backend/gt68xx_low.h
-+
-+../backend/hp3500.c
-+../backend/hp3900_sane.c
-+../backend/hp5400_sane.c
-+../backend/hp5590.c
-+../backend/hp-option.c
-+../backend/hp-option.h
-+
-+../backend/leo.c
-+../backend/leo.h
-+
-+../backend/lexmark.c
-+
-+../backend/ma1509.c
-+
-+../backend/matsushita.c
-+../backend/matsushita.h
-+
-+../backend/microtek2.c
-+../backend/microtek2.h
-+
-+../backend/mustek.c
-+../backend/mustek_usb.c
-+../backend/mustek_usb2.c
-+
-+../backend/niash.c
-+
-+../backend/pixma.c
-+../backend/pixma_sane_options.c
-+
-+../backend/plustek.c
-+../backend/plustek_pp.c
-+
-+../backend/pnm.c
-+
-+../backend/rts8891.c
-+
-+../backend/sceptre.c
-+../backend/sceptre.h
-+
-+../backend/sm3840.c
-+
-+../backend/snapscan.c
-+../backend/snapscan-options.c
-+
-+../backend/stv680.c
-+../backend/stv680.h
-+
-+../backend/teco1.c
-+../backend/teco1.h
-+../backend/teco2.c
-+../backend/teco2.h
-+../backend/teco3.c
-+../backend/teco3.h
-+
-+../backend/test.c
-+
-+../backend/u12.c
-+
-+../backend/umax1220u.c
-+../backend/umax.c
-+../backend/umax_pp.c
-+
+++ /dev/null
-From de99bb00b0084e8a1862398270278a14e099b22b Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Wed, 5 May 2010 13:23:40 +0200
-Subject: [PATCH] patch: pkgconfig
-
-Squashed commit of the following:
-
-commit d615848c499842c5923c3274370d2536dc650916
-Author: Nils Philippsen <nils@redhat.com>
-Date: Fri Feb 26 17:51:14 2010 +0100
-
- pkgconfig file is data
- (cherry picked from commit 1f0e85c705a42c7e6ccd938eaad69f531c63f63d)
-
- Signed-off-by: Nils Philippsen <nils@redhat.com>
-
-commit 119d5af1ddd82dac034d0106a1d86b6d7564f25e
-Author: Nils Philippsen <nils@redhat.com>
-Date: Wed Jun 17 13:09:51 2009 +0200
-
- make sane-config multilib-aware on Linux
- (cherry picked from commit 52ef5f47ccc0128c78ab3ad38ac7b7918dd7ac88)
-
- Signed-off-by: Nils Philippsen <nils@redhat.com>
-
-commit 7ee1cbef01d851aca95d86145ac5dda02d9e7354
-Author: Nils Philippsen <nils@redhat.com>
-Date: Wed May 5 10:22:15 2010 +0200
-
- use pkg-config in sane-config
----
- tools/Makefile.am | 14 ++++++++++-
- tools/sane-config.in | 66 ++++++++++++++++++++++++++++++++++++++-----------
- 2 files changed, 64 insertions(+), 16 deletions(-)
-
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index f52a39a..ab4e1b7 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -7,6 +7,10 @@
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include \
- -I$(top_srcdir)/include
-
-+SUFFIXES = .pc.in .pc
-+
-+pkgconfigdir = ${libdir}/pkgconfig
-+
- bin_PROGRAMS = sane-find-scanner gamma4scanimage
- noinst_PROGRAMS = sane-desc umax_pp
-
-@@ -26,8 +30,14 @@ noinst_SCRIPTS = $(HOTPLUG)
- BUILT_SOURCES = $(HOTPLUG_DIR)
- CLEANFILES = $(bin_SCRIPTS) $(dist_noinst_SCRIPTS)
-
-+pkgconfig_DATA = sane-backends.pc
-+
-+.pc.in.pc:
-+ cd $(top_builddir) \
-+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
- EXTRA_DIST = check-po.awk libtool-get-dll-ext mustek600iin-off.c \
-- RenSaneDlls.cmd README xerox
-+ RenSaneDlls.cmd README xerox sane-backends.pc.in
-
- sane_find_scanner_SOURCES = sane-find-scanner.c check-usb-chip.c \
- ../backend/sane_strstatus.c
-@@ -72,5 +82,7 @@ hal/libsane.fdi: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${
- @./sane-desc -m hal -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
- -d 0 > $@
-
-+sane-backends.pc: $(top_builddir)/config.status
-+
- clean-local:
- rm -f $(HOTPLUG)
-diff --git a/tools/sane-config.in b/tools/sane-config.in
-index 22c02b5..a9ce6fb 100644
---- a/tools/sane-config.in
-+++ b/tools/sane-config.in
-@@ -19,7 +19,7 @@ pkglibdir="@pkglibdir@"
- includedir="@includedir@"
- mandir="@mandir@"
- infodir="@infodir@"
--libdir="@libdir@"
-+#libdir=
- localstatedir="@localstatedir@"
- sysconfdir="@sysconfdir@"
- datarootdir="@datarootdir@"
-@@ -33,6 +33,30 @@ srcdir="@srcdir@"
- top_srcdir="@top_srcdir@"
- cflags=
-
-+pkgconfig_package=sane-backends
-+use_pkgconfig=0
-+if test -x "@bindir@/pkg-config" && "@bindir@/pkg-config" --exists "$pkgconfig_package"; then
-+ use_pkgconfig=1
-+else
-+ libdir=
-+ if kernel="`uname -s 2>/dev/null`"; then
-+ case "$kernel" in
-+ Linux)
-+ if hw="`uname -i 2>/dev/null`"; then
-+ case "$hw" in
-+ *64)
-+ libdir="@exec_prefix@/lib64"
-+ ;;
-+ esac
-+ fi
-+ ;;
-+ esac
-+ fi
-+ if test "x$libdir" = "x"; then
-+ libdir="@exec_prefix@/lib"
-+ fi
-+fi
-+
- usage ()
- {
- echo "Usage: " 1>&2
-@@ -60,7 +84,7 @@ if test $# -gt 0; then
- if test $# -eq 1; then
- usage
- elif test $# -eq 2; then
-- case $2 in
-+ case $2 in
- --cflags)
- echo "Usage: $0 --cflags"
- echo " Print C compiler flags for compiling code that uses SANE."
-@@ -86,26 +110,38 @@ if test $# -gt 0; then
- ;;
- --ldflags)
-
-- if test -z "$LINKER_RPATH"; then
-- echo "-L${libdir} @LDFLAGS@"
-+ if test "x$use_pkgconfig" = "x0"; then
-+ if test -z "$LINKER_RPATH"; then
-+ echo "-L${libdir} @LDFLAGS@"
-+ else
-+ echo "-L${libdir} @LDFLAGS@ ${LINKER_RPATH}${libdir}"
-+ fi
- else
-- echo "-L${libdir} @LDFLAGS@ ${LINKER_RPATH}${libdir}"
-+ pkg-config --libs-only-L "$pkgconfig_package"
- fi
- ;;
- --libs)
-- echo "-lsane ${LIBS}"
-+ if test "x$use_pkgconfig" = "x0"; then
-+ echo "-lsane ${LIBS}"
-+ else
-+ pkg-config --libs "$pkgconfig_package"
-+ fi
- ;;
- --cflags)
-- unique_cflags=
-- if test "${includedir}" != "/usr/include"; then
-- unique_cflags="${unique_cflags} -I${includedir}"
-- fi
-- for i in $cflags; do
-- if test "${i}" != "-I${includedir}"; then
-- unique_cflags="${unique_cflags} $i"
-+ if test "x$use_pkgconfig" = "x0"; then
-+ unique_cflags=
-+ if test "${includedir}" != "/usr/include"; then
-+ unique_cflags="${unique_cflags} -I${includedir}"
- fi
-- done
-- echo ${unique_cflags}
-+ for i in $cflags; do
-+ if test "${i}" != "-I${includedir}"; then
-+ unique_cflags="${unique_cflags} $i"
-+ fi
-+ done
-+ echo ${unique_cflags}
-+ else
-+ pkg-config --cflags "$pkgconfig_package"
-+ fi
- ;;
- --prefix)
- echo ${prefix}
---
-1.6.6.1
-
+++ /dev/null
-From ba900ddc747cb89c2600c60a1391862e918541d2 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Wed, 5 May 2010 11:49:10 +0200
-Subject: [PATCH] patch: udev
-
-Squashed commit of the following:
-
-commit eecfce287372abf2b336f0d6870611445170645b
-Author: Nils Philippsen <nils@redhat.com>
-Date: Wed May 5 11:14:59 2010 +0200
-
- adapt generated udev rules for Fedora
----
- tools/sane-desc.c | 14 +++++++-------
- 1 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/tools/sane-desc.c b/tools/sane-desc.c
-index 658555e..0b24e3b 100644
---- a/tools/sane-desc.c
-+++ b/tools/sane-desc.c
-@@ -56,9 +56,9 @@
- #define COLOR_NEW "\"#F00000\""
- #define COLOR_UNKNOWN "\"#000000\""
-
--#define DEVMODE "0664"
-+#define DEVMODE "0644"
- #define DEVOWNER "root"
--#define DEVGROUP "scanner"
-+#define DEVGROUP "root"
-
- #ifndef PATH_MAX
- # define PATH_MAX 1024
-@@ -3525,8 +3525,8 @@ print_udev (void)
- }
- }
- printf ("\n");
-- printf ("ATTRS{idVendor}==\"%s\", ATTRS{idProduct}==\"%s\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
-- usbid->usb_vendor_id + 2, usbid->usb_product_id + 2, DEVMODE, DEVGROUP);
-+ printf ("ATTRS{idVendor}==\"%s\", ATTRS{idProduct}==\"%s\", ENV{libsane_matched}=\"yes\"\n",
-+ usbid->usb_vendor_id + 2, usbid->usb_product_id + 2);
- usbid = usbid->next;
- }
-
-@@ -3538,7 +3538,7 @@ print_udev (void)
- printf ("SUBSYSTEMS!=\"scsi\", GOTO=\"libsane_scsi_rules_end\"\n\n");
- printf ("LABEL=\"libsane_scsi_rules_begin\"\n");
- printf ("# Generic: SCSI device type 6 indicates a scanner\n");
-- printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP);
-+ printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", ENV{libsane_matched}=\"yes\"\n");
- printf ("# Some scanners advertise themselves as SCSI device type 3\n");
-
- while (scsiid)
-@@ -3571,8 +3571,8 @@ print_udev (void)
- }
- }
- printf ("\n");
-- printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\n",
-- scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVGROUP);
-+ printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", ENV{libsane_matched}=\"yes\"\n",
-+ scsiid->scsi_vendor_id, scsiid->scsi_product_id);
- scsiid = scsiid->next;
- }
- printf ("LABEL=\"libsane_scsi_rules_end\"\n\n");
---
-1.6.6.1
-
+++ /dev/null
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info@ipfire.org> #
-###############################################################################
-
-name = sane
-version = 1.0.21
-release = 1
-
-groups = Application/Imaging
-url = ftp://ftp2.sane-project.org/pub/sane/
-license = GPLv2+
-summary = SANE - Scanner Access Now Easy.
-
-description
- sane-backends - includes: backends (scanner drivers),
- command-line-frontend (scanimage), network scanning daemon
- (saned) and SANE-API documentation.
-end
-
-source_dl = ftp://ftp2.sane-project.org/pub/sane/sane-backends-%{version}/
-sources = %{name}-backends-%{version}.tar.gz
-
-build
- requires
- libjpeg-devel
- libtiff-devel
- libusb-devel
- end
-
- DIR_APP = %{DIR_SRC}/%{name}-backends-%{version}
-
- configure_options += \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --enable-parport-directio
-
- install_cmds
- chmod 4755 %{BUILDROOT}/usr/bin/scanimage
- install -v -m 644 %{DIR_APP}/include/sane/* %{BUILDROOT}/usr/include/sane
- rm -vf %{BUILDROOT}/usr/share/doc/sane-1.0.20/README.solaris
- end
-end
-
-packages
- package %{name}
- end
-
- package %{name}-libs
- template LIBS
- end
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
projects / people / stevee / ipfire-3.x.git / commitdiff
