diff --git a/.abf.yml b/.abf.yml index 9867bdf..11f0927 100644 --- a/.abf.yml +++ b/.abf.yml @@ -2,6 +2,6 @@ sources: "iscan_2.24.0-4-free.tar.bz2": 8228edc1cfaa75fd0cfba631746376bf1f166f53 "primaxscan-1.1.beta1.tar.bz2": 66fa1b44258916ea8d437c4a3636a78fc657b139 "sane-backend-geniusvp2_1.0.16.1.tar.gz": 4af825c231c8c048f8145af26b8fda3b66cb8be8 - "sane-backends-1.0.22.tar.gz": dc04d6e6fd18791d8002c3fdb23e89fef3327135 + "sane-backends-1.0.23.tar.gz": 62fc65736879f0bdb2fda20a31ee10d1ed335ae7 "sane-driver-0.2.tar.bz2": 5364b5fd66788908e989c58c1afa3ce4cfcf8104 "sane_hp_rts88xx-0.18.tar.bz2": 213b4f9696c2684b5fc45ce8f77b6f6fed4afaca diff --git a/23_unneeded_doc.dpatch b/23_unneeded_doc.dpatch deleted file mode 100644 index 32377d9..0000000 --- a/23_unneeded_doc.dpatch +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -e -## 04_unneeded_doc.dpatch by Julien BLACHE -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Do not generate some documentation we do not want; do not include -## DP: sane.png in the html documentation, as it is not distributed in the -## DP: source tarball. - -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch}" - -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - -@DPATCH@ -diff -urNad sane-backends-1.0.20~/Makefile.in sane-backends-1.0.20/Makefile.in ---- sane-backends-1.0.20~/Makefile.in 2009-04-30 15:41:20.000000000 +0200 -+++ sane-backends-1.0.20/Makefile.in 2009-05-04 11:09:46.284360743 +0200 -@@ -246,11 +246,7 @@ - top_srcdir = @top_srcdir@ - SUBDIRS = include lib sanei backend frontend tools doc po - DIST_SUBDIRS = include lib sanei backend frontend tools doc po japi testsuite --dist_doc_DATA = AUTHORS ChangeLog COPYING LICENSE NEWS PROBLEMS PROJECTS \ -- README README.aix README.beos README.darwin README.djpeg README.freebsd \ -- README.hp-ux README.linux README.netbsd README.openbsd README.os2 \ -- README.solaris README.unixware2 README.unixware7 README.windows \ -- README.zeta -+dist_doc_DATA = README AUTHORS NEWS PROBLEMS PROJECTS - - EXTRA_DIST = ChangeLog-1.0.0 ChangeLog-1.0.1 ChangeLog-1.0.2 \ - ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 ChangeLog-1.0.6 \ -diff -urNad sane-backends-1.0.20~/doc/Makefile.in sane-backends-1.0.20/doc/Makefile.in ---- sane-backends-1.0.20~/doc/Makefile.in 2009-04-30 15:41:18.000000000 +0200 -+++ sane-backends-1.0.20/doc/Makefile.in 2009-05-04 11:05:16.924358740 +0200 -@@ -312,7 +312,7 @@ - MAN2HTML = nroff -man |\ - man2html -compress -topm 6 -botm 6 -nodepage -title $${page} \ - -cgiurl '$$title.$$section.html'|\ -- sed 's,,

