Author: arekm Date: Thu Nov 4 13:53:51 2010 GMT Module: packages Tag: HEAD ---- Log message: - initial; useless for us as we have .so.8 already (while it implements .so.62)
---- Files affected: packages/libjpeg-turbo: libjpeg-turbo.spec (1.73 -> 1.74) , libjpeg-turbo10-rh639672.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/libjpeg-turbo/libjpeg-turbo.spec diff -u packages/libjpeg-turbo/libjpeg-turbo.spec:1.73 packages/libjpeg-turbo/libjpeg-turbo.spec:1.74 --- packages/libjpeg-turbo/libjpeg-turbo.spec:1.73 Sun May 23 19:44:05 2010 +++ packages/libjpeg-turbo/libjpeg-turbo.spec Thu Nov 4 14:53:45 2010 @@ -1,78 +1,44 @@ # $Revision$, $Date$ -Summary: Library for handling different JPEG files -Summary(de.UTF-8): Library zum Verarbeiten verschiedener JPEG-Dateien -Summary(es.UTF-8): Biblioteca para manipulación de diferentes archivos JPEGs -Summary(fr.UTF-8): Bibliothèque pour gérer différents fichiers JPEG -Summary(pl.UTF-8): Biblioteka do manipulacji plikami w formacie JPEG -Summary(pt_BR.UTF-8): Biblioteca para manipulação de diferentes arquivos JPEGs -Summary(ru.UTF-8): Библиотека для обработки различных JPEG-файлов -Summary(tr.UTF-8): JPEG resimlerini işleme kitaplığı -Summary(uk.UTF-8): Бібліотека для обробки різноманітних JPEG-файлів -Name: libjpeg -Version: 8b +%bcond_without tests +# +%define libjpeg_ver 6b +Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files +Name: libjpeg-turbo +Version: 1.0.1 Release: 1 -License: distributable +License: wxWidgets Group: Libraries -Source0: http://www.ijg.org/files/jpegsrc.v%{version}.tar.gz -# Source0-md5: e022acbc5b36cd2cb70785f5b575661e -Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 -# Source1-md5: d6342c015a489de275ada637a77dc2b0 -Patch0: %{name}-maxmem-sysconf.patch -URL: http://www.ijg.org/ +Source0: http://downloads.sourceforge.net/project/libjpeg-turbo/%{version}/%{name}-%{version}.tar.gz +# Source0-md5: e94b72694c9afd716458367dfe84ce1e +Patch0: %{name}10-rh639672.patch +URL: http://libjpeg-turbo.virtualgl.org/ BuildRequires: libtool +Provides: libjpeg = %{libjpeg_ver} +Obsoletes: libjpeg +BuildRequires: libtool +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: nasm BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -The libjpeg package contains a library of functions for manipulating -JPEG images. - -%description -l de.UTF-8 -Dieses Paket ist eine Library mit Funktionen zur Manipulation von -JPEG-Bildern. - -%description -l es.UTF-8 -Este paquete contiene una biblioteca de funciones que manipulan -imágenes JPEG. - -%description -l fr.UTF-8 -Bibliothèque de fonctions qui manipulent des images JPEG. - -%description -l pl.UTF-8 -Ten pakiet zawiera bibliotekę funkcji do manipulacji plikami JPEG. - -%description -l pt_BR.UTF-8 -Este pacote contém uma biblioteca de funções que manipulam imagens -JPEG. - -%description -l ru.UTF-8 -Библиотека функций для обработки JPEG-изображений и простые клиенты -для такой обработки. - -%description -l tr.UTF-8 -Bu paket, JPEG şekillerini işlemek için kitaplıklar ve basit -istemciler içerir. - -%description -l uk.UTF-8 -Бібліотека функцій для обробки JPEG-зображень та прості клієнти для -такої обробки. +libjpeg-turbo is a version of libjpeg which uses MMX, SSE, and SSE2 +SIMD instructions to accelerate baseline JPEG +compression/decompression by about 2-4x on x86 and x86-64 platforms. +It is based on libjpeg/SIMD but has numerous enhancements. %package devel -Summary: Headers for developing programs using libjpeg -Summary(de.UTF-8): Header zum Entwickeln von Programmen mit libjpeg -Summary(es.UTF-8): Archivos de inclusión para desarrollar programas usando libjpeg -Summary(pl.UTF-8): Pliki nagłówkowe libjpeg -Summary(pt_BR.UTF-8): Arquivos de inclusão para desenvolver programas usando libjpeg -Summary(ru.UTF-8): Хедеры для разработки программ, использующих libjpeg -Summary(tr.UTF-8): libjpeg için geliştirme kitaplıkları ve başlık dosyaları -Summary(uk.UTF-8): Хедери для розробки програм, що використовують libjpeg +Summary: Headers for developing programs using libjpeg-turbo Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Provides: libjpeg-devel = %{libjpeg_ver} +Obsoletes: libjpeg-devel Conflicts: libjpeg6-devel %description devel -The libjpeg-devel package includes the header files necessary for -developing programs which will manipulate JPEG files using the libjpeg -library. +The libjpeg-turbo-devel package includes the header files necessary +for developing programs which will manipulate JPEG files using the +libjpeg-turbo library. %description devel -l de.UTF-8 Dieses Paket bietet alles, was Sie brauchen, um Programme zur @@ -89,7 +55,7 @@ %description devel -l pl.UTF-8 Ten pakiet zawiera pliki potrzebne do programowania z wykorzystaniem -biblioteki libjpeg. Zawiera także dokumentację. +biblioteki libjpeg-turbo. Zawiera także dokumentację. %description devel -l pt_BR.UTF-8 Este pacote é tudo que você precisa para desenvolver programas que @@ -109,31 +75,33 @@ JPEG-зображеннями, включаючи документацію. %package static -Summary: Static library for developing programs using libjpeg -Summary(pl.UTF-8): Biblioteka statyczna libjpeg -Summary(pt_BR.UTF-8): Bibliotecas estáticas para desenvolvimento com libjpeg -Summary(ru.UTF-8): Статическая библиотека для программирования с libjpeg -Summary(uk.UTF-8): Статична бібліотека для програмування з libjpeg +Summary: Static library for developing programs using libjpeg-turbo +Summary(pl.UTF-8): Biblioteka statyczna libjpeg-turbo +Summary(pt_BR.UTF-8): Bibliotecas estáticas para desenvolvimento com libjpeg-turbo +Summary(ru.UTF-8): Статическая библиотека для программирования с libjpeg-turbo +Summary(uk.UTF-8): Статична бібліотека для програмування з libjpeg-turbo Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} -Conflicts: libjpeg6-static +Provides: libjpeg-static = %{libjpeg_ver} +Obsoletes: libjpeg-static +Conflicts: libjpeg-turbo6-static %description static -Static library for developing programs using libjpeg. +Static library for developing programs using libjpeg-turbo. %description static -l pl.UTF-8 -Statyczna biblioteka libjpeg. +Statyczna biblioteka libjpeg-turbo. %description static -l pt_BR.UTF-8 -Bibliotecas estáticas para desenvolvimento com libjpeg. +Bibliotecas estáticas para desenvolvimento com libjpeg-turbo. %description static -l ru.UTF-8 Этот пакет содержит статические библиотеки, необходимые для написания -программ, использующих libjpeg. +программ, использующих libjpeg-turbo. %description static -l uk.UTF-8 Цей пакет містить статичні бібліотеки, необхідні для написання -програм, що використовують libjpeg. +програм, що використовують libjpeg-turbo. %package progs Summary: Simple clients for manipulating JPEG images @@ -142,7 +110,9 @@ Summary(pl.UTF-8): Kilka prostych programów do manipulowania na plikach JPEG Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Conflicts: libjpeg6-progs +Provides: libjpeg-progs = %{libjpeg_ver} +Obsoletes: libjpeg-progs +Conflicts: libjpeg-turbo6-progs %description progs Simple clients for manipulating JPEG images. Libjpeg client programs @@ -166,34 +136,31 @@ tekstowe dołączone do pliku JPEG, a wrjpgcom wstawia takie komentarze. %prep -%setup -q -n jpeg-%{version} +%setup -q %patch0 -p1 %build +%{__libtoolize} +%{__aclocal} +%{__autoconf} +%{__automake} + %configure \ - --disable-silent-rules \ --enable-shared \ --enable-static %{__make} -LD_PRELOAD=$PWD/.libs/%{name}.so \ -%{__make} test +%{?with_tests:%{__make} test} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir},%{_bindir},%{_mandir}/man1} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -install jversion.h $RPM_BUILD_ROOT%{_includedir} - -# remove HAVE_STD{DEF,LIB}_H -# (not necessary but may generate warnings confusing autoconf) -sed -i -e 's#.*HAVE_STD..._H.*##g' $RPM_BUILD_ROOT%{_includedir}/jconfig.h - -bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} +rm $RPM_BUILD_ROOT%{_includedir}/turbojpeg.h +rm $RPM_BUILD_ROOT%{_libdir}/libturbojpeg.* %clean rm -rf $RPM_BUILD_ROOT @@ -205,18 +172,16 @@ %defattr(644,root,root,755) %doc README change.log %attr(755,root,root) %{_libdir}/libjpeg.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libjpeg.so.8 +%attr(755,root,root) %ghost %{_libdir}/libjpeg.so.62 %files devel %defattr(644,root,root,755) -%doc libjpeg.txt structure.txt %attr(755,root,root) %{_libdir}/libjpeg.so %{_libdir}/libjpeg.la %{_includedir}/jconfig.h %{_includedir}/jerror.h %{_includedir}/jmorecfg.h %{_includedir}/jpeglib.h -%{_includedir}/jversion.h %files static %defattr(644,root,root,755) @@ -234,9 +199,6 @@ %{_mandir}/man1/jpegtran.1* %{_mandir}/man1/rdjpgcom.1* %{_mandir}/man1/wrjpgcom.1* -%lang(fi) %{_mandir}/fi/man1/cjpeg.1* -%lang(pl) %{_mandir}/pl/man1/cjpeg.1* -%lang(pl) %{_mandir}/pl/man1/djpeg.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -244,191 +206,7 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.73 2010/05/23 17:44:05 arekm -- up to 8b - -Revision 1.72 2010/03/08 09:10:38 arekm -up to 8a - -Revision 1.71 2010/01/28 09:07:44 amateja -- updated to 8 - -Revision 1.70 2009/08/18 13:07:04 arekm -- rel 2; automatic adjusting of maxmem, from gentoo - -Revision 1.69 2009/07/10 12:27:11 arekm -- conflicts with libjpeg6 - -Revision 1.68 2009/07/10 12:14:57 arekm -- --disable-silent-rules so we know what's happening - -Revision 1.67 2009/07/10 12:08:42 arekm -- up to version 7 - -Revision 1.66 2008/06/29 14:26:59 areq -- don't cp -f %{_datadir}/libtool/config.sub . - -Revision 1.65 2008-03-18 12:09:46 hawk -- release 28 - -Revision 1.64 2008-01-27 21:38:04 qboosh -- libjpeg with ljpeg patch (lossless JPEG support) available as libljpeg - -Revision 1.63 2008-01-27 20:32:10 qboosh -- croppatch "patch" converted to diff; still evil, but not conflicting now - -Revision 1.62 2008-01-27 20:23:17 qboosh -- added arith patch and bcond (arithmetic encoding, off by default) - -Revision 1.61 2008-01-27 18:04:02 qboosh -- changed croppatch applying so it is clear what is being done -- documented why it is evil (just because one error code put _in the middle_ - in library header) - -Revision 1.60 2008-01-27 15:43:28 qboosh -- updated inaccurate descs -- more verbose files, ghost soname symlink - -Revision 1.59 2007-04-03 14:00:44 jajcus -- README file added to %doc (important: it provides copyright information) - -Revision 1.58 2007/02/13 06:46:51 glen -- tabs in preamble - -Revision 1.57 2007/02/12 00:49:02 baggins -- converted to UTF-8 - -Revision 1.56 2006/11/25 13:26:45 arekm -- rel 27 - -Revision 1.55 2006/10/23 17:37:36 qboosh -- added note about ljpeg ABI breakage -- strict internal deps - -Revision 1.54 2006/10/23 14:17:53 glen -- add libtool patch - -Revision 1.53 2005/05/18 12:49:37 wrobell -- crop is not a patch, bconding it because it is hard to verify what it - does - -Revision 1.52 2005/05/12 22:03:11 petec -- added lossless crop patch -- changes from Pawel Czapski <pawel(at)czapski.info> - -Revision 1.51 2005/04/16 23:21:37 mmazur -- rel 25 for th - -Revision 1.50 2004/09/25 11:20:53 radek -- cosmetics (spaces -> tabs) - -Revision 1.49 2004/09/01 11:49:23 snurf -- typos / formatting / etc. - -Revision 1.48 2004/01/02 17:41:43 jajcus -- Release: 24 (STBR after AMD64 fixes) - -Revision 1.47 2003/12/21 19:06:00 jajcus -- pass libdir to make in %build so libjpeg.la contains valid path - -Revision 1.46 2003/12/19 18:21:17 jajcus -- install libraries into the right libdir - -Revision 1.45 2003/08/25 22:37:50 mmazur -- rel 23 for ac - -Revision 1.44 2003/06/02 15:18:31 ankry -- added/changed non-english-man-pages URL - -Revision 1.43 2003/05/25 11:00:53 malekith -- massive attack, adding Source-md5 - -Revision 1.42 2003/05/25 05:49:55 misi3k -- massive attack s/pld.org.pl/pld-linux.org/ - -Revision 1.41 2002/11/25 14:16:54 ankry -- massive attack: no need for 755 for *.la - -Revision 1.40 2002/10/06 11:09:43 kloczek -- release 22: use new %doc. - -Revision 1.39 2002/02/25 00:45:53 kloczek -- release 20: merge translations from Conectiva and KSI. - -Revision 1.38 2002/02/23 03:26:02 kloczek -- adapterized. - -Revision 1.37 2002/02/22 23:29:12 kloczek -- removed all Group fields translations (oure rpm now can handle translating - Group field using gettext). - -Revision 1.36 2002/01/18 02:13:41 kloczek -perl -pi -e "s/[email protected]/[email protected]/" - -Revision 1.35 2001/11/22 10:01:04 qboosh -- adapterized - -Revision 1.34 2001/11/20 23:39:20 ankry -- added fi, pl man pages -- release 19 - -Revision 1.33 2001/04/28 15:05:02 qboosh -- remove HAVE_STD{DEF,LIB}_H defines from jconfig.h - (they might generate warnings confusing autoconf) -- fixed c++ patch -- release 18 - -Revision 1.32 2000/10/19 00:03:39 kloczek -- release 17, -- merged c++ patch from RH, -- use new rpm automation. - -Revision 1.31 2000/06/09 07:54:43 kloczek -- more %%{__make} macros. - -Revision 1.30 2000/06/09 07:23:24 kloczek -- added using %%{__make} macro. - -Revision 1.29 2000/06/07 03:01:13 kloczek -- spec adapterized. - -Revision 1.28 2000/04/12 11:30:51 kloczek -- release 15, -- added include patch (change "" to <> in #include to libjpeg headers files - in jpeglib.h). - -Revision 1.27 2000/04/11 09:46:04 misiek -- reversed last change - it breaks binary compatibility ;( - -Revision 1.26 2000/04/07 12:16:16 misiek -- fixed make test -- added URL -- increased D_MAX_BLOCKS_IN_MCU to 64 to allow reading jpegs in ps && pdf - files by ghostscript interpreter -- release++ - -Revision 1.25 2000/04/01 11:14:52 zagrodzki -- changed all BuildRoot definitons -- removed all applnkdir defs -- changed some prereqs/requires -- removed duplicate empty lines - -Revision 1.24 2000/03/28 16:54:40 baggins -- translated kloczkish into english - -Revision 1.23 2000/01/19 04:17:09 kloczek -- release 13, -- added installing jversion.h (this file is needed by jerror.h), -- added BuildRequire: libtool and copying /usr/share/libtool/config.sub to - jpeg source directory in %build, -- strip only shared libraries (with --strip-unneeded) in %install. - -Revision 1.22 1999/09/14 10:31:16 kloczek -- release 12, -- added arm patch (from rawhide), -- added lib*.la files to deve, -- partialy rewrited %description's. +Revision 1.74 2010/11/04 13:53:45 arekm +- initial; useless for us as we have .so.8 already (while it implements .so.62) -Revision 1.21 1999/07/12 23:06:06 kloczek -- added using CVS keywords in %changelog (for automating them). ================================================================ Index: packages/libjpeg-turbo/libjpeg-turbo10-rh639672.patch diff -u /dev/null packages/libjpeg-turbo/libjpeg-turbo10-rh639672.patch:1.1 --- /dev/null Thu Nov 4 14:53:51 2010 +++ packages/libjpeg-turbo/libjpeg-turbo10-rh639672.patch Thu Nov 4 14:53:45 2010 @@ -0,0 +1,1283 @@ +From 195345e454d3df7ff9c07c3d36881ec52e789af2 Mon Sep 17 00:00:00 2001 +From: Mukund Sivaraman <[email protected]> +Date: Sun, 3 Oct 2010 12:23:41 +0530 +Subject: [PATCH] Add support for decoding arithmetic coded content + +This is based on a patch by Guido Vollbeding <[email protected]>, which +included code to both encode and decode arithmetic coded content. + +This patch only adds the decoding portion. No new arithmetic coded +content can be produced, but existing arithmetic coded content can +be decoded. + +libjpeg-turbo with this patch has been tested with some arithmetic +coded images (digital photographs). +--- + Makefile.am | 17 +- + README.arithmetic | 215 +++++++++++++++ + jaricom.c | 149 +++++++++++ + jdarith.c | 762 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + jdmaster.c | 2 +- + jdtrans.c | 2 +- + jerror.h | 2 + + jmorecfg.h | 2 +- + jpegint.h | 2 + + 9 files changed, 1142 insertions(+), 11 deletions(-) + create mode 100644 README.arithmetic + create mode 100644 jaricom.c + create mode 100644 jdarith.c + +diff --git a/Makefile.am b/Makefile.am +index f8552ea..1eee598 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -7,14 +7,15 @@ nodist_include_HEADERS = jconfig.h + HDRS = jchuff.h jdct.h jdhuff.h jerror.h jinclude.h jmemsys.h jmorecfg.h \ + jpegint.h jpeglib.h jversion.h jsimd.h jsimddct.h + +-libjpeg_la_SOURCES = $(HDRS) jcapimin.c jcapistd.c jccoefct.c jccolor.c \ +- jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c \ +- jcomapi.c jcparam.c jcphuff.c jcprepct.c jcsample.c jctrans.c \ +- jdapimin.c jdapistd.c jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c \ +- jddctmgr.c jdhuff.c jdinput.c jdmainct.c jdmarker.c jdmaster.c \ +- jdmerge.c jdphuff.c jdpostct.c jdsample.c jdtrans.c jerror.c \ +- jfdctflt.c jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c \ +- jidctred.c jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c ++libjpeg_la_SOURCES = $(HDRS) jaricom.c jcapimin.c jcapistd.c \ ++ jccoefct.c jccolor.c jcdctmgr.c jchuff.c jcinit.c jcmainct.c \ ++ jcmarker.c jcmaster.c jcomapi.c jcparam.c jcphuff.c jcprepct.c \ ++ jcsample.c jctrans.c jdapimin.c jdapistd.c jdarith.c \ ++ jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c \ ++ jdinput.c jdmainct.c jdmarker.c jdmaster.c jdmerge.c jdphuff.c \ ++ jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c jfdctfst.c \ ++ jfdctint.c jidctflt.c jidctfst.c jidctint.c jidctred.c \ ++ jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c + + libturbojpeg_la_SOURCES = $(libjpeg_la_SOURCES) turbojpegl.c turbojpeg.h \ + turbojpeg-mapfile +diff --git a/README.arithmetic b/README.arithmetic +new file mode 100644 +index 0000000..0dd3b9a +--- /dev/null ++++ b/README.arithmetic +@@ -0,0 +1,215 @@ ++JPEG arithmetic encoding and decoding portable software implementation ++====================================================================== ++ ++Release of 28-Mar-98 by Guido Vollbeding <[email protected]> ++============================================================= ++ ++Primary URLs: ++ ++ http://sylvana.net/jpeg-ari/ ++ (directory containing the actual archive files:) ++ ++ http://sylvana.net/jpeg-ari/jpeg-ari-28mar98.tar.gz ++ ++ http://sylvana.net/jpeg-ari/jpeg-ari.zip ++ ++ ++DISCLAIMER ++========== ++ ++This package is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++ ++It is possible that certain products which can be built using this ++software modules might form inventions protected by patent rights in ++some countries (e.g. by patents about arithmetic coding algorithms ++owned by IBM and AT&T in the USA). Provision of this software by the ++author does NOT include any licenses for any patents. ++In those countries where a patent license is required for certain ++applications of this software modules, you will have to obtain such ++a license yourself. ++ ++See Annex L in the JPEG spec for further information ++and a list of relevant patents. ++ ++ ++What is it? ++=========== ++ ++This is my implementation of the arithmetic encoding and decoding ++back-end for JPEG as specified in the ++ ++ ISO/IEC International Standard 10918-1 and CCITT Recommendation ++ ITU-T T.81, "Information Technology - Digital Compression and ++ Coding of Continuous-tone Still Images, Part 1: Requirements ++ and Guidelines". ++ ++Arithmetic coding is a state-of-the-art lossless entropy data ++compression method which offers better compression performance ++than the well-established Huffman entropy coding process. ++ ++The JPEG standard specifies a particular arithmetic coding scheme ++to be used optionally as alternative to Huffman coding. ++ ++ ++Who needs it? ++============= ++ ++This package might be of interest for people who are looking for ++enhanced state-of-the-art image compression technologies. ++ ++It is intended to provide a reasonable tool for experimental, ++comparison and evaluation purposes. ++ ++See the Disclaimer above for restricted conditions of usage. ++ ++ ++How does it work? ++================= ++ ++This distribution is organized as add-on to the widespread ++Independent JPEG Group's JPEG software. ++ ++Thus, once you managed to install the IJG software distribution ++successfully, there should be no additional problems (portability ++issues etc.) to incorporate this package into the library, ++and usage is straightforward. ++ ++Transcode given JPEG files simply with a command like ++ ++ jpegtran -arithmetic [-progressive] < orig.jpg > arit.jpg ++ ++into an arithmetic coded version LOSSLESSLY! Since there are ++practically no applications in existence which can handle such <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libjpeg-turbo/libjpeg-turbo.spec?r1=1.73&r2=1.74&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
