[SCM] Git repository for pkg-virtuoso branch, master, updated. debian/6.1.3+dfsg1-2.1-8-g140ed05

José Manuel Santamar?==?UTF-8?Q?ía Lema panfaust at gmail.com
Wed May 23 16:06:20 UTC 2012 

The following commit has been merged in the master branch:
commit 83f633cf0b953337a19e16edb5a982b8ed7e483c
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Wed May 23 01:11:14 2012 +0200

    Update patches.

diff --git a/debian/changelog b/debian/changelog
index 1263671..2544303 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 virtuoso-opensource (6.1.5+dfsg1-5) UNRELEASED; urgency=low
 
   * Switch to source format 3.0 (quilt).
+  * Update patches:
+    - drop fix-wide-char-encoding.patch, applied upstream.
+    - update repack-zlib.patch.
 
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Tue, 22 May 2012 19:26:43 +0200
 
diff --git a/debian/patches/fix-wide-char-encoding.patch b/debian/patches/fix-wide-char-encoding.patch
deleted file mode 100644
index 12249d8..0000000
--- a/debian/patches/fix-wide-char-encoding.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: fix wide char encoding
- Fix wide char encoding as described in
- https://bugs.kde.org/show_bug.cgi?id=271664
-Author: Obey Arthur Liu <arthur at milliways.fr>
-Last-Update: 2011-10-14
---- a/libsrc/Wi/xqf.c
-+++ b/libsrc/Wi/xqf.c
-@@ -3520,6 +3520,12 @@
-   desc = xqf_str_parser_descs + desc_idx;
-   if (DV_DB_NULL == arg_dtp)
-     return NEW_DB_NULL;
-+  /* if we have wide and we want typed string we do utf8, cast do to default charset so we do not do it */
-+  if (DV_WIDE == arg_dtp && desc->p_dest_dtp == DV_STRING)
-+    {
-+      res = box_wide_as_utf8_char (arg, box_length (arg) / sizeof (wchar_t) - 1, DV_STRING);
-+      goto res_ready;
-+    }
-   if (DV_STRING != arg_dtp)
-     {
-       caddr_t err = NULL;
diff --git a/debian/patches/repack-zlib.patch b/debian/patches/repack-zlib.patch
index 9e3e008..d200253 100644
--- a/debian/patches/repack-zlib.patch
+++ b/debian/patches/repack-zlib.patch
@@ -1,10 +1,11 @@
 Description: Fix zlib related code after repacking
- Fix a few usages of zlib after total removal through repacking.
+ Fix a few usages of zlib after partial removal through repacking.
 Author: Obey Arthur Liu <arthur at milliways.fr>
-Last-Update: 2010-02-17
+Author: José Manuel Santamaría Lema <panfaust at gmail.com>
+Last-Update: 2012-05-23
 --- a/libsrc/Wi/bif_file.c
 +++ b/libsrc/Wi/bif_file.c
-@@ -4668,7 +4668,11 @@
+@@ -4784,7 +4784,11 @@ gz_init_ses (dk_session_t * ses_out)
    level = 6;
  
    err = deflateInit2 (&(s->stream), level,
@@ -17,224 +18,24 @@ Last-Update: 2010-02-17
  
    s->stream.next_out = s->outbuf = (Byte *) dk_alloc (Z_BUFSIZE);
    if (err != Z_OK || s->outbuf == Z_NULL)
---- a/libsrc/zlib/Makefile.am
-+++ b/libsrc/zlib/Makefile.am
-@@ -19,217 +19,4 @@
+--- a/libsrc/Makefile.am
++++ b/libsrc/Makefile.am
+@@ -19,7 +19,7 @@
  #  
  #  
  
--
--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
+-SUBDIRS = util zlib odbcsdk Dk Thread langfunc Wi plugin Tidy Xml.new JDBCDriverType4
++SUBDIRS = util odbcsdk Dk Thread langfunc Wi plugin Tidy Xml.new JDBCDriverType4
+ 
+ noinst_HEADERS = Dk.h libutil.h
+ 
+--- a/configure.in
++++ b/configure.in
+@@ -2692,7 +2692,6 @@ AC_CONFIG_FILES([
+ 	libsrc/util/Makefile
+ 	libsrc/Wi/Makefile
+ 	libsrc/Xml.new/Makefile
+-	libsrc/zlib/Makefile
+ 	appsrc/Makefile
+ 	appsrc/ODS-Framework/Makefile
+ 	appsrc/ODS-Addressbook/Makefile
diff --git a/debian/patches/series b/debian/patches/series
index e1fa09e..655c0d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 use-debian-default-csharp-compiler.patch
-fix-wide-char-encoding.patch
 config-debian-paths.patch
 config-universal-variables.patch
 build-short-timeout.patch

-- 
Git repository for pkg-virtuoso

More information about the Pkg-virtuoso-commits mailing list