Hello community, here is the log from the commit of package sane-backends for openSUSE:Factory checked in at 2012-10-16 21:33:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sane-backends (Old) and /work/SRC/openSUSE:Factory/.sane-backends.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sane-backends", Maintainer is "jsm...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes 2012-08-24 13:55:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 2012-10-16 21:33:48.000000000 +0200 @@ -1,0 +2,24 @@ +Tue Oct 16 13:47:46 CEST 2012 - jsm...@suse.de + +- Upgraded to sane-backends version 1.0.22: + New backends: + kvs40xx (Panasonic KV-S40xx), kodakaio (Kodak AiO ESP and Hero). + Significant enhancements to several backends. + 30 new scanner models supported. + V4L support improvements. + Improvements for builds on multiple platforms. + Improved udev rules. + Updated software deskew algorithm. + Documentation updates. + Bugfixes. + Note: + This is one more release of the SANE 1.0 series, compare + the below entry dated "Thu Feb 28 13:56:15 CET 2008". +- sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch that + fixes usb device support in xerox_mfp is obsolete since + sane-backends-1.0.23 because it is fixed in the source. +- fix-no-return-in-nonvoid-function.patch fixes a "control reaches + end of non-void function" gcc warning which lets build fail + with "no-return-in-nonvoid-function" error in kodakaio.c. + +------------------------------------------------------------------- @@ -32 +56,2 @@ -- re-add support for USB scanners +- added explicit "BuildRequires libusb-compat-devel" to + re-add support for USB scanners @@ -37,2 +62,3 @@ -- add usb id for SCX4500W -- fix usb device handling regression in xerox_mfp (bnc#745245) +- sane-backends-1.0.21-SCX4500W.patch adds usb id for SCX4500W +- sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch fixes + usb device handling regression in xerox_mfp (bnc#745245) Old: ---- sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch sane-backends-1.0.22.tar.bz2 New: ---- fix-no-return-in-nonvoid-function.patch sane-backends-1.0.23.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sane-backends.spec ++++++ --- /var/tmp/diff_new_pack.zkajb3/_old 2012-10-16 21:33:50.000000000 +0200 +++ /var/tmp/diff_new_pack.zkajb3/_new 2012-10-16 21:33:50.000000000 +0200 @@ -37,12 +37,20 @@ Summary: SANE (Scanner Access Now Easy) Scanner Drivers License: GPL-2.0+ and SUSE-GPL-2.0+-with-sane-exception and SUSE-Public-Domain Group: Hardware/Scanner -Version: 1.0.22 +Version: 1.0.23 Release: 0 Url: http://www.sane-project.org/ -# URL for Source0: https://alioth.debian.org/frs/download.php/3258/sane-backends-1.0.21.tar.gz -# MD5 sum for upstream sane-backends-1.0.21.tar.gz (not our .bz2): be586a23633949cf2ecf0c9c6d769130 -Source0: sane-backends-%{version}.tar.bz2 +# URLs for Source0: +# https://alioth.debian.org/frs/download.php/3752/sane-backends-1.0.23.tar.gz.1 +# https://alioth.debian.org/frs/download.php/3753/sane-backends-1.0.23.tar.gz.2 +# https://alioth.debian.org/frs/download.php/3754/sane-backends-1.0.23.tar.gz.3 +# Get https://alioth.debian.org/frs/download.php/3756/sane-backends-1.0.23.tar.gz.md5 +# for the MD5 sum for sane-backends-1.0.23.tar.gz "e226a89c54173efea80e91e9a5eb6573" +# See https://alioth.debian.org/frs/download.php/3755/README.txt +# how to make sane-backends-1.0.23.tar.gz and how to verify it: +# $ cat sane-backends-1.0.23.tar.gz.[1-3] > sane-backends-1.0.23.tar.gz +# $ md5sum -c sane-backends-1.0.23.tar.gz.md5 +Source0: sane-backends-%{version}.tar.gz # Source100... is SUSE specific stuff: # Source100 is the evil-hack init-script "sane-dev" to grant scanner access permissions. # Source100 is no longer provided because sane-backends-1.0.19 has udev and HAL support. @@ -165,8 +173,12 @@ # and is therefore removed since sane-backends-1.0.21 which contains those changes. # Patch106 sane-backends-1.0.21-SCX4500W.patch adds usb id for SCX4500W: Patch106: sane-backends-1.0.21-SCX4500W.patch -# Patch107 sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch fixes usb device support in xerox_mfp (bnc#745245): -Patch107: sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch +# Patch107 sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch fixes usb device support in xerox_mfp (bnc#745245) +# is obsolete since sane-backends-1.0.23 because it is fixed in the source. +# Patch108 fix-no-return-in-nonvoid-function.patch fixes a "control reaches end of non-void function" gcc warning +# which lets build fail with "no-return-in-nonvoid-function" error in kodakaio.c - the upstream bug report is +# https://alioth.debian.org/tracker/index.php?func=detail&aid=313858&group_id=30186&atid=410366 +Patch108: fix-no-return-in-nonvoid-function.patch # Install into this non-root directory (required when norootforbuild is used): BuildRoot: %{_tmppath}/%{name}-%{version}-build # Prerequire /sbin/ldconfig which is used in the traditional bash scriptlets for post/postun: @@ -177,7 +189,7 @@ %endif # Up to SLE10 there was the package name 'sane' for 'sane-backends'. # Therefore this RPM provides 'sane' and it also obsoletes it. -# The %{version} is needed in both Provides and Obsoletes +# The {version} is needed in both Provides and Obsoletes # to avoid a RPMLINT warning that the package obsoletes itself: Provides: sane = %{version} Obsoletes: sane < %{version} @@ -256,8 +268,10 @@ %patch104 # Patch106 sane-backends-1.0.21-SCX4500W.patch adds usb id for SCX4500W: %patch106 -p1 -# Patch107 sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch fixes usb device support in xerox_mfp (bnc#745245): -%patch107 -p1 +# Patch108 fix-no-return-in-nonvoid-function.patch fixes a "control reaches end of non-void function" gcc warning +# which lets build fail with "no-return-in-nonvoid-function" error in kodakaio.c - the upstream bug report is +# https://alioth.debian.org/tracker/index.php?func=detail&aid=313858&group_id=30186&atid=410366 +%patch108 # Source100... is SUSE specific stuff: # Remove hpoj.desc completely to avoid confusion with its successor hpaio.desc # because since openSUSE 10.3 the package hp-officeJet (for hpoj.desc) is dropped. @@ -323,7 +337,7 @@ %install make install DESTDIR=%{buildroot} -# The actual driver modules are installed as libsane-<driver>.so.%{version} +# The actual driver modules are installed as libsane-<driver>.so.{version} # and two libsane-<driver>.so.1 and libsane-<driver>.so links point to them. # Additionally a libsane-<driver>.la libtool archive file is installed # which could be used to find the correct module file name to dlopen the module. @@ -348,9 +362,9 @@ # Allow all users to write into /var/lock/sane/ so that the backends work for normal users # and set the sticky bit (i.e. others are not allowed to remove lock files). # Disabled because package-specific world-writable directories are not allowed: -#chmod 1777 %{buildroot}/var/lock/sane/ +#chmod 1777 {buildroot}/var/lock/sane/ # Install the descriptions and descriptions-external files. -# These files are the sources to make %{_defaultdocdir}/sane/sane-backends/*.html +# These files are the sources to make {_defaultdocdir}/sane/sane-backends/*.html # but these source files must also exist in the installed sane package # because YaST needs them to create its scanner database: for d in descriptions descriptions-external @@ -533,7 +547,7 @@ %{_datadir}/sane/ %{_libdir}/libsane.so.* %{_libdir}/sane/ -#%dir /var/lock/sane +#dir /var/lock/sane %doc %{_defaultdocdir}/sane-backends/ %doc %{_mandir}/man1/scanimage.1.gz %doc %{_mandir}/man1/sane-find-scanner.1.gz @@ -547,6 +561,7 @@ %{_bindir}/sane-config %{_includedir}/sane/ %{_libdir}/libsane.so +%{_libdir}/pkgconfig/sane-backends.pc %doc %{_mandir}/man1/sane-config.1.gz %files autoconfig ++++++ fix-no-return-in-nonvoid-function.patch ++++++ --- backend/kodakaio.c.orig 2012-08-10 02:33:29.000000000 +0200 +++ backend/kodakaio.c 2012-10-16 15:53:59.000000000 +0200 @@ -666,8 +666,11 @@ kodakaio_net_read(struct KodakAio_Scanne DBG(32, "net read %d bytes:%x,%x,%x,%x,%x,%x,%x,%x\n",read,buf[0],buf[1],buf[2],buf[3],buf[4],buf[5],buf[6],buf[7]); return read; } - else + else { DBG(1, "Unknown problem with poll\n"); + *status = SANE_STATUS_IO_ERROR; + } + return read; } /* kodak does not pad commands like magicolor, so there's only a write_raw function */ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
