Hello community, here is the log from the commit of package sane-backends for openSUSE:Factory checked in at 2013-01-08 21:12:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sane-backends (Old) and /work/SRC/openSUSE:Factory/.sane-backends.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sane-backends", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes 2012-12-10 14:27:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 2013-01-08 21:12:52.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Dec 11 14:42:20 CET 2012 - [email protected] + +- Our own special source file epkowa.desc is dropped because + the package iscan-free is dropped (bnc#788756). Instead + adapt_epkowa.desc_for_yast2-scanner.patch adapts the upstream + epkowa.desc for yast2-scanner which works without additional + adaptions in yast2-scanner so that the sane-backends package + works on released openSUSE systems without a RPM requirement + for a yast2-scanner update (bnc#788756 starting at comment#14). + +------------------------------------------------------------------- Old: ---- epkowa.desc New: ---- adapt_epkowa.desc_for_yast2-scanner.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sane-backends.spec ++++++ --- /var/tmp/diff_new_pack.G26Rel/_old 2013-01-08 21:12:53.000000000 +0100 +++ /var/tmp/diff_new_pack.G26Rel/_new 2013-01-08 21:12:53.000000000 +0100 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: sane-backends BuildRequires: libgphoto2-devel %if 0%{?suse_version} > 1130 @@ -63,12 +62,8 @@ # Source104 was our hpaio.desc file which was derived from scan/sane/hpaio.desc from the hplip sources # but as scan/sane/hpaio.desc was completely messed up Source104 is now dropped and we # create our hpaio.desc file directly from the models.dat file of HPLIP via Source109 and Source110. -# Source105 is the original iscan descriptions-external file for the epkowa backend. -# This file is based on a copy of doc/epkowa.desc in the sources of our iscan-free package. -# Meanwhile there is a newer epkowa.desc in the sources of this sane-backends package. -# Only the missing models from the newer epkowa.desc which require proprietary software -# were added so that users of those models are informed via yast2-scanner. -Source105: epkowa.desc +# Since openSUSE 12.2 "Source105 epkowa.desc" is dropped because the package iscan-free is dropped. +# Instead adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner. # Since openSUSE 10.3 "Source106: create_hal_global_fdi_for_scanners" is dropped because # it is replaced by "Source108: create_hal_global_fdi_from_libsane.rules". # Source107 are readymade udev rules for openSUSE 10.3 derived from sane-backends 1.0.18-cvs. @@ -180,6 +175,17 @@ # 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 +# Patch109 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner +# (see https://bugzilla.novell.com/show_bug.cgi?id=788756#c14). +# It adds "requires DFSG non-free Image Scan software from Avasys" to all comments +# (or adds such a comment if there is not yet a comment) so that yast2-scanner +# (via "requires DFSG non-free" string match in create_scanner_database) +# shows always the info regarding "Image Scan" download from Avasys +# (compare https://bugzilla.novell.com/show_bug.cgi?id=569917 +# and https://bugzilla.novell.com/show_bug.cgi?id=746038). +# Furthermore it removes "unsupported" models from epkowa.desc because +# otherwise there would be confusing model entries shown in yast2-scanner: +Patch109: adapt_epkowa.desc_for_yast2-scanner.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: @@ -273,15 +279,13 @@ # 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 +# Patch109 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner +# see https://bugzilla.novell.com/show_bug.cgi?id=788756#c14 +%patch109 # 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. rm doc/descriptions-external/hpoj.desc -# Replace epkowa.desc descriptions-external file by the version from the iscan package. -# For compliance with the other description files in the sane-backends sources -# (epson2.desc, epson.desc, plustek.desc, snapscan.desc, umax.desc, unsupported.desc) -# the manufacturer name is changed from "EPSON" to "Epson": -sed -e '/^:mfg/s/EPSON/Epson/' %{SOURCE105} >doc/descriptions-external/epkowa.desc # For compliance with the other description files in the sane-backends sources # change the manufacturer name from "Hewlett Packard" to "Hewlett-Packard": for d in doc/descriptions-external/hp3770.desc doc/descriptions-external/hp8200.desc ++++++ adapt_epkowa.desc_for_yast2-scanner.patch ++++++ ++++ 3160 lines (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
