Hello community, here is the log from the commit of package iscan-free checked in at Tue Jun 27 18:01:57 CEST 2006. -------- --- iscan-free/iscan-free.changes 2006-06-12 01:20:07.000000000 +0200 +++ iscan-free/iscan-free.changes 2006-06-26 15:47:29.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Jun 26 15:39:17 CEST 2006 - jsmeix@suse.de + +- Updated to version 2.1.0-1 (results package version 2.1.0.1): + The disable-nonfree.patch is no longer needed because the + new "configure --disable-frontend" option builds it without + the /usr/bin/iscan frontend which is the only part which still + would require proprietary binary-only i386-only software. + All proprietary binary-only i386-only stuff was removed from the + sources (i.e. the libesmod library and the EAPL license files). + +------------------------------------------------------------------- Old: ---- disable-nonfree.patch iscan-free-1.18.0-1.c2.tar.bz2 New: ---- iscan-free-2.1.0-1.c2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iscan-free.spec ++++++ --- /var/tmp/diff_new_pack.ERPAUg/_old 2006-06-27 17:54:47.000000000 +0200 +++ /var/tmp/diff_new_pack.ERPAUg/_new 2006-06-27 17:54:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package iscan-free (Version 1.18.0.1) +# spec file for package iscan-free (Version 2.1.0.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,20 +17,21 @@ Group: Hardware/Scanner Autoreqprov: on Summary: Free Image Scan Version with epkowa Driver for Epson Scanners -# URL for the source from which Source0 is made: -# http://lx1.avasys.jp/iscan/v1180/iscan-1.18.0-1.c2.tar.gz # How to make Source0: +# Get the matching source from the isacan package (iscan-2.1.0-1.c2.tar.bz2) # Unpack it: -# tar -xzvf iscan-1.18.0-1.c2.tar.gz -# Remove the non-free stuff: -# rm iscan-1.18.0/non-free/*.so iscan-1.18.0/non-free/*.bin iscan-1.18.0/non-free/*.txt +# tar -xjvf iscan-2.1.0-1.c2.tar.bz2 +# Remove only the really non-free files: +# rm iscan-2.1.0/non-free/libesmod.so iscan-2.1.0/non-free/EAPL.*.txt +# The remaining file filter.hh and the Makefiles are free software. +# The proprietary binary-only i386-only libesmod library is needed only +# to make the /usr/bin/iscan frontend and the EAPL.*.txt license files +# apply only to this libesmod library. +# By using "configure --disable-frontend" it builds without the frontend +# (i.e. without the non-free libesmod library). # Pack the remaining free sources: -# tar -cjvf iscan-free-1.18.0-1.c2.tar.bz2 iscan-1.18.0/* -Source0: iscan-free-1.18.0-1.c2.tar.bz2 -# Patch0 does changes so that all proprietary binary-only i386-only stuff is ignored for build. -# This way it compiles natively even on non-i386-compatible platforms. -# For the resulting drawbacks see the README. -Patch0: disable-nonfree.patch +# tar -cjvf iscan-free-2.1.0-1.c2.tar.bz2 iscan-2.1.0/* +Source0: iscan-free-2.1.0-1.c2.tar.bz2 # A README regarding the changes of the free version: Source1: README # Patch1 adds forward declarations of friend functions: @@ -38,8 +39,8 @@ # Patch10 changes the "sane-epkowa" man page so that the no longer supported models are removed: Patch10: adapt-man-for-free.patch # Have Epson Avasys' release number at the end of the SUSE package Version: -Version: 1.18.0.1 -Release: 16 +Version: 2.1.0.1 +Release: 1 # See the post and triggerin sections what is pre-required: PreReq: coreutils, /bin/grep, /bin/sed Requires: sane @@ -48,20 +49,18 @@ # If iscan-free replaces iscan, some scanner models do no longer work (see README). # Therefore real "Conflicts" (and not "Obsoletes" which does a silent replacement): Conflicts: iscan -# Install into this non-root directory (required when norootforbuild is used): -BuildRoot: %{_tmppath}/%{name}-%{version}-build # Used to exclude libsane from the provide-list which is made by Autoreqprov: %define my_provides /tmp/my-provides # Skip testing devel dependencies required by libtool .la files by the following comment: # skip-check-libtool-deps +# Install into this non-root directory (required when norootforbuild is used): +BuildRoot: %{_tmppath}/%{name}-%{version}-build %prep # The directory in the Source0 archive is different because # the package name is different and Version has the Epson Avasys' release number at the end: -%setup -q -n iscan-1.18.0 +%setup -q -n iscan-2.1.0 # Get the README regarding the changes of the free version: cp %{SOURCE1} . -# Changes so that all proprietary binary-only i386-only stuff is ignored for build: -%patch0 -p1 # Add forward declarations of friend functions: %patch1 # Remove the no longer supported models from the man page: @@ -74,25 +73,26 @@ # contains 'requires a DFSG non-free module' and if yes it sets the package name # in the YaST database to iscan (otherwise to iscan-free) so that YaST can # test and install the right package even for the no longer supported models: +grep -q 'requires a DFSG non-free module' doc/epkowa.desc || exit 1 sed -i -e '/requires a DFSG non-free module/s/^:comment[[:space:]][[:space:]]*"/:comment "unsupported by the iscan-free package<br>/' doc/epkowa.desc -sed -i -e 's/requires a DFSG non-free module/requires a DFSG non-free module in the iscan package/' doc/epkowa.desc +sed -i -e 's/requires a DFSG non-free module/requires a DFSG non-free module in the iscan-proprietary-drivers package/' doc/epkowa.desc %build autoreconf -fi # Set our preferred architecture-specific flags for the compiler and linker: # If -D_GNU_SOURCE is not set, the prototype for strndup in /usr/include/string.h is skipped. -export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" +export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC" export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strict-aliasing" # See /usr/lib/rpm/suse_macros regarding our RPM macros (e.g. sysconfdir is /etc). # enable-jpeg and enable-png is used in Epson Avasys' iscan.spec file. -# The disable-nonfree feature is introduced by the disable-nonfree.patch: +# By using disable-frontend it builds without the frontend (i.e. without the non-free stuff): ./configure --prefix=%{_prefix} \ --sysconfdir=%{_sysconfdir} \ --mandir=%{_mandir} \ --libdir=%{_libdir} \ --enable-jpeg \ --enable-png \ - --disable-nonfree + --disable-frontend make %install @@ -106,10 +106,15 @@ grep -q '^:mfg[[:space:]][[:space:]]*"EPSON"' doc/epkowa.desc || exit 1 sed -e 's|^:mfg[[:space:]][[:space:]]*"EPSON".*|:mfg "Epson"|' doc/epkowa.desc >%{buildroot}%{_datadir}/iscan/epkowa.desc # Install the USB usermap file (list of USB manufacturer and model IDs) -# and the matching hotplug script under /usr/share/iscan because we do not actually use it -# because our resmgr grants USB access via libusb without hotplug or usermap stuff. +# and the matching hotplug script under /usr/share/iscan +# and move the installed /usr/lib/iscan/make-udev-rules away +# because we do not use any of them because our udev uses our resmgr to grant USB access +# and resmgr does it without hotplug or usermap stuff. install -m 644 utils/hotplug/iscan.usermap %{buildroot}%{_datadir}/iscan/ install -m 755 utils/hotplug/iscan-device %{buildroot}%{_datadir}/iscan/ +mv %{buildroot}%{_libdir}/iscan/make-udev-rules %{buildroot}%{_datadir}/iscan/ +# Remove the installed man page for the "iscan" frontend because it is not included in this package: +rm %{buildroot}%{_mandir}/man1/iscan.1 # Exclude libsane from the provide-list which is made by Autoreqprov: cat << EOF > %{my_provides} grep -v %{_libdir}/sane | %{__find_provides} @@ -167,35 +172,50 @@ %{_mandir}/man5/sane-epkowa.5.gz %description -This version of Image Scan contains only free software. +This version of the Image Scan for Linux software contains only free +software. + +The proprietary binary-only i386-only "libesint*" driver libraries are +available in the seperated package iscan-proprietary-drivers. + +The "esfw*.bin" firmware files are available in the seperated package +iscan-firmware. -All proprietary binary-only i386-only software was removed and the free -parts were changed so that it now compiles and runs natively even on -non-i386 platforms. - -The free Image Scan version contains only the epkowa driver for SANE. -The free version of this driver cannot work for those scanners that -require proprietary binary-only i386-only libraries, which are only -included in the original iscan package. At the moment, those scanners -are the following models: Perfection 1250 / Perfection 1250 PHOTO / -GT-7200, Perfection 1260 / Perfection 1260 PHOTO / GT-7300, Perfection -3170 PHOTO / GT-9400, Perfection 2480 PHOTO / Perfection 2580 PHOTO / -GT-F500 / GT-F550, Perfection 4180 PHOTO / GT-F600, Perfection 3490 -PHOTO / Perfection 3590 PHOTO / GT-F520 / GT-F570, Perfection 4490 -PHOTO / GT-X750. +The proprietary binary-only i386-only "libesmod" library is removed +from this package. It is required by the "/usr/bin/iscan" frontend. +This package is built without the frontend. + +This package contains only the epkowa backend for SANE which compiles +and runs natively even on non-i386 platforms. For documentation see +"man sane-epkowa". + +Drawbacks: + +The free version of the epkowa backend cannot work for those scanners +which require proprietary binary-only i386-only libraries which are +available in the seperated package iscan-proprietary-drivers. At the +moment those scanners are the following models: Perfection 1250 / +Perfection 1250 PHOTO / GT-7200U, Perfection 1260 / Perfection 1260 +PHOTO / GT-7300U, Perfection 3170 PHOTO / GT-9400 / GT-9400UF, +Perfection 2480 PHOTO / Perfection 2580 PHOTO / GT-F500 / GT-F550, +Perfection 3490 PHOTO / Perfection 3590 PHOTO / GT-F520 / GT-F570, +Perfection 4180 PHOTO / GT-F600, Perfection 4490 PHOTO / GT-X750. Those +models don't work with the free iscan version. Those models require the +original iscan package and the iscan-proprietary-drivers package which +are only available for i386-compatible platforms. Some scanners require proprietary firmware files which are available in -the package iscan-firmware. At the moment, those scanners are the -following models: Perfection 3170 PHOTO / GT-9400, Perfection 2480 -PHOTO / Perfection 2580 PHOTO / GT-F500 / GT-F550, Perfection 4180 -PHOTO / GT-F600, Perfection 3490 PHOTO / Perfection 3590 PHOTO / -GT-F520 / GT-F570, Perfection 4490 PHOTO / GT-X750. - -The front-end /usr/bin/iscan was removed because it requires a -proprietary binary-only i386-only library. This should cause no problem -because the free driver epkowa runs natively even on non-i386 platforms -so that all the usual SANE front-ends (scanimage, xscanimage, xsane, -kooka) can be used even on non-i386 platforms. +the package iscan-firmware. At the moment those scanners are the +following models: Perfection 3170 PHOTO / GT-9400 / GT-9400UF, +Perfection 2480 PHOTO / Perfection 2580 PHOTO / GT-F500 / GT-F550, +Perfection 4180 PHOTO / GT-F600, Perfection 3490 PHOTO / Perfection +3590 PHOTO / GT-F520 / GT-F570, Perfection 4490 PHOTO / GT-X750. + +The frontend /usr/bin/iscan was removed because it requires the +proprietary binary-only i386-only "libesmod" library. This should cause +no problem because the backend epkowa runs now natively even on +non-i386 platforms so that all the usual frontends (like scanimage, +xscanimage, xsane, kooka) can be used even on non-i386 platforms. @@ -211,6 +231,14 @@ %changelog -n iscan-free +* Mon Jun 26 2006 - jsmeix@suse.de +- Updated to version 2.1.0-1 (results package version 2.1.0.1): + The disable-nonfree.patch is no longer needed because the + new "configure --disable-frontend" option builds it without + the /usr/bin/iscan frontend which is the only part which still + would require proprietary binary-only i386-only software. + All proprietary binary-only i386-only stuff was removed from the + sources (i.e. the libesmod library and the EAPL license files). * Mon Jun 12 2006 - ro@suse.de - remove unused gnome-vfs and oaf from BuildRequires * Wed Feb 01 2006 - jsmeix@suse.de ++++++ README ++++++ --- iscan-free/README 2006-01-13 12:17:08.000000000 +0100 +++ iscan-free/README 2006-06-26 15:39:02.000000000 +0200 @@ -2,42 +2,49 @@ This version of the Image Scan for Linux software contains only free software. -Therefore all proprietary binary-only i386-only software was removed and -the rest was changed so that the proprietary binary-only i386-only software -is no longer needed for compilation so that it now compiles and runs natively -even on non-i386 platforms. +The proprietary binary-only i386-only "libesint*" driver libraries +are available in the seperated package iscan-proprietary-drivers. -The free Image Scan version contains only the epkowa backend for SANE. +The "esfw*.bin" firmware files are available in the seperated +package iscan-firmware. + +The proprietary binary-only i386-only "libesmod" library is removed +from this package. It is required by the "/usr/bin/iscan" frontend. +This package is built without the frontend. + +This package contains only the epkowa backend for SANE which compiles +and runs natively even on non-i386 platforms. For documentation see "man sane-epkowa". Drawbacks: The free version of the epkowa backend cannot work for those scanners which require proprietary binary-only i386-only libraries which are -only included in the original iscan package. +available in the seperated package iscan-proprietary-drivers. At the moment those scanners are the following models: -Perfection 1250 / Perfection 1250 PHOTO / GT-7200, -Perfection 1260 / Perfection 1260 PHOTO / GT-7300, -Perfection 3170 PHOTO / GT-9400, +Perfection 1250 / Perfection 1250 PHOTO / GT-7200U, +Perfection 1260 / Perfection 1260 PHOTO / GT-7300U, +Perfection 3170 PHOTO / GT-9400 / GT-9400UF, Perfection 2480 PHOTO / Perfection 2580 PHOTO / GT-F500 / GT-F550, -Perfection 4180 PHOTO / GT-F600, Perfection 3490 PHOTO / Perfection 3590 PHOTO / GT-F520 / GT-F570, +Perfection 4180 PHOTO / GT-F600, Perfection 4490 PHOTO / GT-X750. Those models don't work with the free iscan version. -Those models require the original iscan package which is only +Those models require the original iscan package and the +iscan-proprietary-drivers package which are only available for i386-compatible platforms. Some scanners require proprietary firmware files which are available in the package iscan-firmware. At the moment those scanners are the following models: -Perfection 3170 PHOTO / GT-9400, +Perfection 3170 PHOTO / GT-9400 / GT-9400UF, Perfection 2480 PHOTO / Perfection 2580 PHOTO / GT-F500 / GT-F550, Perfection 4180 PHOTO / GT-F600, Perfection 3490 PHOTO / Perfection 3590 PHOTO / GT-F520 / GT-F570, Perfection 4490 PHOTO / GT-X750. The frontend /usr/bin/iscan was removed because it requires -proprietary binary-only i386-only software. +the proprietary binary-only i386-only "libesmod" library. This should cause no problem because the backend epkowa runs now natively even on non-i386 platforms so that all the usual frontends (like scanimage, xscanimage, xsane, kooka) can be used even on ++++++ adapt-man-for-free.patch ++++++ --- /var/tmp/diff_new_pack.ERPAUg/_old 2006-06-27 17:54:47.000000000 +0200 +++ /var/tmp/diff_new_pack.ERPAUg/_new 2006-06-27 17:54:47.000000000 +0200 @@ -1,5 +1,5 @@ ---- doc/sane-epkowa.man.orig 2006-01-13 13:18:01.000000000 +0100 -+++ doc/sane-epkowa.man 2006-01-13 13:30:53.000000000 +0100 +--- doc/sane-epkowa.man.orig 2006-06-26 15:17:02.000000000 +0200 ++++ doc/sane-epkowa.man 2006-06-26 15:21:30.000000000 +0200 @@ -24,14 +24,6 @@ .br GT-6700U Perfection 640U @@ -41,4 +41,4 @@ -.br GT-X800 Perfection 4990 PHOTO .br - ES-2000 Expression 1600 + GT-X900 Perfection V700/V750 ++++++ iscan-free-1.18.0-1.c2.tar.bz2 -> iscan-free-2.1.0-1.c2.tar.bz2 ++++++ ++++ 18179 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...