diff --git a/campcaster/bin/dist.sh b/campcaster/bin/dist.sh index fa3355294..9498200a6 100755 --- a/campcaster/bin/dist.sh +++ b/campcaster/bin/dist.sh @@ -145,7 +145,7 @@ etc_tmpdir=$ls_tmpdir/etc tmp_tmpdir=$ls_tmpdir/tmp libodbcxx_dir=$toolsdir/libodbc++ -libodbcxx_version=libodbc++-0.2.4pre4 +libodbcxx_version=libodbc++-0.2.5 libodbcxx_tmpdir=$tools_tmpdir/libodbc++ xmlrpcxx_dir=$toolsdir/xmlrpc++ diff --git a/campcaster/etc/Makefile.in b/campcaster/etc/Makefile.in index 84929ab6e..14b81cad1 100644 --- a/campcaster/etc/Makefile.in +++ b/campcaster/etc/Makefile.in @@ -102,7 +102,7 @@ FLAWFINDER_FILE = ${DOC_DIR}/flawfinderReport.html TOOLS_DIR = ${SRC_DIR}/tools LIBODBCXX_DIR = ${TOOLS_DIR}/libodbc++ -LIBODBCXX_VERSION = libodbc++-0.2.4pre4 +LIBODBCXX_VERSION = libodbc++-0.2.5 XMLRPCXX_DIR = ${TOOLS_DIR}/xmlrpc++ XMLRPCXX_VERSION = xmlrpc++-20040713 TAGLIB_DIR = ${TOOLS_DIR}/taglib diff --git a/campcaster/etc/configure.ac b/campcaster/etc/configure.ac index 774b0cfb4..6b97a310b 100644 --- a/campcaster/etc/configure.ac +++ b/campcaster/etc/configure.ac @@ -355,7 +355,7 @@ AC_MSG_NOTICE( [compiling the following external libraries that are needed by Campcaster: - libodbc++ 0.2.4pre4 + libodbc++ 0.2.5 taglib 1.5 xmlrpc++ 2004-07-13 diff --git a/campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/src/libodbc++-0.2.4pre4.tar.bz2 b/campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/src/libodbc++-0.2.4pre4.tar.bz2 deleted file mode 100644 index 719251907..000000000 Binary files a/campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/src/libodbc++-0.2.4pre4.tar.bz2 and /dev/null differ diff --git a/campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/bin/autogen.sh b/campcaster/src/tools/libodbc++/libodbc++-0.2.5/bin/autogen.sh similarity index 94% rename from campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/bin/autogen.sh rename to campcaster/src/tools/libodbc++/libodbc++-0.2.5/bin/autogen.sh index 827cf4b8b..94beed093 100755 --- a/campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/bin/autogen.sh +++ b/campcaster/src/tools/libodbc++/libodbc++-0.2.5/bin/autogen.sh @@ -21,9 +21,9 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author$ -# Version : $Revision$ -# Location : $URL$ +# Author : $Author: fgerlits $ +# Version : $Revision: 2674 $ +# Location : $URL: svn://source.campware.org/campcaster/trunk/campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/bin/autogen.sh $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- diff --git a/campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/bin/prepare.sh b/campcaster/src/tools/libodbc++/libodbc++-0.2.5/bin/prepare.sh similarity index 88% rename from campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/bin/prepare.sh rename to campcaster/src/tools/libodbc++/libodbc++-0.2.5/bin/prepare.sh index d6f60e142..171cf4700 100755 --- a/campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/bin/prepare.sh +++ b/campcaster/src/tools/libodbc++/libodbc++-0.2.5/bin/prepare.sh @@ -21,15 +21,15 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author$ -# Version : $Revision$ -# Location : $URL$ +# Author : $Author: fgerlits $ +# Version : $Revision: 3360 $ +# Location : $URL: svn://source.campware.org/campcaster/trunk/campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/bin/prepare.sh $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- # Run this script to prepare libodbc++ 2.3 to be configured and compiled. # To read more about libodbc++, see http://libodbcxx.sourceforge.net/ #------------------------------------------------------------------------------- -product=libodbc++-0.2.4pre4 +product=libodbc++-0.2.5 reldir=`dirname $0`/.. basedir=`cd ${reldir}; pwd;` diff --git a/campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/configure b/campcaster/src/tools/libodbc++/libodbc++-0.2.5/configure similarity index 89% rename from campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/configure rename to campcaster/src/tools/libodbc++/libodbc++-0.2.5/configure index 03e54b0b4..2a983793c 100755 --- a/campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/configure +++ b/campcaster/src/tools/libodbc++/libodbc++-0.2.5/configure @@ -21,9 +21,9 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author$ -# Version : $Revision$ -# Location : $URL$ +# Author : $Author: fgerlits $ +# Version : $Revision: 2329 $ +# Location : $URL: svn://source.campware.org/campcaster/trunk/campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/configure $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- diff --git a/campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/etc/Makefile.in b/campcaster/src/tools/libodbc++/libodbc++-0.2.5/etc/Makefile.in similarity index 91% rename from campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/etc/Makefile.in rename to campcaster/src/tools/libodbc++/libodbc++-0.2.5/etc/Makefile.in index 29168e74f..71781a042 100644 --- a/campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/etc/Makefile.in +++ b/campcaster/src/tools/libodbc++/libodbc++-0.2.5/etc/Makefile.in @@ -20,9 +20,9 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author$ -# Version : $Revision$ -# Location : $URL$ +# Author : $Author: fgerlits $ +# Version : $Revision: 3356 $ +# Location : $URL: svn://source.campware.org/campcaster/trunk/campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/etc/Makefile.in $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -49,7 +49,7 @@ COVERAGE_DIR = ${DOC_DIR}/coverage ETC_DIR = ${BASE_DIR}/etc TMP_DIR = ${BASE_DIR}/tmp -LIBODBCXX_VERSION = libodbc++-0.2.4pre4 +LIBODBCXX_VERSION = libodbc++-0.2.5 LIBODBCXX_DIR = ${TMP_DIR}/${LIBODBCXX_VERSION} diff --git a/campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/etc/configure.ac b/campcaster/src/tools/libodbc++/libodbc++-0.2.5/etc/configure.ac similarity index 83% rename from campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/etc/configure.ac rename to campcaster/src/tools/libodbc++/libodbc++-0.2.5/etc/configure.ac index e59493c45..f3ef7a9b7 100644 --- a/campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/etc/configure.ac +++ b/campcaster/src/tools/libodbc++/libodbc++-0.2.5/etc/configure.ac @@ -20,9 +20,9 @@ dnl along with Campcaster; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl -dnl Author : $Author$ -dnl Version : $Revision$ -dnl Location : $URL$ +dnl Author : $Author: fgerlits $ +dnl Version : $Revision: 3356 $ +dnl Location : $URL: svn://source.campware.org/campcaster/trunk/campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/etc/configure.ac $ dnl----------------------------------------------------------------------------- dnl----------------------------------------------------------------------------- @@ -32,18 +32,18 @@ dnl This is due to the fact that configure spreads a lot of trash around, dnl like atom4te cache directories, config.* files, etc. into the directory dnl it is being run from. We clearly don't want these in our base directory. dnl----------------------------------------------------------------------------- -AC_INIT(libodbc++, 0.2.4pre4, bugs@campware.org) +AC_INIT(libodbc++, 0.2.5, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision$) +AC_REVISION($Revision: 3356 $) -AC_CONFIG_SRCDIR(../src/libodbc++-0.2.4pre4.tar.bz2) +AC_CONFIG_SRCDIR(../src/libodbc++-0.2.5.tar.bz2) dnl untar the sources before anything happens ../bin/prepare.sh -cd ../tmp/libodbc++-0.2.4pre4 +cd ../tmp/libodbc++-0.2.5 ./configure --enable-threads --prefix=$prefix cd - diff --git a/campcaster/src/tools/libodbc++/libodbc++-0.2.5/src/libodbc++-0.2.5.tar.bz2 b/campcaster/src/tools/libodbc++/libodbc++-0.2.5/src/libodbc++-0.2.5.tar.bz2 new file mode 100644 index 000000000..4448b0f58 Binary files /dev/null and b/campcaster/src/tools/libodbc++/libodbc++-0.2.5/src/libodbc++-0.2.5.tar.bz2 differ diff --git a/campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/tmp/.keepme b/campcaster/src/tools/libodbc++/libodbc++-0.2.5/tmp/.keepme similarity index 100% rename from campcaster/src/tools/libodbc++/libodbc++-0.2.4pre4/tmp/.keepme rename to campcaster/src/tools/libodbc++/libodbc++-0.2.5/tmp/.keepme