Mailinglist Archive: opensuse-commit (710 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory
checked in at Fri May 7 15:47:31 CEST 2010.



--------
--- sane-backends/sane-backends.changes 2010-04-28 14:30:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/sane-backends/sane-backends.changes    
2010-05-07 13:31:53.000000000 +0200
@@ -1,0 +2,37 @@
+Fri May  7 11:43:41 CEST 2010 - jsmeix@xxxxxxx
+
+- Upgraded to sane-backends version 1.0.21:
+  New backends:
+  kodak (Kodak i18xx), kvs1025 (Panasonic KV-S10xx),
+  p5 (Primax PagePartner)
+  Many backends updated.
+  224 more scanner models supported.
+  More consistent option naming.
+  Scanimage no longer writes image to tty.
+  Modern translation infrastructure.
+  Improved saned network daemon.
+  Internal SCSI, USB, threading, TCP & UDP code updates.
+  Updated HAL and udev support.
+  New sanei_magic image processing library.
+  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".    
+- fix-hp3900_config.c.patch, sane-desc_closedir.patch,
+  fix-lexmark_low-memory-leak.patch, and
+  fix-hp3900_sane-string-option-sizes.diff are obsolete since
+  sane-backends-1.0.21 because it is fixed in the source.
+- sane-backends-1.0.20-xerox_mfp.diff backported post 1.0.20
+  xerox_mfp changes and is therefore removed since
+  sane-backends-1.0.21 which contains those changes, compare
+  the below entry dated "Thu Oct  8 09:35:17 UTC 2009".
+- Slightly adapted disable-resmgr-support.patch and
+  no-descriptions-external-hpoj.patch to apply to the
+  sane-backends-1.0.21 sources.
+- fix-genesys-create_range-type.patch lets in genesys.c
+  the create_range function be of type 'SANE_Range *'
+  to fix 'assignment makes pointer from integer' bugs
+  wherever the create_range function is called.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  fix-hp3900_config.c.patch
  fix-hp3900_sane-string-option-sizes.diff
  fix-lexmark_low-memory-leak.patch
  sane-backends-1.0.20.tar.bz2
  sane-backends-1.0.20-xerox_mfp.diff
  sane-desc_closedir.patch

New:
----
  fix-genesys-create_range-type.patch
  sane-backends-1.0.21-i18n.patch
  sane-backends-1.0.21.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ sane-backends.spec ++++++
--- /var/tmp/diff_new_pack.2sZ2I7/_old  2010-05-07 15:43:17.000000000 +0200
+++ /var/tmp/diff_new_pack.2sZ2I7/_new  2010-05-07 15:43:17.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package sane-backends (Version 1.0.20)
+# spec file for package sane-backends (Version 1.0.21)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -24,12 +24,12 @@
 Group:          Hardware/Scanner
 AutoReqProv:    on
 Summary:        SANE (Scanner Access Now Easy) Scanner Drivers
-Version:        1.0.20
-Release:        11
+Version:        1.0.21
+Release:        1
 Url:            http://www.sane-project.org/
-# URL for Source0: 
http://alioth.debian.org/frs/download.php/2318/sane-backends-1.0.19.tar.gz
+# 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
-Source1:        baselibs.conf
 # 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.
@@ -53,6 +53,9 @@
 # We create our hpaio.desc file directly from the models.dat file of HPLIP:
 Source109:      create_hpaio.desc_from_models.dat
 Source110:      models.dat
+# Was initially just dumped in as Source1 to "package baselibs.conf"
+# (see the matching explanatory entry in the RPM changelog):
+Source190:      baselibs.conf
 # Source200... is scanner autoconfiguration stuff:
 # Source200 and Source201 generate the 56-sane-backends-autoconfig.rules file
 # for automated scanner driver activation via udev ("scanner 
autoconfiguration").
@@ -82,24 +85,41 @@
 # Patch8 re-adds SANE_CAP_ALWAYS_SETTABLE to sane.h which was erroneously
 # removed in sane-backends-1.0.20 so that sane-frontends and xsane can no 
longer build,
 # see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527675
+# SANE_CAP_ALWAYS_SETTABLE is still missing in sane-backends-1.0.21
 Patch8:         re-add-SANE_CAP_ALWAYS_SETTABLE.patch
-# Patch9 fixes a possible for loop overflow in hp3900_config.c
+# Patch9 fix-hp3900_config.c.patch fixes a possible for loop overflow in 
hp3900_config.c
 # see https://bugzilla.novell.com/show_bug.cgi?id=517281
-Patch9:         fix-hp3900_config.c.patch
+# and 
https://alioth.debian.org/tracker/index.php?func=detail&aid=311856&group_id=30186&atid=410366
+# which is obsolete since sane-backends-1.0.21 because it is fixed in the 
source.
 # Patch10 fixes undefined 'foo = ++foo modulo bar' operations in 
mustek_pp_ccd300.c
 # see https://bugzilla.novell.com/show_bug.cgi?id=498435
+# and 
https://alioth.debian.org/tracker/index.php?func=detail&aid=311857&group_id=30186&atid=410366
+# where the upstream maintainer did not understand what is wrong and closed it 
as "Wont Fix"
+# so that we have to keep this patch:
 Patch10:        fix-mustek_pp_ccd300.c.patch
-# Patch11 adds missing call to closedir to sane-desc.c
+# Patch11 sane-desc_closedir.patch adds missing call to closedir to sane-desc.c
 # see https://bugzilla.novell.com/show_bug.cgi?id=530313
-Patch11:        sane-desc_closedir.patch
-# Patch12 adds a missing call to free in backend/lexmark_low.c
+# and 
https://alioth.debian.org/tracker/index.php?func=detail&aid=311880&group_id=30186&atid=410366
+# which is obsolete since sane-backends-1.0.21 because it is fixed in the 
source.
+# Patch12 fix-lexmark_low-memory-leak.patch adds a missing call to free in 
backend/lexmark_low.c
 # in the sanei_lexmark_low_find_start_line function
 # see https://bugzilla.novell.com/show_bug.cgi?id=542341
-Patch12:        fix-lexmark_low-memory-leak.patch
-# Patch13 fixes option sizes in backend/hp3900_sane.c
+# and 
https://alioth.debian.org/tracker/index.php?func=detail&aid=311990&group_id=30186&atid=410366
+# which is obsolete since sane-backends-1.0.21 because it is fixed in the 
source.
+# Patch13 fix-hp3900_sane-string-option-sizes.diff fixes option sizes in 
backend/hp3900_sane.c
 # because otherwise the frontend (e.g. xsane) may crash
 # see https://bugzilla.novell.com/show_bug.cgi?id=535752
-Patch13:        fix-hp3900_sane-string-option-sizes.diff
+# and 
https://alioth.debian.org/tracker/index.php?func=detail&aid=311991&group_id=30186&atid=410366
+# which is obsolete since sane-backends-1.0.21 because it is fixed in the 
source.
+# Patch14 is an upstream patch which adds two files required to build 
translations
+# which are missing in the upstream sane-backends-1.0.21 source tar ball.
+# URL for Patch14: 
https://alioth.debian.org/frs/download.php/3261/sane-backends-1.0.21-i18n.patch
+Patch14:        sane-backends-1.0.21-i18n.patch
+# Patch15 fix-genesys-create_range-type.patch lets in genesys.c the 
create_range function
+# be of type 'SANE_Range *' to fix 'assignment makes pointer from integer' bugs
+# wherever the create_range function is called
+# see 
https://alioth.debian.org/tracker/index.php?func=detail&aid=312492&group_id=30186&atid=410366
+Patch15:        fix-genesys-create_range-type.patch
 # Patch100... is SUSE specific stuff:
 # Patch100 lets the "canon" backend do scanner auto-recognition:
 Patch100:       canon-backend-autoprobing.patch
@@ -123,8 +143,8 @@
 # Patch104 removes descriptions-external/hpoj.desc from doc/Makefile.am
 # because it is intentionally removed from the sources in the prep section:
 Patch104:       no-descriptions-external-hpoj.patch
-# backport post 1.0.20 xerox_mfp changes. remove with next sane version
-Patch105:       sane-backends-1.0.20-xerox_mfp.diff
+# Patch105 sane-backends-1.0.20-xerox_mfp.diff backports post 1.0.20 xerox_mfp 
changes
+# and is therefore removed since sane-backends-1.0.21 which contains those 
changes.
 # Install into this non-root directory (required when norootforbuild is used):
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # The postinstall script requires this:
@@ -303,20 +323,19 @@
 
 %prep
 %setup -q
+# Apply upstream patches first of all:
+# Patch14 is an upstream patch for sane-backends-1.0.21
+# which adds two files required to build translations:
+%patch14 -p1
+# Then apply non-upstream patches:
 # Patch2 fixes too small arrays in backend/niash.c:
 %patch2
 # Patch8 re-adds SANE_CAP_ALWAYS_SETTABLE to sane.h which was erroneously 
removed:
 %patch8
-# Patch9 fixes a possible for loop overflow in hp3900_config.c:
-%patch9
 # Patch10 fixes undefined 'foo = ++foo modulo bar' operations in 
mustek_pp_ccd300.c:
 %patch10
-# Patch11 adds missing call to closedir to sane-desc.c:
-%patch11
-# Patch12 adds a missing call to free in backend/lexmark_low.c:
-%patch12
-# Patch13 fixes option sizes in backend/hp3900_sane.c
-%patch13 -p1
+# Patch15 lets in genesys.c the create_range function be of type 'SANE_Range 
*':
+%patch15
 # Patch100... is SUSE specific stuff:
 # Patch100 lets the "canon" backend do scanner auto-recognition:
 %patch100
@@ -327,7 +346,6 @@
 # Patch104 removes descriptions-external/hpoj.desc from doc/Makefile.am
 # because it is intentionally removed from the sources in the prep section:
 %patch104
-%patch105 -p1
 # 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.

++++++ disable-resmgr-support.patch ++++++
--- /var/tmp/diff_new_pack.2sZ2I7/_old  2010-05-07 15:43:17.000000000 +0200
+++ /var/tmp/diff_new_pack.2sZ2I7/_new  2010-05-07 15:43:17.000000000 +0200
@@ -1,8 +1,6 @@
-Index: configure.in
-===================================================================
---- configure.in.orig
-+++ configure.in
-@@ -155,15 +155,21 @@ AC_CHECK_HEADERS([asm/io.h],,,[#include
+--- configure.in.orig  2010-04-26 02:55:27.000000000 +0200
++++ configure.in       2010-05-07 12:14:59.000000000 +0200
+@@ -155,16 +155,22 @@ AC_CHECK_HEADERS([asm/io.h],,,[#include
  
  SANE_CHECK_MISSING_HEADERS
  
@@ -11,25 +9,27 @@
 -              resmgr,
 -              rsm_open_device,[
 -                      AC_DEFINE(HAVE_RESMGR,1,[define if you have the resmgr 
library])
--                      LIBS="$LIBS -lresmgr"
+-                      RESMGR_LIBS="-lresmgr"
 -              ]
 -      )
 -])
+-AC_SUBST(RESMGR_LIBS)
 +# Since Suse Linux 10.0 resmgr installs ACLs on device nodes.
 +# Therefore there is no need to patch applications with special resmgr
 +# support anymore.
 +# As the "rsm_open_device" calls in sanei_scsi.c and sanei_usb.c
 +# are optionally via "ifdef HAVE_RESMGR" with fallback "open" calls,
 +# the special resmgr support is not removed but only disabled here:
-+#AC_CHECK_HEADER(resmgr.h,[
-+#     AC_CHECK_LIB(
-+#             resmgr,
-+#             rsm_open_device,[
-+#                     AC_DEFINE(HAVE_RESMGR,1,[define if you have the resmgr 
library])
-+#                     LIBS="$LIBS -lresmgr"
-+#             ]
-+#     )
-+#])
- 
++# AC_CHECK_HEADER(resmgr.h,[
++#     AC_CHECK_LIB(
++#             resmgr,
++#             rsm_open_device,[
++#                     AC_DEFINE(HAVE_RESMGR,1,[define if you have the resmgr 
library])
++#                     RESMGR_LIBS="-lresmgr"
++#             ]
++#     )
++# ])
++# AC_SUBST(RESMGR_LIBS)
  
  dnl ***********************************************************************
