[SCM] Git repository for pkg-virtuoso branch, master, updated. debian/6.1.3+dfsg1-2.1-52-g9d9cfb7
José Manuel Santamar?==?UTF-8?Q?ía Lema
panfaust at gmail.com
Fri Jun 8 20:39:49 UTC 2012
The following commit has been merged in the master branch:
commit d141febbf874111fecf93c4f16809769a3b08e7f
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Fri Jun 8 21:38:40 2012 +0200
Refresh patches again for 6.1.4.
diff --git a/debian/changelog b/debian/changelog
index 7d6b528..a3838e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,6 @@ virtuoso-opensource (6.1.4+dfsg1-1~pre1) UNRELEASED; urgency=low
* Update patches:
- drop fix-wide-char-encoding.patch, applied upstream.
- update repack-zlib.patch.
- - extend build-short-timeout.patch.
- refresh other patches in order to make them apply without any offset.
- add ignore-netstat-failure.patch, to avoid FTBFS on various
architectures, thanks to Steven Chamberlain (Closes: #663010).
diff --git a/debian/patches/build-short-timeout.patch b/debian/patches/build-short-timeout.patch
index 25f74a3..660f62e 100644
--- a/debian/patches/build-short-timeout.patch
+++ b/debian/patches/build-short-timeout.patch
@@ -7,7 +7,7 @@ Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Last-Update: 2012-05-29
--- a/appsrc/ODS-Addressbook/make_vad.sh
+++ b/appsrc/ODS-Addressbook/make_vad.sh
-@@ -143,7 +143,7 @@ virtuoso_start() {
+@@ -93,7 +93,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -18,7 +18,7 @@ Last-Update: 2012-05-29
then
--- a/appsrc/ODS-Blog/make_vad.sh
+++ b/appsrc/ODS-Blog/make_vad.sh
-@@ -113,7 +113,7 @@ virtuoso_start() {
+@@ -112,7 +112,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -29,7 +29,7 @@ Last-Update: 2012-05-29
then
--- a/appsrc/ODS-Bookmark/make_vad.sh
+++ b/appsrc/ODS-Bookmark/make_vad.sh
-@@ -143,7 +143,7 @@ virtuoso_start() {
+@@ -97,7 +97,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -40,7 +40,7 @@ Last-Update: 2012-05-29
then
--- a/appsrc/ODS-Briefcase/make_vad.sh
+++ b/appsrc/ODS-Briefcase/make_vad.sh
-@@ -154,7 +154,7 @@ virtuoso_start() {
+@@ -113,7 +113,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -51,7 +51,7 @@ Last-Update: 2012-05-29
then
--- a/appsrc/ODS-Calendar/make_vad.sh
+++ b/appsrc/ODS-Calendar/make_vad.sh
-@@ -142,7 +142,7 @@ virtuoso_start() {
+@@ -96,7 +96,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -62,7 +62,7 @@ Last-Update: 2012-05-29
then
--- a/appsrc/ODS-Community/make_vad.sh
+++ b/appsrc/ODS-Community/make_vad.sh
-@@ -138,7 +138,7 @@ virtuoso_start() {
+@@ -100,7 +100,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -84,7 +84,7 @@ Last-Update: 2012-05-29
then
--- a/appsrc/ODS-FeedManager/make_vad.sh
+++ b/appsrc/ODS-FeedManager/make_vad.sh
-@@ -142,7 +142,7 @@ virtuoso_start() {
+@@ -96,7 +96,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -95,7 +95,7 @@ Last-Update: 2012-05-29
then
--- a/appsrc/ODS-Framework/make_vad.sh
+++ b/appsrc/ODS-Framework/make_vad.sh
-@@ -140,7 +140,7 @@ virtuoso_start() {
+@@ -138,7 +138,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -117,7 +117,7 @@ Last-Update: 2012-05-29
then
--- a/appsrc/ODS-Gallery/make_vad.sh
+++ b/appsrc/ODS-Gallery/make_vad.sh
-@@ -126,7 +126,7 @@ virtuoso_start() {
+@@ -100,7 +100,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -128,7 +128,7 @@ Last-Update: 2012-05-29
then
--- a/appsrc/ODS-Polls/make_vad.sh
+++ b/appsrc/ODS-Polls/make_vad.sh
-@@ -130,7 +130,7 @@ virtuoso_start() {
+@@ -95,7 +95,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -139,7 +139,7 @@ Last-Update: 2012-05-29
then
--- a/appsrc/ODS-WebMail/make_vad.sh
+++ b/appsrc/ODS-WebMail/make_vad.sh
-@@ -141,7 +141,7 @@ virtuoso_start() {
+@@ -96,7 +96,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -150,7 +150,7 @@ Last-Update: 2012-05-29
then
--- a/appsrc/ODS-Wiki/make_vad.sh
+++ b/appsrc/ODS-Wiki/make_vad.sh
-@@ -132,7 +132,7 @@ virtuoso_start() {
+@@ -131,7 +131,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -205,7 +205,7 @@ Last-Update: 2012-05-29
then
--- a/binsrc/rdf_mappers/make_vad.sh
+++ b/binsrc/rdf_mappers/make_vad.sh
-@@ -251,7 +251,7 @@ virtuoso_start() {
+@@ -249,7 +249,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -889,7 +889,7 @@ Last-Update: 2012-05-29
if $ISQL $DSN "EXEC=status();" VERBOSE=OFF ERRORS=STDOUT > ident.txt
--- a/binsrc/tests/suite/thttp.sh
+++ b/binsrc/tests/suite/thttp.sh
-@@ -817,7 +817,7 @@ case $1 in
+@@ -799,7 +799,7 @@ case $1 in
BLOG_TEST=0
LOG "ODS & Blog2 VAD packages are not built"
fi
@@ -1115,7 +1115,7 @@ Last-Update: 2012-05-29
RUN $INS $DSN 20 100
# note that the test script filename has to be given as the fourth
-@@ -162,7 +162,7 @@ fi
+@@ -147,7 +147,7 @@ fi
SHUTDOWN_SERVER
@@ -1510,14 +1510,3 @@ Last-Update: 2012-05-29
RUN $ISQL $PORT PROMPT=OFF VERBOSE=OFF < tpc_back.sql
if test $STATUS -ne 0
then
---- a/binsrc/dbpedia/make_vad.sh
-+++ b/binsrc/dbpedia/make_vad.sh
-@@ -196,7 +196,7 @@ virtuoso_start() {
- ddate=`date`
- starth=`date | cut -f 2 -d :`
- starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
-- timeout=600
-+ timeout=60
- $myrm -f *.lck
- if [ "z$HOST_OS" != "z" ]
- then
diff --git a/debian/patches/config-debian-paths.patch b/debian/patches/config-debian-paths.patch
index 656c5e7..2210d42 100644
--- a/debian/patches/config-debian-paths.patch
+++ b/debian/patches/config-debian-paths.patch
@@ -4,7 +4,7 @@ Author: Obey Arthur Liu <arthur at milliways.fr>
Last-Update: 2012-05-23
--- a/configure
+++ b/configure
-@@ -3600,14 +3600,14 @@ case ${VIRTUOSO_LAYOUT} in
+@@ -3729,14 +3729,14 @@ case ${VIRTUOSO_LAYOUT} in
prefix=/usr
localstatedir=/var
fi
diff --git a/debian/patches/ignore-netstat-failure.patch b/debian/patches/ignore-netstat-failure.patch
index db26206..ef808da 100644
--- a/debian/patches/ignore-netstat-failure.patch
+++ b/debian/patches/ignore-netstat-failure.patch
@@ -10,7 +10,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
build anyway.
--- a/binsrc/rdf_mappers/make_vad.sh
+++ b/binsrc/rdf_mappers/make_vad.sh
-@@ -278,8 +278,8 @@ virtuoso_start() {
+@@ -276,8 +276,8 @@ virtuoso_start() {
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -127,7 +127,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Addressbook/make_vad.sh
+++ b/appsrc/ODS-Addressbook/make_vad.sh
-@@ -170,8 +170,8 @@ virtuoso_start() {
+@@ -120,8 +120,8 @@ virtuoso_start() {
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -140,7 +140,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Bookmark/make_vad.sh
+++ b/appsrc/ODS-Bookmark/make_vad.sh
-@@ -170,8 +170,8 @@ virtuoso_start() {
+@@ -124,8 +124,8 @@ virtuoso_start() {
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -153,7 +153,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Briefcase/make_vad.sh
+++ b/appsrc/ODS-Briefcase/make_vad.sh
-@@ -181,8 +181,8 @@ virtuoso_start() {
+@@ -140,8 +140,8 @@ virtuoso_start() {
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -166,7 +166,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Calendar/make_vad.sh
+++ b/appsrc/ODS-Calendar/make_vad.sh
-@@ -169,8 +169,8 @@ virtuoso_start() {
+@@ -123,8 +123,8 @@ virtuoso_start() {
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -179,7 +179,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Community/make_vad.sh
+++ b/appsrc/ODS-Community/make_vad.sh
-@@ -165,8 +165,8 @@ virtuoso_start() {
+@@ -127,8 +127,8 @@ virtuoso_start() {
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -205,7 +205,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-FeedManager/make_vad.sh
+++ b/appsrc/ODS-FeedManager/make_vad.sh
-@@ -169,8 +169,8 @@ virtuoso_start() {
+@@ -123,8 +123,8 @@ virtuoso_start() {
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -218,7 +218,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Framework/make_vad.sh
+++ b/appsrc/ODS-Framework/make_vad.sh
-@@ -167,8 +167,8 @@ virtuoso_start() {
+@@ -165,8 +165,8 @@ virtuoso_start() {
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -244,7 +244,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Gallery/make_vad.sh
+++ b/appsrc/ODS-Gallery/make_vad.sh
-@@ -153,8 +153,8 @@ virtuoso_start() {
+@@ -127,8 +127,8 @@ virtuoso_start() {
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -257,7 +257,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Polls/make_vad.sh
+++ b/appsrc/ODS-Polls/make_vad.sh
-@@ -157,8 +157,8 @@ virtuoso_start() {
+@@ -122,8 +122,8 @@ virtuoso_start() {
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -270,7 +270,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-WebMail/make_vad.sh
+++ b/appsrc/ODS-WebMail/make_vad.sh
-@@ -168,8 +168,8 @@ virtuoso_start() {
+@@ -123,8 +123,8 @@ virtuoso_start() {
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -283,7 +283,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Wiki/make_vad.sh
+++ b/appsrc/ODS-Wiki/make_vad.sh
-@@ -159,8 +159,8 @@ virtuoso_start() {
+@@ -158,8 +158,8 @@ virtuoso_start() {
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -361,7 +361,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/binsrc/tests/suite/test_fn.sh
+++ b/binsrc/tests/suite/test_fn.sh
-@@ -334,8 +334,8 @@ START_SERVER()
+@@ -333,8 +333,8 @@ START_SERVER()
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -400,7 +400,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Blog/make_vad.sh
+++ b/appsrc/ODS-Blog/make_vad.sh
-@@ -140,8 +140,8 @@ virtuoso_start() {
+@@ -139,8 +139,8 @@ virtuoso_start() {
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -424,14 +424,3 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
fi
done
}
---- a/binsrc/dbpedia/make_vad.sh
-+++ b/binsrc/dbpedia/make_vad.sh
-@@ -224,7 +224,7 @@ virtuoso_start() {
- if test $nows -ge $timeout
- then
- LOG "***FAILED: Could not start Virtuoso Server within $timeout seconds"
-- exit 1
-+ return 1
- fi
- done
- }
diff --git a/debian/patches/repack-pcre.patch b/debian/patches/repack-pcre.patch
index a749972..8cd8be1 100644
--- a/debian/patches/repack-pcre.patch
+++ b/debian/patches/repack-pcre.patch
@@ -41,7 +41,7 @@ Last-Update: 2012-05-23
( ((c) & ~0xFF) ? (ecm_utf8props[(c)] & ECM_ISNAME) : \
--- a/libsrc/util/Makefile.am
+++ b/libsrc/util/Makefile.am
-@@ -87,24 +87,26 @@ libutil_la_SOURCES = \
+@@ -85,24 +85,26 @@ libutil_la_SOURCES = \
virt_mbsnrtowcs.c \
virt_wcrtomb.c \
virt_wcs_mask.c \
@@ -86,7 +86,7 @@ Last-Update: 2012-05-23
BUILT_SOURCES = getdate.c
-@@ -123,14 +125,16 @@ EXTRA_DIST = \
+@@ -121,14 +123,16 @@ EXTRA_DIST = \
getdate.y \
MSG_BG.bin \
MSG_EN.bin \
diff --git a/debian/patches/repack-zlib.patch b/debian/patches/repack-zlib.patch
index d200253..f0a5398 100644
--- a/debian/patches/repack-zlib.patch
+++ b/debian/patches/repack-zlib.patch
@@ -5,7 +5,7 @@ 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
-@@ -4784,7 +4784,11 @@ gz_init_ses (dk_session_t * ses_out)
+@@ -4750,7 +4750,11 @@ gz_init_ses (dk_session_t * ses_out)
level = 6;
err = deflateInit2 (&(s->stream), level,
@@ -31,7 +31,7 @@ Last-Update: 2012-05-23
--- a/configure.in
+++ b/configure.in
-@@ -2692,7 +2692,6 @@ AC_CONFIG_FILES([
+@@ -2676,7 +2676,6 @@ AC_CONFIG_FILES([
libsrc/util/Makefile
libsrc/Wi/Makefile
libsrc/Xml.new/Makefile
--
Git repository for pkg-virtuoso
More information about the Pkg-virtuoso-commits
mailing list