[Pkg-voip-commits] r4659 - in /libcommoncpp2/trunk/debian/patches: 01_debian.dpatch cleaning_doc.dpatch gnutls.dpatch no-include-bits_atomicity.h.dpatch soname-1.5.3.dpatch
kilian at alioth.debian.org
kilian at alioth.debian.org
Tue Oct 2 07:30:43 UTC 2007
Author: kilian
Date: Tue Oct 2 07:30:42 2007
New Revision: 4659
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4659
Log:
update patches applying.
Modified:
libcommoncpp2/trunk/debian/patches/01_debian.dpatch
libcommoncpp2/trunk/debian/patches/cleaning_doc.dpatch
libcommoncpp2/trunk/debian/patches/gnutls.dpatch
libcommoncpp2/trunk/debian/patches/no-include-bits_atomicity.h.dpatch
libcommoncpp2/trunk/debian/patches/soname-1.5.3.dpatch
Modified: libcommoncpp2/trunk/debian/patches/01_debian.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/patches/01_debian.dpatch?rev=4659&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/patches/01_debian.dpatch (original)
+++ libcommoncpp2/trunk/debian/patches/01_debian.dpatch Tue Oct 2 07:30:42 2007
@@ -5,9 +5,9 @@
## DP: New patch generated from libcommoncpp2 1.3.25-3 diff.gz
@DPATCH@
-diff -urNad libcommoncpp2-1.3.26~/doc/Doxyfile.in libcommoncpp2-1.3.26/doc/Doxyfile.in
---- libcommoncpp2-1.3.26~/doc/Doxyfile.in 2005-04-23 23:08:04.000000000 +0100
-+++ libcommoncpp2-1.3.26/doc/Doxyfile.in 2006-04-12 19:19:24.000000000 +0100
+diff -urNad libcommoncpp2-1.5.9~/doc/Doxyfile.in libcommoncpp2-1.5.9/doc/Doxyfile.in
+--- libcommoncpp2-1.5.9~/doc/Doxyfile.in 2007-08-11 13:39:55.000000000 +0200
++++ libcommoncpp2-1.5.9/doc/Doxyfile.in 2007-10-02 09:19:12.000000000 +0200
@@ -184,6 +184,19 @@
SUBGROUPING = YES
@@ -37,7 +37,7 @@
# The GENERATE_TESTLIST tag can be used to enable (YES) or
# disable (NO) the test list. This list is created by putting \test
-@@ -650,7 +663,7 @@
+@@ -649,7 +662,7 @@
# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
# generate Latex output.
@@ -46,7 +46,7 @@
# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-@@ -768,7 +781,7 @@
+@@ -767,7 +780,7 @@
# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
# generate man pages
@@ -55,23 +55,10 @@
# The MAN_OUTPUT tag is used to specify where the man pages will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-diff -urNad libcommoncpp2-1.3.26~/include/cc++/misc.h libcommoncpp2-1.3.26/include/cc++/misc.h
---- libcommoncpp2-1.3.26~/include/cc++/misc.h 2006-03-28 16:09:04.000000000 +0100
-+++ libcommoncpp2-1.3.26/include/cc++/misc.h 2006-04-12 19:19:25.000000000 +0100
-@@ -343,6 +343,9 @@
- * @author David Sugar <dyfet at ostel.com>
- * @short load text configuration files into keyword pairs.
- */
-+
-+void endKeydata(void);
-+
- class __EXPORT Keydata : protected MemPager
- {
- public:
-diff -urNad libcommoncpp2-1.3.26~/src/ccgnu2-config.in libcommoncpp2-1.3.26/src/ccgnu2-config.in
---- libcommoncpp2-1.3.26~/src/ccgnu2-config.in 2005-04-23 23:08:17.000000000 +0100
-+++ libcommoncpp2-1.3.26/src/ccgnu2-config.in 2006-04-12 19:19:25.000000000 +0100
-@@ -81,6 +81,9 @@
+diff -urNad libcommoncpp2-1.5.9~/src/ccgnu2-config.in libcommoncpp2-1.5.9/src/ccgnu2-config.in
+--- libcommoncpp2-1.5.9~/src/ccgnu2-config.in 2007-08-11 13:39:54.000000000 +0200
++++ libcommoncpp2-1.5.9/src/ccgnu2-config.in 2007-10-02 09:19:12.000000000 +0200
+@@ -79,6 +79,9 @@
--modflags | --module)
echo $modflags
;;
Modified: libcommoncpp2/trunk/debian/patches/cleaning_doc.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/patches/cleaning_doc.dpatch?rev=4659&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/patches/cleaning_doc.dpatch (original)
+++ libcommoncpp2/trunk/debian/patches/cleaning_doc.dpatch Tue Oct 2 07:30:42 2007
@@ -5,16 +5,19 @@
## DP: adding clean-docs target to doc/Makefile.in (Debian bug #424498)
@DPATCH@
-diff -urNad libcommoncpp2-1.5.6~/doc/Makefile.in libcommoncpp2-1.5.6/doc/Makefile.in
---- libcommoncpp2-1.5.6~/doc/Makefile.in 2007-02-20 02:39:25.000000000 -0600
-+++ libcommoncpp2-1.5.6/doc/Makefile.in 2007-07-24 00:57:23.000000000 -0600
-@@ -286,9 +286,13 @@
+diff -urNad libcommoncpp2-1.5.9~/doc/Makefile.in libcommoncpp2-1.5.9/doc/Makefile.in
+--- libcommoncpp2-1.5.9~/doc/Makefile.in 2007-09-30 13:06:15.000000000 +0200
++++ libcommoncpp2-1.5.9/doc/Makefile.in 2007-10-02 09:16:57.000000000 +0200
+@@ -274,12 +274,16 @@
+ Doxyfile: $(top_builddir)/config.status $(srcdir)/Doxyfile.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+-mostlyclean-libtool:
++mostlyclean-libtool: clean-docs
+ -rm -f *.lo
+
clean-libtool:
-rm -rf .libs _libs
-
--distclean-libtool:
-+distclean-libtool: clean-docs
- -rm -f libtool
+clean-docs:
+ -rm -rf html
Modified: libcommoncpp2/trunk/debian/patches/gnutls.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/patches/gnutls.dpatch?rev=4659&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/patches/gnutls.dpatch (original)
+++ libcommoncpp2/trunk/debian/patches/gnutls.dpatch Tue Oct 2 07:30:42 2007
@@ -7,21 +7,21 @@
## DP: http://bugs.debian.org/395148
@DPATCH@
-diff -urNad libcommoncpp2-1.5.5~/src/Makefile.in libcommoncpp2-1.5.5/src/Makefile.in
---- libcommoncpp2-1.5.5~/src/Makefile.in 2007-01-25 13:30:43.000000000 +0000
-+++ libcommoncpp2-1.5.5/src/Makefile.in 2007-02-17 12:48:55.000000000 +0000
-@@ -320,7 +320,7 @@
+diff -urNad libcommoncpp2-1.5.9~/src/Makefile.in libcommoncpp2-1.5.9/src/Makefile.in
+--- libcommoncpp2-1.5.9~/src/Makefile.in 2007-10-02 09:19:43.000000000 +0200
++++ libcommoncpp2-1.5.9/src/Makefile.in 2007-10-02 09:21:26.000000000 +0200
+@@ -316,7 +316,7 @@
aclocal_DATA = ost_check2.m4
scriptdir = $(bindir)
script_DATA = ccgnu2-config
--libccgnu2_la_LIBADD = @THREAD_LIBS@
-+libccgnu2_la_LIBADD = @THREAD_LIBS@ @SSL_LIBS@
+-libccgnu2_la_LIBADD = @THREAD_LIBS@ @DYN_LOADER@
++libccgnu2_la_LIBADD = @THREAD_LIBS@ @DYN_LOADER@ @SSL_LIBS@
libccgnu2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
noinst_DATA = @STAGE2@
libccgnu2_la_SOURCES = thread.cpp mutex.cpp semaphore.cpp threadkey.cpp \
-diff -urNad libcommoncpp2-1.5.5~/src/libccext2.pc.in libcommoncpp2-1.5.5/src/libccext2.pc.in
---- libcommoncpp2-1.5.5~/src/libccext2.pc.in 2007-01-25 13:25:55.000000000 +0000
-+++ libcommoncpp2-1.5.5/src/libccext2.pc.in 2007-02-17 12:48:55.000000000 +0000
+diff -urNad libcommoncpp2-1.5.9~/src/libccext2.pc.in libcommoncpp2-1.5.9/src/libccext2.pc.in
+--- libcommoncpp2-1.5.9~/src/libccext2.pc.in 2007-10-02 09:19:43.000000000 +0200
++++ libcommoncpp2-1.5.9/src/libccext2.pc.in 2007-10-02 09:19:49.000000000 +0200
@@ -7,6 +7,6 @@
Description: GNU Common C++ Extension library
Version: @VERSION@
Modified: libcommoncpp2/trunk/debian/patches/no-include-bits_atomicity.h.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/patches/no-include-bits_atomicity.h.dpatch?rev=4659&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/patches/no-include-bits_atomicity.h.dpatch (original)
+++ libcommoncpp2/trunk/debian/patches/no-include-bits_atomicity.h.dpatch Tue Oct 2 07:30:42 2007
@@ -5,29 +5,30 @@
## DP: No description.
@DPATCH@
-diff -urNad libcommoncpp2-1.5.7~/configure libcommoncpp2-1.5.7/configure
---- libcommoncpp2-1.5.7~/configure 2007-06-12 14:43:52.000000000 +0200
-+++ libcommoncpp2-1.5.7/configure 2007-09-09 12:10:02.000000000 +0200
-@@ -25785,292 +25785,7 @@
- echo "${ECHO_T}$ost_cv_posix_atomic" >&6
+diff -urNad libcommoncpp2-1.5.9~/configure libcommoncpp2-1.5.9/configure
+--- libcommoncpp2-1.5.9~/configure 2007-10-02 09:23:06.000000000 +0200
++++ libcommoncpp2-1.5.9/configure 2007-10-02 09:25:46.000000000 +0200
+@@ -26105,275 +26105,6 @@
+ echo "${ECHO_T}$ost_cv_posix_atomic" >&6; }
fi
-
-for ac_header in bits/atomicity.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -38,41 +39,37 @@
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
+- (exit $ac_status); } && {
+- test -z "$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
+- ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -81,24 +78,22 @@
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_cxx_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
@@ -106,9 +101,10 @@
-
- ac_header_preproc=no
-fi
+-
-rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
+-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
@@ -132,25 +128,19 @@
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
+-
- ;;
-esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -165,8 +155,8 @@
-done
-
- if test $ost_cv_bits_atomicity = yes ; then
-- echo "$as_me:$LINENO: checking for _Atomic_word" >&5
--echo $ECHO_N "checking for _Atomic_word... $ECHO_C" >&6
+- { echo "$as_me:$LINENO: checking for _Atomic_word" >&5
+-echo $ECHO_N "checking for _Atomic_word... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -187,27 +177,22 @@
-}
-_ACEOF
-rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
+- (exit $ac_status); } && {
+- test -z "$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
- ost_cv_gcc_atomic=yes
-
-cat >>confdefs.h <<\_ACEOF
@@ -218,14 +203,15 @@
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ost_cv_gcc_atomic=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- echo "$as_me:$LINENO: result: $ost_cv_gcc_atomic" >&5
--echo "${ECHO_T}$ost_cv_gcc_atomic" >&6
--
-- echo "$as_me:$LINENO: checking for __gnu_cxx::_Atomic_word" >&5
--echo $ECHO_N "checking for __gnu_cxx::_Atomic_word... $ECHO_C" >&6
+- ost_cv_gcc_atomic=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- { echo "$as_me:$LINENO: result: $ost_cv_gcc_atomic" >&5
+-echo "${ECHO_T}$ost_cv_gcc_atomic" >&6; }
+-
+- { echo "$as_me:$LINENO: checking for __gnu_cxx::_Atomic_word" >&5
+-echo $ECHO_N "checking for __gnu_cxx::_Atomic_word... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -247,27 +233,22 @@
-}
-_ACEOF
-rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
+- (exit $ac_status); } && {
+- test -z "$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
- ost_cv_gcc_cxx_atomic=yes
-
-cat >>confdefs.h <<\_ACEOF
@@ -278,14 +259,15 @@
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
--ost_cv_gcc_cxx_atomic=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- echo "$as_me:$LINENO: result: $ost_cv_gcc_cxx_atomic" >&5
--echo "${ECHO_T}$ost_cv_gcc_cxx_atomic" >&6
+- ost_cv_gcc_cxx_atomic=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- { echo "$as_me:$LINENO: result: $ost_cv_gcc_cxx_atomic" >&5
+-echo "${ECHO_T}$ost_cv_gcc_cxx_atomic" >&6; }
- fi
-
--ac_ext=cc
+-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -298,39 +280,13 @@
- targetdir="$target"
- fi
-
-
+-
for ac_header in thread.h
do
-diff -urNad libcommoncpp2-1.5.7~/include/config.h.in libcommoncpp2-1.5.7/include/config.h.in
---- libcommoncpp2-1.5.7~/include/config.h.in 2007-02-20 09:39:17.000000000 +0100
-+++ libcommoncpp2-1.5.7/include/config.h.in 2007-09-09 12:11:51.000000000 +0200
-@@ -236,9 +236,6 @@
- /* atomic aix operations */
- #undef HAVE_ATOMIC_AIX
-
--/* Define to 1 if you have the <bits/atomicity.h> header file. */
--#undef HAVE_BITS_ATOMICITY_H
--
- /* Define to 1 if you have the <bits/wordsize.h> header file. */
- #undef HAVE_BITS_WORDSIZE_H
-
-@@ -1082,13 +1079,6 @@
- #endif
- #endif
-
--#if defined(__cplusplus)
--#if defined(HAVE_GCC_BITS_ATOMIC) || defined(HAVE_GCC_CXX_BITS_ATOMIC)
--#include <bits/atomicity.h>
--#define HAVE_ATOMIC
--#endif
--#endif
--
- #if defined(HAVE_PTHREAD_H) && ( defined(_THREAD_SAFE) || defined(_REENTRANT) )
-
- #ifdef __QNX__
-diff -urNad libcommoncpp2-1.5.7~/m4/ost_pthread.m4 libcommoncpp2-1.5.7/m4/ost_pthread.m4
---- libcommoncpp2-1.5.7~/m4/ost_pthread.m4 2007-01-24 20:37:38.000000000 +0100
-+++ libcommoncpp2-1.5.7/m4/ost_pthread.m4 2007-09-09 12:12:43.000000000 +0200
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+diff -urNad libcommoncpp2-1.5.9~/m4/ost_pthread.m4 libcommoncpp2-1.5.9/m4/ost_pthread.m4
+--- libcommoncpp2-1.5.9~/m4/ost_pthread.m4 2007-10-02 09:22:57.000000000 +0200
++++ libcommoncpp2-1.5.9/m4/ost_pthread.m4 2007-10-02 09:23:06.000000000 +0200
@@ -89,38 +89,6 @@
AC_MSG_RESULT($ost_cv_posix_atomic)
fi
Modified: libcommoncpp2/trunk/debian/patches/soname-1.5.3.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/patches/soname-1.5.3.dpatch?rev=4659&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/patches/soname-1.5.3.dpatch (original)
+++ libcommoncpp2/trunk/debian/patches/soname-1.5.3.dpatch Tue Oct 2 07:30:42 2007
@@ -6,27 +6,27 @@
## DP: http://bugs.debian.org/402009
@DPATCH@
-diff -urNad libcommoncpp2-1.5.7~/configure libcommoncpp2-1.5.7/configure
---- libcommoncpp2-1.5.7~/configure 2007-02-20 08:39:30.000000000 +0000
-+++ libcommoncpp2-1.5.7/configure 2007-04-12 16:15:18.000000000 +0100
-@@ -1518,7 +1518,7 @@
+diff -urNad libcommoncpp2-1.5.9~/configure libcommoncpp2-1.5.9/configure
+--- libcommoncpp2-1.5.9~/configure 2007-10-02 09:21:42.000000000 +0200
++++ libcommoncpp2-1.5.9/configure 2007-10-02 09:22:46.000000000 +0200
+@@ -1995,7 +1995,7 @@
- VERSION="1.5.7"
+ VERSION="1.5.9"
-LT_RELEASE="1.5"
+LT_RELEASE="1.5.3"
- LT_VERSION="0:7"
+ LT_VERSION="0:9"
- ac_ext=cc
-diff -urNad libcommoncpp2-1.5.7~/configure.ac libcommoncpp2-1.5.7/configure.ac
---- libcommoncpp2-1.5.7~/configure.ac 2007-02-20 08:35:39.000000000 +0000
-+++ libcommoncpp2-1.5.7/configure.ac 2007-04-12 16:15:47.000000000 +0100
+ ac_ext=cpp
+diff -urNad libcommoncpp2-1.5.9~/configure.ac libcommoncpp2-1.5.9/configure.ac
+--- libcommoncpp2-1.5.9~/configure.ac 2007-10-02 09:21:42.000000000 +0200
++++ libcommoncpp2-1.5.9/configure.ac 2007-10-02 09:22:20.000000000 +0200
@@ -11,7 +11,7 @@
AC_INIT(src/thread.cpp)
- VERSION="1.5.7"
+ VERSION="1.5.9"
-LT_RELEASE="1.5"
+LT_RELEASE="1.5.3"
- LT_VERSION="0:7"
+ LT_VERSION="0:9"
dnl this is a C++ library after all..
More information about the Pkg-voip-commits
mailing list