+ dnl Checks for types and structures

++++++ fix-genesys-create_range-type.patch ++++++
--- backend/genesys.c.orig      2010-04-05 15:18:04.000000000 +0200
+++ backend/genesys.c   2010-05-07 13:06:07.000000000 +0200
@@ -5436,7 +5436,7 @@ init_gamma_vector_option (Genesys_Scanne
  * @param size maximum size of the range
  * @return a poiter to a valid range or NULL
  */
-static create_range(SANE_Fixed size)
+static SANE_Range *create_range(SANE_Fixed size)
 {
 SANE_Range *range=NULL;
 
++++++ no-descriptions-external-hpoj.patch ++++++
--- /var/tmp/diff_new_pack.2sZ2I7/_old  2010-05-07 15:43:17.000000000 +0200
+++ /var/tmp/diff_new_pack.2sZ2I7/_new  2010-05-07 15:43:17.000000000 +0200
@@ -1,10 +1,10 @@
---- doc/Makefile.am.orig       2009-03-24 14:36:37.000000000 +0100
-+++ doc/Makefile.am    2009-06-10 14:47:53.000000000 +0200
-@@ -201,7 +201,6 @@ DESC_EXT_FILES = descriptions-external/b
+--- doc/Makefile.am.orig       2010-04-05 15:18:05.000000000 +0200
++++ doc/Makefile.am    2010-05-07 12:38:51.000000000 +0200
+@@ -202,7 +202,6 @@ DESC_EXT_FILES = descriptions-external/b
    descriptions-external/hp3770.desc \
    descriptions-external/hp8200.desc \
    descriptions-external/hpaio.desc \
 -  descriptions-external/hpoj.desc \
+   descriptions-external/kodak-twain.desc \
    descriptions-external/lhii.desc \
    descriptions-external/mustek_a3p1.desc \
-   descriptions-external/primascan.desc \

++++++ sane-backends-1.0.21-i18n.patch ++++++
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
+
++++++ sane-backends-1.0.20.tar.bz2 -> sane-backends-1.0.21.tar.bz2 ++++++
++++ 256870 lines of diff (skipped)


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx