tags 280901 +patch
thanks
The attached patch changes the Build-Depends from 'libvdk1-dev' to
'libvdk2-dev'. It also replace s/vdk-config/vdk-config-2/ in
'aclocal.m4' and 'configure' and it uses the new VDKTextView instead
of VDKText in vdkxmemo.{h,cc}.
Regards
Andreas Jochens
diff -urN ../tmp-orig/vdkxdb-0.0.4/debian/control ./debian/control
--- ../tmp-orig/vdkxdb-0.0.4/debian/control 2005-04-14 10:13:44.204404718
+0200
+++ ./debian/control 2005-04-14 10:06:50.881227868 +0200
@@ -2,7 +2,7 @@
Priority: optional
Maintainer: Michael Vogt <[EMAIL PROTECTED]>
Standards-Version: 3.1.1
-Build-Depends: debhelper (>> 2.0.0), libgnome-dev, libgtk1.2-dev,
libglib1.2-dev , libvdk1-dev, libxdb-dev, doxygen
+Build-Depends: debhelper (>> 2.0.0), libgnome-dev, libgtk1.2-dev,
libglib1.2-dev , libvdk2-dev, libxdb-dev, doxygen
Package: libvdkxdb0c102
Section: libs
diff -urN ../tmp-orig/vdkxdb-0.0.4/aclocal.m4 ./aclocal.m4
--- ../tmp-orig/vdkxdb-0.0.4/aclocal.m4 2000-08-24 17:55:06.000000000 +0200
+++ ./aclocal.m4 2005-04-14 10:08:13.909983099 +0200
@@ -169,7 +169,7 @@
dnl
AC_DEFUN(AM_PATH_VDK,
[dnl
-dnl Get the cflags and libraries from the vdk-config script
+dnl Get the cflags and libraries from the vdk-config-2 script
dnl
AC_ARG_WITH(vdk-prefix,[ --with-vdk-prefix=PFX Prefix where VDK is
installed (optional)],
vdk_prefix="$withval", vdk_prefix="")
@@ -181,17 +181,17 @@
if test x$vdk_exec_prefix != x ; then
vdk_args="$vdk_args --exec-prefix=$vdk_exec_prefix"
if test x${VDK_CONFIG+set} != xset ; then
- VDK_CONFIG=$vdk_exec_prefix/bin/vdk-config
+ VDK_CONFIG=$vdk_exec_prefix/bin/vdk-config-2
fi
fi
if test x$vdk_prefix != x ; then
vdk_args="$vdk_args --prefix=$vdk_prefix"
if test x${VDK_CONFIG+set} != xset ; then
- VDK_CONFIG=$vdk_prefix/bin/vdk-config
+ VDK_CONFIG=$vdk_prefix/bin/vdk-config-2
fi
fi
- AC_PATH_PROG(VDK_CONFIG, vdk-config, no)
+ AC_PATH_PROG(VDK_CONFIG, vdk-config-2, no)
min_vdk_version=ifelse([$1], ,1.2.3,$1)
AC_MSG_CHECKING(for VDK - version >= $min_vdk_version)
no_vdk=""
@@ -217,7 +217,7 @@
LIBS="$LIBS $VDK_LIBS"
dnl
dnl Now check if the installed VDK is sufficiently new. (Also sanity
-dnl checks the results of vdk-config to some extent
+dnl checks the results of vdk-config-2 to some extent
dnl
rm -f conf.vdktest
AC_TRY_RUN([
@@ -238,11 +238,11 @@
}
else
{
- printf("\n*** 'vdk-config --version' returned %d.%d, but the minimum
version\n", $vdk_major_version, $vdk_minor_version);
- printf("*** of VDK required is %d.%d. If vdk-config is correct, then it
is\n", VDK_VERSION_MAJOR, VDK_VERSION_MINOR);
+ printf("\n*** 'vdk-config-2 --version' returned %d.%d, but the minimum
version\n", $vdk_major_version, $vdk_minor_version);
+ printf("*** of VDK required is %d.%d. If vdk-config-2 is correct, then
it is\n", VDK_VERSION_MAJOR, VDK_VERSION_MINOR);
printf("*** best to upgrade to the required version.\n");
- printf("*** If vdk-config was wrong, set the environment variable
VDK_CONFIG\n");
- printf("*** to point to the correct copy of vdk-config, and remove the
file\n");
+ printf("*** If vdk-config-2 was wrong, set the environment variable
VDK_CONFIG\n");
+ printf("*** to point to the correct copy of vdk-config-2, and remove the
file\n");
printf("*** config.cache before re-running configure\n");
return 1;
}
@@ -259,10 +259,10 @@
else
AC_MSG_RESULT(no)
if test "$VDK_CONFIG" = "no" ; then
- echo "*** The vdk-config script installed by VDK could not be found"
+ echo "*** The vdk-config-2 script installed by VDK could not be found"
echo "*** If VDK was installed in PREFIX, make sure PREFIX/bin is in"
echo "*** your path, or set the VDK_CONFIG environment variable to the"
- echo "*** full path to vdk-config."
+ echo "*** full path to vdk-config-2."
else
if test -f conf.vdktest ; then
:
@@ -286,7 +286,7 @@
[ echo "*** The test program failed to compile or link. See the file
config.log for the"
echo "*** exact error that occured. This usually means VDK was
incorrectly installed"
echo "*** or that you have moved VDK since it was installed. In the
latter case, you"
- echo "*** may want to edit the vdk-config script: $VDK_CONFIG" ])
+ echo "*** may want to edit the vdk-config-2 script: $VDK_CONFIG" ])
CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
fi
diff -urN ../tmp-orig/vdkxdb-0.0.4/configure ./configure
--- ../tmp-orig/vdkxdb-0.0.4/configure 2005-04-14 10:13:44.201405304 +0200
+++ ./configure 2005-04-14 10:08:39.878903165 +0200
@@ -931,18 +931,18 @@
if test x$vdk_exec_prefix != x ; then
vdk_args="$vdk_args --exec-prefix=$vdk_exec_prefix"
if test x${VDK_CONFIG+set} != xset ; then
- VDK_CONFIG=$vdk_exec_prefix/bin/vdk-config
+ VDK_CONFIG=$vdk_exec_prefix/bin/vdk-config-2
fi
fi
if test x$vdk_prefix != x ; then
vdk_args="$vdk_args --prefix=$vdk_prefix"
if test x${VDK_CONFIG+set} != xset ; then
- VDK_CONFIG=$vdk_prefix/bin/vdk-config
+ VDK_CONFIG=$vdk_prefix/bin/vdk-config-2
fi
fi
- # Extract the first word of "vdk-config", so it can be a program name with
args.
-set dummy vdk-config; ac_word=$2
+ # Extract the first word of "vdk-config-2", so it can be a program name with
args.
+set dummy vdk-config-2; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:948: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_VDK_CONFIG'+set}'`\" = set"; then
@@ -1032,11 +1032,11 @@
}
else
{
- printf("\n*** 'vdk-config --version' returned %d.%d, but the minimum
version\n", $vdk_major_version, $vdk_minor_version);
- printf("*** of VDK required is %d.%d. If vdk-config is correct, then it
is\n", VDK_VERSION_MAJOR, VDK_VERSION_MINOR);
+ printf("\n*** 'vdk-config-2 --version' returned %d.%d, but the minimum
version\n", $vdk_major_version, $vdk_minor_version);
+ printf("*** of VDK required is %d.%d. If vdk-config-2 is correct, then
it is\n", VDK_VERSION_MAJOR, VDK_VERSION_MINOR);
printf("*** best to upgrade to the required version.\n");
- printf("*** If vdk-config was wrong, set the environment variable
VDK_CONFIG\n");
- printf("*** to point to the correct copy of vdk-config, and remove the
file\n");
+ printf("*** If vdk-config-2 was wrong, set the environment variable
VDK_CONFIG\n");
+ printf("*** to point to the correct copy of vdk-config-2, and remove the
file\n");
printf("*** config.cache before re-running configure\n");
return 1;
}
@@ -1066,10 +1066,10 @@
else
echo "$ac_t""no" 1>&6
if test "$VDK_CONFIG" = "no" ; then
- echo "*** The vdk-config script installed by VDK could not be found"
+ echo "*** The vdk-config-2 script installed by VDK could not be found"
echo "*** If VDK was installed in PREFIX, make sure PREFIX/bin is in"
echo "*** your path, or set the VDK_CONFIG environment variable to the"
- echo "*** full path to vdk-config."
+ echo "*** full path to vdk-config-2."
else
if test -f conf.vdktest ; then
:
@@ -1106,7 +1106,7 @@
echo "*** The test program failed to compile or link. See the file
config.log for the"
echo "*** exact error that occured. This usually means VDK was
incorrectly installed"
echo "*** or that you have moved VDK since it was installed. In the
latter case, you"
- echo "*** may want to edit the vdk-config script: $VDK_CONFIG"
+ echo "*** may want to edit the vdk-config-2 script: $VDK_CONFIG"
fi
rm -f conftest*
CXXFLAGS="$ac_save_CXXFLAGS"
diff -urN ../tmp-orig/vdkxdb-0.0.4/include/vdkxdb/vdkxmemo.h
./include/vdkxdb/vdkxmemo.h
--- ../tmp-orig/vdkxdb-0.0.4/include/vdkxdb/vdkxmemo.h 2000-05-22
18:23:56.000000000 +0200
+++ ./include/vdkxdb/vdkxmemo.h 2005-04-14 10:12:44.863001918 +0200
@@ -29,7 +29,7 @@
#ifndef _vdkxmemo_h
#define _vdkxmemo_h
#include <vdkxdb/vdkxctrl.h>
-#include <vdk/text.h>
+#include <vdk/vdktextview.h>
/*!
@@ -38,7 +38,7 @@
This control uses an underlying xdb memo field.
*/
-class VDKXMemo: public VDKText, public VDKXControl
+class VDKXMemo: public VDKTextView, public VDKXControl
{
protected:
diff -urN ../tmp-orig/vdkxdb-0.0.4/src/vdkxmemo.cc ./src/vdkxmemo.cc
--- ../tmp-orig/vdkxdb-0.0.4/src/vdkxmemo.cc 2000-05-02 11:26:59.000000000
+0200
+++ ./src/vdkxmemo.cc 2005-04-14 10:13:33.401515785 +0200
@@ -30,7 +30,7 @@
VDKXMemo::VDKXMemo(VDKForm* owner,bool editable):
- VDKText(owner,editable), VDKXControl()
+ VDKTextView(owner), VDKXControl()
{
}
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
