[SCM] Git repository for pkg-virtuoso branch, master, updated. debian/6.1.4+dfsg1-3-6-gf62b814
José Manuel Santamar?==?UTF-8?Q?ía Lema
panfaust at gmail.com
Tue Jan 22 02:42:38 UTC 2013
The following commit has been merged in the master branch:
commit 14b66c276f85cb00019d14816faf3767940000d4
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Tue Jan 22 02:51:54 2013 +0100
Refresh other patches to make them apply without any offset.
diff --git a/debian/changelog b/debian/changelog
index 68ddd4c..354e537 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ virtuoso-opensource (6.1.6+dfsg1-0r0) UNRELEASED; urgency=low
* New upstream release.
* Update patches:
- remove portable-method-for-escaping-symbol-gawk.diff, applied upstream.
+ - refresh other patches to make them apply without any offset.
-- José Manuel Santamaría Lema <panfaust at gmail.com> Tue, 22 Jan 2013 02:46:26 +0100
diff --git a/debian/patches/config-debian-paths.patch b/debian/patches/config-debian-paths.patch
index 2210d42..1e96e36 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
-@@ -3729,14 +3729,14 @@ case ${VIRTUOSO_LAYOUT} in
+@@ -2816,14 +2816,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 ef808da..529acb8 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
-@@ -276,8 +276,8 @@ virtuoso_start() {
+@@ -278,8 +278,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
-@@ -120,8 +120,8 @@ virtuoso_start() {
+@@ -170,8 +170,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
-@@ -124,8 +124,8 @@ virtuoso_start() {
+@@ -170,8 +170,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
-@@ -140,8 +140,8 @@ virtuoso_start() {
+@@ -181,8 +181,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
-@@ -123,8 +123,8 @@ virtuoso_start() {
+@@ -169,8 +169,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
-@@ -127,8 +127,8 @@ virtuoso_start() {
+@@ -165,8 +165,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
-@@ -123,8 +123,8 @@ virtuoso_start() {
+@@ -169,8 +169,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
-@@ -165,8 +165,8 @@ virtuoso_start() {
+@@ -167,8 +167,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
-@@ -127,8 +127,8 @@ virtuoso_start() {
+@@ -153,8 +153,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
-@@ -122,8 +122,8 @@ virtuoso_start() {
+@@ -157,8 +157,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
-@@ -123,8 +123,8 @@ virtuoso_start() {
+@@ -168,8 +168,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
-@@ -158,8 +158,8 @@ virtuoso_start() {
+@@ -159,8 +159,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
-@@ -333,8 +333,8 @@ START_SERVER()
+@@ -334,8 +334,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
-@@ -139,8 +139,8 @@ virtuoso_start() {
+@@ -140,8 +140,8 @@ virtuoso_start() {
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
diff --git a/debian/patches/repack-pcre.patch b/debian/patches/repack-pcre.patch
index 8cd8be1..5d26350 100644
--- a/debian/patches/repack-pcre.patch
+++ b/debian/patches/repack-pcre.patch
@@ -4,7 +4,7 @@ Author: Obey Arthur Liu <arthur at milliways.fr>
Last-Update: 2012-05-23
--- a/configure.in
+++ b/configure.in
-@@ -485,6 +485,8 @@ AC_CHECK_LIB(inet, gethostbyname, [VLIBS
+@@ -502,6 +502,8 @@ AC_CHECK_LIB(inet, gethostbyname, [VLIBS
AC_CHECK_LIB(socket, socket, [VLIBS="-lsocket $VLIBS"], [], $VLIBS) # SVR4 sockets
fi
AC_CHECK_LIB(m, cos, [VLIBS="-lm $VLIBS"]) # complex math
@@ -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
-@@ -85,24 +85,26 @@ libutil_la_SOURCES = \
+@@ -87,24 +87,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
-@@ -121,14 +123,16 @@ EXTRA_DIST = \
+@@ -123,14 +125,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 f0a5398..4895989 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
-@@ -4750,7 +4750,11 @@ gz_init_ses (dk_session_t * ses_out)
+@@ -4784,7 +4784,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
-@@ -2676,7 +2676,6 @@ AC_CONFIG_FILES([
+@@ -2725,7 +2725,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