,' -+ sed 's,,,' - - beman5dir = $(mandir)/man5 - BEDOCS = canon/canon.changes canon/canon.install2700F.txt \ diff --git a/add-mp495.patch b/add-mp495.patch deleted file mode 100644 index e00106c..0000000 --- a/add-mp495.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- backend/pixma_mp150.c.orig 2011-01-15 17:01:28.000000000 -0800 -+++ backend/pixma_mp150.c 2011-04-16 16:32:52.797216260 -0700 -@@ -160,6 +160,7 @@ - /* PIXMA 2010 vintage */ - #define MX340_PID 0x1741 - #define MX350_PID 0x1742 -+#define MP495_PID 0x1747 - #define MX870_PID 0x1743 - - /* Generation 4 XML messages that encapsulates the Pixma protocol messages */ -@@ -1559,16 +1560,16 @@ - mp150_get_status - }; - --#define DEVICE(name, model, pid, dpi, w, h, cap) { \ -- name, /* name */ \ -- model, /* model */ \ -- CANON_VID, pid, /* vid pid */ \ -- 0, /* iface */ \ -- &pixma_mp150_ops, /* ops */ \ -- dpi, 2*(dpi), /* xdpi, ydpi */ \ -- w, h, /* width, height */ \ -- PIXMA_CAP_EASY_RGB|PIXMA_CAP_GRAY| \ -- PIXMA_CAP_GAMMA_TABLE|PIXMA_CAP_EVENTS|cap \ -+#define DEVICE(name, model, pid, dpi, w, h, cap) { \ -+ name, /* name as quoted string*/ \ -+ model, /* model, upper case letters */ \ -+ CANON_VID, pid, /* USB Vendor and Product number as integer */\ -+ 0, /* iface */ \ -+ &pixma_mp150_ops, /* virtual table for scanner methods */ \ -+ dpi, 2*(dpi), /* horizontal (X) dots per inch, Y always double */\ -+ w, h, /* max width, height in points (1/72 inch) */\ -+ PIXMA_CAP_EASY_RGB|PIXMA_CAP_GRAY| \ -+ PIXMA_CAP_GAMMA_TABLE|PIXMA_CAP_EVENTS|cap \ - } - - #define END_OF_DEVICE_LIST DEVICE(NULL, NULL, 0, 0, 0, 0, 0) -@@ -1649,6 +1650,8 @@ - DEVICE ("Canon PIXMA MP490", "MP490", MP490_PID, 1200, 638, 877, PIXMA_CAP_CIS), - DEVICE ("Canon PIXMA MP250", "MP250", MP250_PID, 600, 638, 877, PIXMA_CAP_CIS), - DEVICE ("Canon PIXMA MP270", "MP270", MP270_PID, 1200, 638, 877, PIXMA_CAP_CIS), -+ /* jimc added; product inception about 2010-07-xx replacing the MP480 */ -+ DEVICE ("Canon PIXMA MP495", "MP495", MP495_PID, 1200, 638, 877, PIXMA_CAP_CIS), - - /* Generation 4 CCD */ - DEVICE ("Canon MP990 series", "MP990", MP990_PID, 4800, 638, 877, PIXMA_CAP_CCD | PIXMA_CAP_TPU), diff --git a/sane-backends-1.0.22-primascan.patch b/sane-backends-1.0.22-primascan.patch index abac7a6..0607c7d 100644 --- a/sane-backends-1.0.22-primascan.patch +++ b/sane-backends-1.0.22-primascan.patch @@ -1,17 +1,6 @@ ---- configure.in.primascan 2011-04-01 10:21:21.000000000 +0200 -+++ configure.in 2011-04-01 10:21:39.000000000 +0200 -@@ -562,7 +562,7 @@ - pixma plustek plustek_pp qcam ricoh rts8891 s9036 \ - sceptre sharp sm3600 sm3840 snapscan sp15c st400 \ - stv680 tamarack teco1 teco2 teco3 test u12 umax -- umax_pp umax1220u v4l xerox_mfp p5" -+ umax_pp umax1220u v4l xerox_mfp p5 primascan" - - # If user specifies backends manually then cause configure - # to fail if its detected it can't be compiled. If we ---- backend/Makefile.am.primscan 2011-04-01 10:22:04.000000000 +0200 -+++ backend/Makefile.am 2011-04-01 10:24:11.000000000 +0200 -@@ -191,7 +191,7 @@ +--- sane-backends-1.0.23/backend/Makefile.am.primascan 2012-07-25 02:02:14.000000000 +0200 ++++ sane-backends-1.0.23/backend/Makefile.am 2012-08-28 11:08:14.753159014 +0200 +@@ -191,7 +191,7 @@ be_convenience_libs = libabaton.la libag libtamarack.la libtest.la libteco1.la \ libteco2.la libteco3.la libu12.la libumax.la \ libumax1220u.la libumax_pp.la libv4l.la \ @@ -20,7 +9,7 @@ # Each stand alone backend thats possible to be built should be listed # here. There are the libraries that are installed under $(libdir)/sane. -@@ -224,7 +224,7 @@ +@@ -225,7 +225,7 @@ be_dlopen_libs = libsane-abaton.la libsa libsane-tamarack.la libsane-test.la libsane-teco1.la \ libsane-teco2.la libsane-teco3.la libsane-u12.la libsane-umax.la \ libsane-umax1220u.la libsane-umax_pp.la libsane-v4l.la \ @@ -29,7 +18,7 @@ EXTRA_LTLIBRARIES = $(be_convenience_libs) $(be_dlopen_libs) -@@ -1064,6 +1064,14 @@ +@@ -1083,6 +1083,14 @@ libsane_xerox_mfp_la_LDFLAGS = $(DIST_SA libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS) EXTRA_DIST += xerox_mfp.conf.in @@ -41,6 +30,17 @@ +libsane_primascan_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS) +libsane_primascan_la_LIBADD = $(COMMON_LIBS) libprimascan.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo $(MATH_LIB) $(USB_LIBS) + + libdll_preload_la_SOURCES = dll.c + libdll_preload_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll -DENABLE_PRELOAD libdll_la_SOURCES = dll.c - BUILT_SOURCES = dll-preload.h - CLEANFILES += dll-preload.h +--- sane-backends-1.0.23/configure.in.primascan 2012-08-19 22:31:09.000000000 +0200 ++++ sane-backends-1.0.23/configure.in 2012-08-28 11:07:18.947949072 +0200 +@@ -590,7 +590,7 @@ ALL_BACKENDS="abaton agfafocus apple art + pixma plustek plustek_pp qcam ricoh rts8891 s9036 \ + sceptre sharp sm3600 sm3840 snapscan sp15c st400 \ + stv680 tamarack teco1 teco2 teco3 test u12 umax +- umax_pp umax1220u v4l xerox_mfp p5" ++ umax_pp umax1220u v4l xerox_mfp p5 primascan" + + # If user specifies backends manually then cause configure + # to fail if its detected it can't be compiled. If we diff --git a/sane-backends-1.0.22-v4l.patch b/sane-backends-1.0.22-v4l.patch deleted file mode 100644 index 4e240e0..0000000 --- a/sane-backends-1.0.22-v4l.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen -Date: Mon, 14 Mar 2011 13:35:05 +0100 -Subject: [PATCH] patch: v4l - -Squashed commit of the following: - -commit 23381932c76846191b42a48e505b37cd74711265 -Author: Julien BLACHE -Date: Wed Feb 16 19:37:43 2011 +0100 - - Fix v4l build with libv4l 0.8.3+ - - (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953) - - Conflicts: - - ChangeLog - - Signed-off-by: Nils Philippsen ---- - backend/v4l.c | 3 +-- - backend/v4l.h | 3 ++- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/backend/v4l.c b/backend/v4l.c -index 6510ef0..38595ed 100644 ---- a/backend/v4l.c -+++ b/backend/v4l.c -@@ -84,9 +84,8 @@ - #include "../include/sane/sanei_config.h" - #define V4L_CONFIG_FILE "v4l.conf" - --#include "v4l.h" -- - #include -+#include "v4l.h" - - static const SANE_Device **devlist = NULL; - static int num_devices; -diff --git a/backend/v4l.h b/backend/v4l.h -index 588b96e..6aee586 100644 ---- a/backend/v4l.h -+++ b/backend/v4l.h -@@ -29,6 +29,7 @@ - #ifndef v4l_h - #define v4l_h - -+#ifndef __LINUX_VIDEODEV_H - /* Kernel interface */ - /* Only the stuff we need. For more features, more defines are needed */ - -@@ -165,7 +166,7 @@ struct video_channel - - - /* end of kernel interface */ -- -+#endif /* !__LINUX_VIDEODEV_H */ - - #include <../include/sane/sane.h> - --- -1.7.4 - diff --git a/sane.spec b/sane.spec index 5fb08e4..c4408f6 100644 --- a/sane.spec +++ b/sane.spec @@ -35,15 +35,15 @@ %endif Name: sane -Version: 1.0.22 -Release: 6 +Version: 1.0.23 +Release: 1 Summary: SANE - local and remote scanner access # lib/ is LGPLv2+, backends are GPLv2+ with exceptions # Tools are GPLv2+, docs are public domain License: GPLv2+ and GPLv2+ with exceptions and Public Domain Group: Graphics URL: http://www.sane-project.org/ -Source: ftp://ftp.sane-project.org/pub/sane/sane-%version/sane-backends-%{version}%{beta}.tar.gz +Source0: ftp://ftp.sane-project.org/pub/sane/sane-%version/sane-backends-%{version}%{beta}.tar.gz Source3: http://belnet.dl.sourceforge.net/sourceforge/px-backend/primaxscan-1.1.beta1.tar.bz2 Source5: saned-xinetd Source9: http://heanet.dl.sourceforge.net/sourceforge/hp44x0backend/sane_hp_rts88xx-0.18.tar.bz2 @@ -72,7 +72,6 @@ Patch29: sane-backends-1.0.22-primascan.patch # (fc) list Brother MFC-260C, DCP130C as supported (Mdv bug # 52951) Patch30: sane-backends-1.0.20-brother2list.patch Patch31: sane-backends-1.0.22-strformat.patch -Patch32: add-mp495.patch # Debian patches # new build system breaks build when using pthreads. Patch101: 01_missing_pthreads.dpatch @@ -91,17 +90,12 @@ Patch109: 09_po_update_es_add_gl.dpatch # /etc/sane.d/dll.d/ directory. This is a facility for packages providing # external backends (like libsane-extras, hpoj and hplip). Patch113: 22_dll_backend_conf.dpatch -# do not install OS-specific READMEs. -Patch114: 23_unneeded_doc.dpatch Patch115: 24_sane-desc.c_debian_mods.dpatch -# use ubuntu udev rules -Patch118: ubuntu_udev_noperm.dpatch # Fedora patches Patch202: sane-backends-1.0.20-open-macro.patch Patch203: sane-backends-1.0.20-hal.patch Patch205: sane-backends-1.0.20-epson-expression800.patch -Patch206: sane-backends-1.0.22-v4l.patch Requires: %{libname} = %{version}-%{release} Requires: sane-backends = %{version}-%{release} @@ -286,27 +280,23 @@ access image acquisition devices available on the local host. %prep %setup -q -n sane-backends-%{version}%{beta} %patch1 -p1 -b .plusteks12 -%patch24 -p0 -b .link +#patch24 -p0 -b .link %patch28 -p1 -b .group %patch30 -p1 -b .brother2list %patch31 -p1 -b .strformat -%patch32 -p0 -b .mp495 %patch101 -p1 #patch102 -p1 -%patch103 -p1 +##patch103 -p1 %patch106 -p1 #%patch109 -p1 %patch113 -p1 -%patch114 -p1 %patch115 -p1 -%patch118 -p1 -b .ubuntu-udev # Fedora patches %patch202 -p1 -b .open-macro #%patch203 -p1 -b .hal %patch205 -p0 -b .epson-expression800 -%patch206 -p1 -b .v4l # Patches for non-x86 platforms @@ -330,7 +320,7 @@ access image acquisition devices available on the local host. # Patch for the HP ScanJet 44x0C scanners ("hp_rts88xx" backend) #%setup -q -T -D -a 9 -n sane-backends-%{version}%{beta} #cd sane_hp_rts88xx/sane_hp_rts88xx -#./patch-sane.sh $RPM_BUILD_DIR/sane-backends-%{version}%{beta} +#./patch-sane.sh %{_builddir}/sane-backends-%{version}%{beta} #cd ../.. #patch21 -p1 -b .hp_rts88xx-0.18-fix_link #echo 'hp_rts88xx' >> backend/dll.conf.in @@ -342,7 +332,7 @@ access image acquisition devices available on the local host. # "primascan" backend # (commented out in dll.conf, as it claims to support every USB scanner) -%patch29 -p0 -b .primascan +%patch29 -p1 -b .primascan cat %{SOURCE11} > backend/primascan.h cat %{SOURCE12} > backend/primascan.c ##perl -p -i -e 's:(BACKENDS=\"):$1primascan :' configure.in @@ -509,14 +499,8 @@ install -m644 tools/udev/libsane.rules %{buildroot}/%{_sysconfdir}/udev/rules.d/ perl -p -i -e 's/(\#.{500}).*$/$1 .../' %{buildroot}/%{_sysconfdir}/udev/rules.d/60-libsane.rules %find_lang sane-backends -#if %epkowa_support -#find_lang iscan -#endif sed -i '/^%dir/d' sane-backends.lang -#if %epkowa_support -#sed -i '/^%dir/d' iscan.lang -#endif %post -n saned %_post_service saned @@ -580,6 +564,7 @@ sed -i '/^%dir/d' sane-backends.lang %{_bindir}/sane-config %{_libdir}/*.so %{_libdir}/sane/*.so +%_libdir/pkgconfig/*.pc %{_includedir}/sane %if %epkowa_support %exclude %_libdir/sane/libsane-epkowa* @@ -592,403 +577,3 @@ sed -i '/^%dir/d' sane-backends.lang %attr(644,root,root) %config(noreplace) %{_sysconfdir}/xinetd.d/saned - -%changelog -* Mon Nov 28 2011 Matthew Dawkins 1.0.22-4 -+ Revision: 735064 -- removed iscan.lang -- removed find_lang for iscan -- removed .ps list of files to be moved -- fixed typoes for disable -- added back beta macro -- rebuild -- removed old ldconfig scriptlets -- removed .la files -- cleaned up spec -- utilize disable static instead of removing the files - -* Tue Aug 16 2011 Alexander Barakin 1.0.22-3 -+ Revision: 694688 -- add automake to build-reqs -- homedir patch #63844 - -* Mon Jul 04 2011 Luis Daniel Lucio Quiroz 1.0.22-2 -+ Revision: 688709 -- P32 for MP495 support - -* Fri Apr 01 2011 Funda Wang 1.0.22-1 -+ Revision: 649595 -- New version 1.0.22 - update udev patch from fedora - rediff primascan patch - add upstream patch to build with latest v4l -- drop unused patches - -* Thu Feb 10 2011 Funda Wang 1.0.21-6 -+ Revision: 637100 -- rebuild -- tighten BR - -* Sat Dec 04 2010 Funda Wang 1.0.21-5mdv2011.0 -+ Revision: 609540 -- link for sane-config - -* Sat Dec 04 2010 Funda Wang 1.0.21-4mdv2011.0 -+ Revision: 609536 -- drop those invalid unneeded lib deps in libsane.la - -* Fri Dec 03 2010 Oden Eriksson 1.0.21-3mdv2011.0 -+ Revision: 607503 -- rebuild - -* Tue May 18 2010 Frederic Crozat 1.0.21-2mdv2010.1 -+ Revision: 545112 -- Update patch30 to list DCP-195C (Mdv bug #59266) - -* Mon May 03 2010 Nicolas Lécureuil 1.0.21-1mdv2010.1 -+ Revision: 541699 -- Update Epson tarball with new upstream version -- Update to version 1.0.21 - Remove merged patches - Rediff patches - -* Wed Feb 17 2010 Funda Wang 1.0.20-10mdv2010.1 -+ Revision: 506997 -- add missing patch -- do not push all the libs into libsane - -* Tue Jan 19 2010 Frederic Crozat 1.0.20-9mdv2010.1 -+ Revision: 493580 -- Enable libv4l support (Mdv bug #54562) -- ensure package can't be built with resmgr -- improve license tag (Fedora) - -* Sun Jan 10 2010 Oden Eriksson 1.0.20-8mdv2010.1 -+ Revision: 488802 -- rebuilt against libjpeg v8 - -* Mon Oct 19 2009 Frederik Himpe 1.0.20-7mdv2010.0 -+ Revision: 458300 -- Make sure the epkowa .la and .so are not packaged a second time in the - devel package, causing a conflict with the iscan package - -* Thu Oct 15 2009 Oden Eriksson 1.0.20-6mdv2010.0 -+ Revision: 457616 -- rebuilt against new net-snmp libs - -* Tue Oct 06 2009 Frederic Crozat 1.0.20-5mdv2010.0 -+ Revision: 454836 -- Patch118 (Ubuntu): do not change group / permissions on scanners, it is already done by upstream udev ACL rules - -* Mon Oct 05 2009 Frederik Himpe 1.0.20-4mdv2010.0 -+ Revision: 454233 -- Sync patches with Fedora and Debian -- It's possible to set up back-ends by dropping a file in - /etc/sane.d/dll.d -- Remove hp_rts88xx back-end: obsoleted by rts8891 back-end included - sane 1.0.20 - -* Fri Oct 02 2009 Frederic Crozat 1.0.20-3mdv2010.0 -+ Revision: 452692 -- Update iscan to 2.21.0-6 -- remove patches 24 / 25 (no longer needed) -- Patch32 (GIT): update Epson list -- Update patch30 with Brother DCP-130C - -* Mon Sep 28 2009 Olivier Blin 1.0.20-2mdv2010.0 -+ Revision: 450587 -- fix iscan build -- do not try to make doc/sane.ps.gz (no rule for this) -- fix building when epkowa is disabled (from Arnaud Patard) -- dvi files are not installed anymore -- use makeinstall_std -- fix string format error -- fix applying Brother MFC-260C patch -- disable primax/epkowa on mips & arm, they need some binary stuff... - (from Arnaud Patard) - - + Frederic Crozat - - Patch29: list Brother MFC-260C (Mdv bug #52951) - - Release 1.0.20 - - Cleanup specfile - - Replace in-file search/replace by patches - - Update group patch - - Update genius to 1.0.16.1 - -* Thu Sep 03 2009 Frederic Crozat 1.0.19-12mdv2010.0 -+ Revision: 428654 -- Patch28: fix default group for devices - -* Thu Sep 03 2009 Oden Eriksson 1.0.19-11mdv2010.0 -+ Revision: 428169 -- really fix linkage -- fix build -- fix build (gettext, gettext-devel) for iscan-2.20.1 autopoo -- iscan-2.10.0 -- added patches from gentoo to make iscan build (P24,P25) -- rediffed P23 -- added P26 to stop iscan from messing with its non-free stuff -- rebuilt against libjpeg v7 - - + Frederic Crozat - - Remove old script changing device permission, uses udev ACL instead (ensure ACL are set correctly) : should Mdv bug #52951 - - + Funda Wang - - fix str fmt - - use configure2_5x - -* Fri Aug 29 2008 Olivier Blin 1.0.19-7mdv2009.0 -+ Revision: 277380 -- install udev helpers in /lib/udev (this is the default on x86_64 too now, as per upstream) - - + Thierry Vignaud - - rebuild early 2009.0 package (before pixel changes) - - + Pixel - - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers - -* Tue May 27 2008 Tiago Salem 1.0.19-5mdv2009.0 -+ Revision: 211724 -- add some patches to be able build using gcc 4.3 -- Fixing conflicts entry in sane-backends-iscan -- bump release -- Moving %%exclude of epkowa to the right package -- Adding Conflicts entry to sane-backends-iscan subpackage - -* Sun May 18 2008 Frederik Himpe 1.0.19-4mdv2009.0 -+ Revision: 208672 -- All sane-backends in %%_libdir/sane have SONAME libsane.so.1. Because - of this, sane-backends-iscan provides libsane.so.1, which can break - correct dependencies. To fix this, we now ignore the provides of the - sane backend so files. - -* Tue Feb 19 2008 Marcelo Ricardo Leitner 1.0.19-3mdv2008.1 -+ Revision: 173006 -- Split out iscan files to sane-backends-iscan. Closes: #26470 - -* Mon Feb 18 2008 Olivier Blin 1.0.19-2mdv2008.1 -+ Revision: 171892 -- do not let the udev/dynamic helper hang boot (#37460) - -* Mon Feb 11 2008 Marcelo Ricardo Leitner 1.0.19-1mdv2008.1 -+ Revision: 165411 -- New upstream: 1.0.19 - -* Thu Feb 07 2008 Marcelo Ricardo Leitner 1.0.18-14mdv2008.1 -+ Revision: 163708 -- Bunziped saned-xinetd. -- Bunziped primascan sources. -- Update iscan to 2.10.0. - -* Tue Jan 22 2008 Marcelo Ricardo Leitner 1.0.18-13mdv2008.1 -+ Revision: 156370 -- Fix x86_64 build. -- Uses cvs checkout frmo today, as current stable release is too old and - missing drivers from recent devices. See #36962 - - + Olivier Blin - - restore BuildRoot - - + Thierry Vignaud - - kill re-definition of %%buildroot on Pixel's request - - buildrequires X11-devel instead of XFree86-devel - -* Wed Oct 03 2007 Funda Wang 1.0.18-12mdv2008.0 -+ Revision: 94971 -- fix provides of iscan - -* Thu Sep 20 2007 Marcelo Ricardo Leitner 1.0.18-11mdv2008.0 -+ Revision: 91406 -- Added patch plustek-s12 to support plustek s12. Closes: #26491 - - -* Tue Jan 30 2007 Olivier Blin 1.0.18-10mdv2007.0 -+ Revision: 115312 -- remove bogus provides in backends-doc -- split backends doc in sane-backends-doc package - -* Sat Jan 13 2007 Götz Waschk 1.0.18-8mdv2007.1 -+ Revision: 108211 -- Import sane - -* Sat Jan 13 2007 Götz Waschk 1.0.18-8mdv2007.1 -- use find-lang - -* Tue Sep 19 2006 Till Kamppeter 1.0.18-7mdv2007.0 -- Building the sane package was only working on machines with - libsane-devel installed, added missing paths to the CXXFLAGS of - IScan to fix this. - -* Mon Sep 18 2006 Till Kamppeter 1.0.18-6mdv2007.0 -- More 64-bit fixes for IScan build. - -* Sat Sep 16 2006 Till Kamppeter 1.0.18-5mdv2007.0 -- Added "BuildRequires: gtp+-2.0-devel", needed by the configure script - of the "epkowa" driver. -- Added explicit "-fPIC" to compiler flags of IScan compilation (needed - to build on 64-bit systems). - -* Thu Jul 27 2006 Till Kamppeter 1.0.18-4mdv2007.0 -- Shorten too long comment lines in udev rules file (bug 23509). - -* Wed Jul 05 2006 Till Kamppeter 1.0.18-3mdv2007.0 -- Moved the udev script "libusbscanner" to the standard location - /lib/udev. - -* Tue Jul 04 2006 Till Kamppeter 1.0.18-2mdv2007.0 -- Added the "epkowa" backend from Epson Avasys (Source 13). -- Commented out "epson" backend in dll.conf, it is replaced by Epson's - "epkowa" backend. -- Added "Provides: iscan" so that Epson's plug-in RPMs (closed-source - modules, firmware files) can be installed without problems. - -* Tue Jul 04 2006 Till Kamppeter 1.0.18-1mdv2007.0 -- Updated to SANE 1.0.18 (New backends: "dell1600n_net" (Dell 1600n), - "hp3500" (HP ScanJet 3500 series), "pixma" (Canon Pixma series), "stv680" - (Aiptek Pencam and similar); updated backends: "avision", "canon", "dll", - "epson", "fujitsu", "genesys", "gt68xx", "microtek2", "mustek_pp", - "niash", "plustek", "snapscan", "sp15c", "test", "u12", "umax1220u"; - scanimage batch mode fixes; scanner lists contain USB vendor/product ids - and some statistics now; udev/hotplug lists are generated autmatically - from the .desc files now; updated translations; ocumentation updates; - bugfixes). -- Removed patch 20 ("hp3500" backend merged upstream). -- Use udev rules file provided by SANE, but let libusbscanner script be - run. -- We have a backend/dll.conf.in file now, and backend/dll.conf gets - generated by the Makefile. This works only when the patches do not - already create backend/dll.conf. Removed the backend/dll.conf - generated by the patches and applied the changes from the patches - in the backend/dll.conf.in file. - -* Mon Feb 27 2006 Till Kamppeter 1.0.17-4mdk -- Updated /etc/xinetd.d/saned to new /etc/services file (service name - moved from "sane" to "sane-port", bug 21128), - -* Mon Feb 27 2006 Till Kamppeter 1.0.17-3mdk -- Introduced %%mkrel. - -* Wed Jan 04 2006 Oden Eriksson 1.0.17-2mdk -- rebuilt against new net-snmp with new major (10) - -* Mon Dec 19 2005 Till Kamppeter 1.0.17-1mdk -- Updated to SANE 1.0.17 (New backends: "hp4200" (HP ScanJet 4200), - "lexmark" (Lexmark X1100 series), "mustek_usb2" (Mustek BearPaw 2448 - TA Pro); updated backends: "artec_eplus48u", "avision", "canon", "epson", - "fujitsu", "genesys", "gt68xx", "microtek2", "mustek_pp", "plustek", - "plustek_pp", "sm3600", "snapscan", "umax_pp"; hotplug/udev updates; - scanimage fixes; sane-find-scanner finds more chipsets; updated - translations; documentation updates; bugfixes). -- Removed patch 14 ("hp4200" backend is now standard part of SANE). -- Added "hp3500" backend (patch 20). -- Added "primascan" backend (sources 11 and 12). - -* Mon Nov 14 2005 Oden Eriksson 1.0.16-6mdk -- rebuilt against openssl-0.9.8a - -* Sat Sep 03 2005 Olivier Blin 1.0.16-5mdk -- fix BuildRequires: udev_import_usermap is now in udev-tools - -* Fri Sep 02 2005 Olivier Blin 1.0.16-4mdk -- Source8: handle udev events (PHYSDEVBUS=usb) and simplify - -* Sun Aug 28 2005 Olivier Blin 1.0.16-3mdk -- move hotplug usermaps to udev rules -- move libusbscanner script to /etc/udev/agents.d/usb/ - -* Sun Aug 14 2005 Till Kamppeter 1.0.16-2mdk -- Added missing lock directory: /var/lib/lock/sane - -* Sun Aug 14 2005 Till Kamppeter 1.0.16-1mdk -- Updated to SANE 1.0.16 (New backends: "genesys", "sm3840"; updated - backends: "avision", "canon", "coolscan", "epson", "gphoto2", "gt68xx", - "mustek", "mustek_pp", "niash", "plustek", "plustek_pp", "qcam", - "sm3600", "snapscan", "teco2", "umax_pp", "v4l"; more functionality/fixes - for sanei_usb and sanei_pp; added sanei_access to allow locking of SANE - devices; hotplug updates; scanimage updates; portability fixes; added - Polish translation; updated other translations; fixed format strings; - documentation updates; bugfixes). -- "geniusvp2" backend temporarily deactivated. Patch does not fit well onto - 1.0.16. - -* Fri Mar 18 2005 Till Kamppeter 1.0.15-7mdk -- Removed Patch 17 (USB timeout issues on "epson" backend) to fix bug - 14424. - -* Wed Mar 16 2005 Till Kamppeter 1.0.15-6mdk -- Commented out entry for the "geniusvp2" in /etc/sane.d/dll.conf as it - makes SANE hanging on some systems when the appropriate scanner is not - present (bug 14639). - -* Thu Feb 17 2005 Thierry Vignaud 1.0.15-5mdk -- rebuild with new libusb - -* Mon Feb 14 2005 Till Kamppeter 1.0.15-4mdk -- Added "geniusvp2" backend to support the Genius ColorPage-Vivid Pro II - scanner. -- Added "hp_rts88xx" backend to support the HP ScanJet 44x0C scanners. -- Added "sm3840" backend to support the Microtek ScanMaker 3840 scanner. -- Removed patch to introduce "niash" backend. "niash" is already included - in SANE. -- Not built in debug mode anymore. -- Some clean-up. - -* Wed Dec 29 2004 Christiaan Welvaart 1.0.15-3mdk -- rebuild with libexif 0.6.x - -* Wed Nov 24 2004 Till Kamppeter 1.0.15-2mdk -- Both saned and sane-backends claimed ownership on /etc/sane.d/saned.conf - due to the expression "*[^saned]" in the %%files section not supported - any more by RPM. Transferred the file /etc/sane.d/saned.conf to the - sane-backends package. - -* Tue Nov 09 2004 Till Kamppeter 1.0.15-1mdk -- Updated to SANE 1.0.15 final. - -* Tue Oct 19 2004 Till Kamppeter 1.0.15-0.1mdk -- Updated to SANE 1.0.15-pre1 (New backends: "niash"; updated backends: - "agfafocus", "artec_eplus48u", "avision", "canon", "canon_pp", - "coolscan", "dll", "epson", "fujitsu", "gt68xx", "hp", "hp5400", - "leo", "microtek2", "mustek", "mustek_pp", "net", "pie", "plustek", - "plustek_pp", "snapscan", "sp15c", "tamarack", "teco2", "umax", - "umax_pp", "u12", "v4l"; sane-find-scanner detects more chipsets now; - finnish translation. translations updates; saned fixes; documentation - updates; bugfixes). -- Uncompressed patches. - -* Thu Aug 19 2004 Till Kamppeter 1.0.14-3mdk -- Added patch to remove the accidentally introduced device IDs for the Epson - Perfection 1250 and 1260 from the "epson" backend. -- Added patch to fix USB timeout issues on "epson" backend. - -* Wed May 05 2004 Frederic Lepied 1.0.14-2mdk -- put back our hotplug script - -* Tue May 04 2004 Till Kamppeter 1.0.14-1mdk -- Updated to SANE 1.0.14 (New backends: "u12"; updated backends: "artec", - "artec_eplus48u", "as6e", "avision", "canon630u", "canon_pp", "epson", - "fujitsu", "gphoto2", "gt68xx", "hp", "matsushita", "mustek", "mustek_pp", - "mustek_usb", "plustek", "plustek_pp", "sm3600", "snapscan", "teco1", - "teco2", "u12", "umax", "umax_pp", "v4l"; new USB hot-plugging script; - usb-find-scanner recognizes more hardware; support for danish language; - bugfixes). -- Switched to SANE's own hotplug infrastructure (needs to be merged with - dynamic stuff of Mandrakelinux). -- This SANE package needs kernel 2.6.6-rc2, on older 2.6.x kernels it hangs - on the "epson" (one can also comment it out in /etc/sane.d/dll.conf). - -* Tue Mar 30 2004 Frederic Lepied 1.0.13-8mdk -- don't call dynamic stuff multiple times - -* Thu Mar 25 2004 Frederic Lepied 1.0.13-7mdk -- call dynamic stuff in usb script - -* Mon Mar 01 2004 Marcel Pol 1.0.13-6mdk -- include hotplug files again, needed after all - -* Thu Feb 26 2004 Marcel Pol 1.0.13-5mdk -- revert last change, pam deals with it - -* Thu Feb 12 2004 Marcel Pol 1.0.13-4mdk -- add usb.usermap and hotplug script for libusb user support - diff --git a/ubuntu_udev_noperm.dpatch b/ubuntu_udev_noperm.dpatch deleted file mode 100644 index 878ffae..0000000 --- a/ubuntu_udev_noperm.dpatch +++ /dev/null @@ -1,98 +0,0 @@ -Index: sane-backends-1.0.22/tools/sane-desc.c -=================================================================== ---- sane-backends-1.0.22.orig/tools/sane-desc.c 2011-02-14 19:18:11.461016000 +0100 -+++ sane-backends-1.0.22/tools/sane-desc.c 2011-02-16 20:41:20.641016001 +0100 -@@ -80,6 +80,7 @@ - output_mode_usermap, - output_mode_db, - output_mode_udev, -+ output_mode_udevacl, - output_mode_plist, - output_mode_hal, - output_mode_halnew -@@ -316,7 +317,7 @@ - "(multiple directories can be concatenated by \":\")\n"); - printf (" -m|--mode mode " - "Output mode (ascii, html-backends-split, html-mfgs,\n" -- " xml, statistics, usermap, db, udev, plist, hal, hal-new)\n"); -+ " xml, statistics, usermap, db, udev, udev+acl, plist, hal, hal-new)\n"); - printf (" -t|--title \"title\" The title used for HTML pages\n"); - printf (" -i|--intro \"intro\" A short description of the " - "contents of the page\n"); -@@ -413,6 +414,11 @@ - DBG_INFO ("Output mode: %s\n", optarg); - mode = output_mode_udev; - } -+ else if (strcmp (optarg, "udev+acl") == 0) -+ { -+ DBG_INFO ("Output mode: %s\n", optarg); -+ mode = output_mode_udevacl; -+ } - else if (strcmp (optarg, "plist") == 0) - { - DBG_INFO ("Output mode: %s\n", optarg); -@@ -3525,8 +3531,14 @@ - } - } - 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); -+ -+ if (mode == output_mode_udevacl) -+ printf ("ATTRS{idVendor}==\"%s\", ATTRS{idProduct}==\"%s\", ENV{libsane_matched}=\"yes\"\n", -+ usbid->usb_vendor_id + 2, usbid->usb_product_id + 2); -+ else -+ 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); -+ - usbid = usbid->next; - } - -@@ -3538,7 +3550,13 @@ - 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\", ENV{libsane_matched}=\"yes\"\n", DEVMODE, DEVGROUP); -+ -+ if (mode == output_mode_udevacl) -+ printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", ENV{libsane_matched}=\"yes\"\n"); -+ else -+ printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n", DEVMODE, DEVGROUP); -+ -+ - printf ("# Some scanners advertise themselves as SCSI device type 3\n"); - - while (scsiid) -@@ -3571,13 +3589,21 @@ - } - } - printf ("\n"); -- printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n", -+ -+ if (mode == output_mode_udevacl) -+ 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); -+ else -+ printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n", - scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVGROUP); - scsiid = scsiid->next; - } -- printf ("LABEL=\"libsane_scsi_rules_end\"\n\n"); -+ printf ("LABEL=\"libsane_scsi_rules_end\"\n"); -+ -+ if (mode == output_mode_udevacl) -+ printf("\nENV{libsane_matched}==\"yes\", RUN+=\"/bin/setfacl -m g:%s:rw $env{DEVNAME}\"\n", DEVGROUP); - -- printf ("LABEL=\"libsane_rules_end\"\n"); -+ printf ("\nLABEL=\"libsane_rules_end\"\n"); - } - - static void -@@ -3769,6 +3795,7 @@ - print_db (); - break; - case output_mode_udev: -+ case output_mode_udevacl: - print_udev (); - break; - case output_mode_plist: