[SCM] Git repository for pkg-virtuoso branch, master, updated. upstream/6.0.1.cvs20091210+dfsg2-185-g753b3d8

[Obey Arthur Liu]

The following commit has been merged in the master branch:
commit dd7073c6c136e9c3c0b83384752180179e9ca04a
Author: Obey Arthur Liu <arthur at milliways.fr>
Date:   Sun Apr 4 13:17:51 2010 +0200

    Update zlib patch with new upstream version.

diff --git a/debian/patches/repack-zlib.patch b/debian/patches/repack-zlib.patch
index 38d0536..5678d2d 100644
--- a/debian/patches/repack-zlib.patch
+++ b/debian/patches/repack-zlib.patch
@@ -17,28 +17,224 @@ Last-Update: 2010-02-17
  
    s->stream.next_out = s->outbuf = (Byte *) dk_alloc (Z_BUFSIZE);
    if (err != Z_OK || s->outbuf == Z_NULL)
---- /dev/null
+--- a/libsrc/zlib/Makefile.am
 +++ b/libsrc/zlib/Makefile.am
-@@ -0,0 +1,22 @@
-+#  
-+#  This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
-+#  project.
-+#  
-+#  Copyright (C) 1998-2006 OpenLink Software
-+#  
-+#  This project is free software; you can redistribute it and/or modify it
-+#  under the terms of the GNU General Public License as published by the
-+#  Free Software Foundation; only version 2 of the License, dated June 1991.
-+#  
-+#  This program 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. See the GNU
-+#  General Public License for more details.
-+#  
-+#  You should have received a copy of the GNU General Public License along
-+#  with this program; if not, write to the Free Software Foundation, Inc.,
-+#  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+#  
-+#  
-+
-+# Debian maintainer: Blanked out
+@@ -19,217 +19,4 @@
+ #  
+ #  
+ 
+-
+-if WITH_ZLIB
+-noinst_LTLIBRARIES = libz.la
+-endif
+-
+-noinst_HEADERS = \
+-	crc32.h \
+-	deflate.h \
+-	inffast.h \
+-	inffixed.h \
+-	inflate.h \
+-	inftrees.h \
+-	trees.h \
+-	zconf.h \
+-	zconf.in.h \
+-	zlib.h \
+-	zutil.h
+-
+-libz_la_SOURCES = \
+-	adler32.c \
+-	compress.c \
+-	crc32.c \
+-	deflate.c \
+-	gzio.c \
+-	infback.c \
+-	inffast.c \
+-	inflate.c \
+-	inftrees.c \
+-	trees.c \
+-	uncompr.c \
+-	zutil.c
+-
+-libz_la_CFLAGS  = @VIRT_AM_CFLAGS@
+-libz_la_CFLAGS  += -I$(top_srcdir)/libsrc
+-libz_la_CFLAGS  += -I$(top_srcdir)/libsrc/Dk
+-libz_la_LDFLAGS = -prefer-pic
+-
+-
+-# ----------------------------------------------------------------------
+-#
+-#  Additional files to distribute
+-#
+-# ----------------------------------------------------------------------
+-EXTRA_DIST = \
+-	ChangeLog \
+-	FAQ \
+-	INDEX \
+-	README \
+-	*.txt \
+-	amiga/Makefile.pup \
+-	amiga/Makefile.sas \
+-	as400/*.txt \
+-	as400/bndsrc \
+-	as400/compile.clp \
+-	as400/zlib.inc \
+-	configure \
+-	contrib/README.contrib \
+-	contrib/ada/*.txt \
+-	contrib/ada/buffer_demo.adb \
+-	contrib/ada/mtest.adb \
+-	contrib/ada/read.adb \
+-	contrib/ada/test.adb \
+-	contrib/ada/zlib-streams.adb \
+-	contrib/ada/zlib-streams.ads \
+-	contrib/ada/zlib-thin.adb \
+-	contrib/ada/zlib-thin.ads \
+-	contrib/ada/zlib.adb \
+-	contrib/ada/zlib.ads \
+-	contrib/ada/zlib.gpr \
+-	contrib/asm586/README.586 \
+-	contrib/asm586/match.S \
+-	contrib/asm686/README.686 \
+-	contrib/asm686/match.S \
+-	contrib/blast/*.txt \
+-	contrib/blast/README \
+-	contrib/blast/blast.c \
+-	contrib/blast/blast.h \
+-	contrib/blast/test.pk \
+-	contrib/delphi/*.txt \
+-	contrib/delphi/ZLib.pas \
+-	contrib/delphi/ZLibConst.pas \
+-	contrib/delphi/zlibd32.mak \
+-	contrib/dotzlib/*.txt \
+-	contrib/dotzlib/DotZLib.build \
+-	contrib/dotzlib/DotZLib.chm \
+-	contrib/dotzlib/DotZLib.sln \
+-	contrib/dotzlib/DotZLib/AssemblyInfo.cs \
+-	contrib/dotzlib/DotZLib/ChecksumImpl.cs \
+-	contrib/dotzlib/DotZLib/CircularBuffer.cs \
+-	contrib/dotzlib/DotZLib/CodecBase.cs \
+-	contrib/dotzlib/DotZLib/Deflater.cs \
+-	contrib/dotzlib/DotZLib/DotZLib.cs \
+-	contrib/dotzlib/DotZLib/DotZLib.csproj \
+-	contrib/dotzlib/DotZLib/GZipStream.cs \
+-	contrib/dotzlib/DotZLib/Inflater.cs \
+-	contrib/dotzlib/DotZLib/UnitTests.cs \
+-	contrib/infback9/README \
+-	contrib/infback9/infback9.c \
+-	contrib/infback9/infback9.h \
+-	contrib/infback9/inffix9.h \
+-	contrib/infback9/inflate9.h \
+-	contrib/infback9/inftree9.c \
+-	contrib/infback9/inftree9.h \
+-	contrib/inflate86/inffas86.c \
+-	contrib/inflate86/inffast.S \
+-	contrib/iostream/test.cpp \
+-	contrib/iostream/zfstream.cpp \
+-	contrib/iostream/zfstream.h \
+-	contrib/iostream2/zstream.h \
+-	contrib/iostream2/zstream_test.cpp \
+-	contrib/iostream3/README \
+-	contrib/iostream3/TODO \
+-	contrib/iostream3/test.cc \
+-	contrib/iostream3/zfstream.cc \
+-	contrib/iostream3/zfstream.h \
+-	contrib/masm686/match.asm \
+-	contrib/masmx64/*.txt \
+-	contrib/masmx64/bld_ml64.bat \
+-	contrib/masmx64/gvmat64.asm \
+-	contrib/masmx64/inffas8664.c \
+-	contrib/masmx64/inffasx64.asm \
+-	contrib/masmx86/*.txt \
+-	contrib/masmx86/bld_ml32.bat \
+-	contrib/masmx86/gvmat32.asm \
+-	contrib/masmx86/gvmat32c.c \
+-	contrib/masmx86/inffas32.asm \
+-	contrib/masmx86/mkasm.bat \
+-	contrib/minizip/ChangeLogUnzip \
+-	contrib/minizip/Makefile \
+-	contrib/minizip/crypt.h \
+-	contrib/minizip/ioapi.c \
+-	contrib/minizip/ioapi.h \
+-	contrib/minizip/iowin32.c \
+-	contrib/minizip/iowin32.h \
+-	contrib/minizip/miniunz.c \
+-	contrib/minizip/minizip.c \
+-	contrib/minizip/mztools.c \
+-	contrib/minizip/mztools.h \
+-	contrib/minizip/unzip.c \
+-	contrib/minizip/unzip.h \
+-	contrib/minizip/zip.c \
+-	contrib/minizip/zip.h \
+-	contrib/pascal/*.txt \
+-	contrib/pascal/example.pas \
+-	contrib/pascal/zlibd32.mak \
+-	contrib/pascal/zlibpas.pas \
+-	contrib/puff/README \
+-	contrib/puff/puff.c \
+-	contrib/puff/puff.h \
+-	contrib/puff/zeros.raw \
+-	contrib/testzlib/*.txt \
+-	contrib/testzlib/testzlib.c \
+-	contrib/untgz/Makefile \
+-	contrib/untgz/Makefile.msc \
+-	contrib/untgz/untgz.c \
+-	contrib/vstudio/*.txt \
+-	contrib/vstudio/vc7/miniunz.vcproj \
+-	contrib/vstudio/vc7/minizip.vcproj \
+-	contrib/vstudio/vc7/testzlib.vcproj \
+-	contrib/vstudio/vc7/zlib.rc \
+-	contrib/vstudio/vc7/zlibstat.vcproj \
+-	contrib/vstudio/vc7/zlibvc.def \
+-	contrib/vstudio/vc7/zlibvc.sln \
+-	contrib/vstudio/vc7/zlibvc.vcproj \
+-	contrib/vstudio/vc8/miniunz.vcproj \
+-	contrib/vstudio/vc8/minizip.vcproj \
+-	contrib/vstudio/vc8/testzlib.vcproj \
+-	contrib/vstudio/vc8/testzlibdll.vcproj \
+-	contrib/vstudio/vc8/zlib.rc \
+-	contrib/vstudio/vc8/zlibstat.vcproj \
+-	contrib/vstudio/vc8/zlibvc.def \
+-	contrib/vstudio/vc8/zlibvc.sln \
+-	contrib/vstudio/vc8/zlibvc.vcproj \
+-	example.c \
+-	examples/*.html \
+-	examples/README.examples \
+-	examples/fitblk.c \
+-	examples/gun.c \
+-	examples/gzappend.c \
+-	examples/gzjoin.c \
+-	examples/gzlog.c \
+-	examples/gzlog.h \
+-	examples/zpipe.c \
+-	examples/zran.c \
+-	make_vms.com \
+-	minigzip.c \
+-	msdos/Makefile.bor \
+-	msdos/Makefile.dj2 \
+-	msdos/Makefile.emx \
+-	msdos/Makefile.msc \
+-	msdos/Makefile.tc \
+-	old/*.html \
+-	old/*.txt \
+-	old/Makefile.riscos \
+-	old/README \
+-	old/descrip.mms \
+-	old/os2/Makefile.os2 \
+-	old/os2/zlib.def \
+-	projects/README.projects \
+-	projects/visualc6/*.txt \
+-	projects/visualc6/example.dsp \
+-	projects/visualc6/minigzip.dsp \
+-	projects/visualc6/zlib.dsp \
+-	projects/visualc6/zlib.dsw \
+-	qnx/package.qpg \
+-	win32/*.txt \
+-	win32/Makefile.bor \
+-	win32/Makefile.emx \
+-	win32/Makefile.gcc \
+-	win32/Makefile.msc \
+-	win32/zlib.def \
+-	win32/zlib1.rc \
+-	zconf.in.h \
+-	zlib.3
++# Blanked out by Debian maintainer

-- 
Git repository for pkg-virtuoso