Hello community,
here is the log from the commit of package gwenhywfar for openSUSE:Factory
checked in at Sun Oct 2 10:12:41 CEST 2011.
--------
--- openSUSE:Factory/gwenhywfar/gwenhywfar.changes 2011-09-23 02:02:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/gwenhywfar/gwenhywfar.changes 2011-09-28 10:50:16.000000000 +0200
@@ -1,0 +2,12 @@
+Wed Sep 28 08:41:14 UTC 2011 - vuntz@opensuse.org
+
+- Add gwenhywfar-gnutls-3.0.3.patch: fix build with gnutls 3.0.3.
+
+-------------------------------------------------------------------
+Wed Sep 21 08:37:48 UTC 2011 - kruber@zib.de
+
+- Update to version 4.3.0:
+ + added a new method for converting charsets
+ + better error handling in the build system
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gwenhywfar-4.2.1.tar.gz
New:
----
gwenhywfar-4.3.0.tar.gz
gwenhywfar-gnutls-3.0.3.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gwenhywfar.spec ++++++
--- /var/tmp/diff_new_pack.8xZY3H/_old 2011-10-02 10:12:32.000000000 +0200
+++ /var/tmp/diff_new_pack.8xZY3H/_new 2011-10-02 10:12:32.000000000 +0200
@@ -18,14 +18,16 @@
Name: gwenhywfar
-Version: 4.2.1
+Version: 4.3.0
Release: 1
License: GPL-2.0+; LGPL-2.1+
Summary: Multiplatform Helper Library for Other Libraries
Url: http://www.aqbanking.de/
Group: System/Libraries
Source: %{name}-%{version}.tar.gz
-#Source: http://www2.aquamaniac.de/sites/download/download.php?package=01&release=62&file=01&dummy=gwenhywfar-4.2.0.tar.gz
+#Source: http://www2.aquamaniac.de/sites/download/download.php?package=01&release=64&file=01&dummy=gwenhywfar-4.3.0.tar.gz
+# PATCH-FIX-UPSTREAM gwenhywfar-gnutls-3.0.3.patch vuntz@opensuse.org -- Drop deprecated and unneeded call to gnutls_transport_set_lowat. Sent upstream by mail on 2011-09-28
+Patch0: gwenhywfar-gnutls-3.0.3.patch
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: gnutls-devel
@@ -135,6 +137,7 @@
%lang_package
%prep
%setup -q
+%patch0 -p1
%build
%configure\
++++++ gwenhywfar-4.2.1.tar.gz -> gwenhywfar-4.3.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/ChangeLog new/gwenhywfar-4.3.0/ChangeLog
--- old/gwenhywfar-4.2.1/ChangeLog 2011-08-01 20:38:08.000000000 +0200
+++ new/gwenhywfar-4.3.0/ChangeLog 2011-08-20 17:41:19.000000000 +0200
@@ -1,4 +1,26 @@
------------------------------------------------------------------
+2011-08-20 15:41:07 +0000 martin
+Prepared release 4.3.0.
+git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2117 70169cfe-8b10-0410-8925-dcb4b91034d8
+
+------------------------------------------------------------------
+2011-08-20 15:41:04 +0000 martin
+Added function GWEN_Text_ConvertCharset().
+This function will be used by AqBanking's OFX plugin (and possibly others).
+
+git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2116 70169cfe-8b10-0410-8925-dcb4b91034d8
+
+------------------------------------------------------------------
+2011-08-20 15:41:00 +0000 martin
+Added typemaker2 type "double".
+git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2115 70169cfe-8b10-0410-8925-dcb4b91034d8
+
+------------------------------------------------------------------
+2011-08-01 18:38:22 +0000 martin
+Prepared release 4.2.1.
+git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2114 70169cfe-8b10-0410-8925-dcb4b91034d8
+
+------------------------------------------------------------------
2011-08-01 16:45:48 +0000 martin
Relaxed http code.
git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2113 70169cfe-8b10-0410-8925-dcb4b91034d8
@@ -573,23 +595,3 @@
2010-11-13 12:56:11 +0000 martin
Prepared release 4.0.2.
git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2018 70169cfe-8b10-0410-8925-dcb4b91034d8
-
-------------------------------------------------------------------
-2010-11-13 12:08:07 +0000 martin
-Fixed a bug as pointed out by Martin von Gagern (who also provided a fix).
-git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2017 70169cfe-8b10-0410-8925-dcb4b91034d8
-
-------------------------------------------------------------------
-2010-09-15 16:11:53 +0000 martin
-Added gource script.
-git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2016 70169cfe-8b10-0410-8925-dcb4b91034d8
-
-------------------------------------------------------------------
-2010-09-15 16:11:50 +0000 martin
-Gtk2: Use visibility property of GtkEntry to hide the password entry. Patch by Christian Stimming.
-git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2015 70169cfe-8b10-0410-8925-dcb4b91034d8
-
-------------------------------------------------------------------
-2010-09-02 21:27:43 +0000 martin
-Increased version numbers.
-git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2014 70169cfe-8b10-0410-8925-dcb4b91034d8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/Makefile.in new/gwenhywfar-4.3.0/Makefile.in
--- old/gwenhywfar-4.2.1/Makefile.in 2011-08-01 20:22:19.000000000 +0200
+++ new/gwenhywfar-4.3.0/Makefile.in 2011-09-20 22:02:41.000000000 +0200
@@ -172,6 +172,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/admin/Makefile.in new/gwenhywfar-4.3.0/admin/Makefile.in
--- old/gwenhywfar-4.2.1/admin/Makefile.in 2011-08-01 20:22:15.000000000 +0200
+++ new/gwenhywfar-4.3.0/admin/Makefile.in 2011-09-20 22:02:38.000000000 +0200
@@ -107,6 +107,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/checks/Makefile.in new/gwenhywfar-4.3.0/checks/Makefile.in
--- old/gwenhywfar-4.2.1/checks/Makefile.in 2011-08-01 20:22:15.000000000 +0200
+++ new/gwenhywfar-4.3.0/checks/Makefile.in 2011-09-20 22:02:38.000000000 +0200
@@ -116,6 +116,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/config.h.in new/gwenhywfar-4.3.0/config.h.in
--- old/gwenhywfar-4.2.1/config.h.in 2011-08-01 20:37:14.000000000 +0200
+++ new/gwenhywfar-4.3.0/config.h.in 2011-09-20 22:02:21.000000000 +0200
@@ -161,7 +161,7 @@
/* Defined if OpenSSL is available */
#undef HAVE_OPENSSL
-/* whether QT4 is available */
+/* whether Qt4 is available */
#undef HAVE_QT4
/* Define to 1 if you have the `random' function. */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/configure new/gwenhywfar-4.3.0/configure
--- old/gwenhywfar-4.2.1/configure 2011-08-01 20:22:20.000000000 +0200
+++ new/gwenhywfar-4.3.0/configure 2011-09-20 22:02:07.000000000 +0200
@@ -827,6 +827,7 @@
LIBGCRYPT_CONFIG
LIBGCRYPT_LIBS
LIBGCRYPT_CFLAGS
+DPKG_ARCH
PROFILING_LDFLAGS
PROFILING_CFLAGS
gwenhywfar_cfg_searchdir
@@ -1029,7 +1030,6 @@
enable_fox
with_fox_includes
with_fox_libs
-enable_qt4
with_qt4_includes
with_qt4_libs
with_qt4_moc
@@ -1706,7 +1706,6 @@
--enable-profiling enable profiling (default=no)
--enable-ssl enable SSL features (default=yes)
--enable-fox enable fox (default=yes)
- --enable-qt4 enable qt4 (default=yes)
--enable-release make this an official release (default=no)
--enable-visibility enable visibility (default=no)
--enable-export enable export (default=yes)
@@ -2872,8 +2871,8 @@
# versions
#
GWENHYWFAR_VERSION_MAJOR=4
-GWENHYWFAR_VERSION_MINOR=2
-GWENHYWFAR_VERSION_PATCHLEVEL=1
+GWENHYWFAR_VERSION_MINOR=3
+GWENHYWFAR_VERSION_PATCHLEVEL=0
GWENHYWFAR_VERSION_BUILD=0
GWENHYWFAR_VERSION_TAG="stable"
@@ -2883,9 +2882,9 @@
#
# SO version for Gwenhywfar
#
-GWENHYWFAR_SO_CURRENT="62"
-GWENHYWFAR_SO_AGE="2"
-GWENHYWFAR_SO_REVISION="1"
+GWENHYWFAR_SO_CURRENT="63"
+GWENHYWFAR_SO_AGE="3"
+GWENHYWFAR_SO_REVISION="0"
GWENHYWFAR_SO_EFFECTIVE="`echo \$(($GWENHYWFAR_SO_CURRENT-$GWENHYWFAR_SO_AGE))`"
@@ -6105,13 +6104,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:6108: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:6107: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:6111: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:6110: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:6114: output\"" >&5)
+ (eval echo "\"\$as_me:6113: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -7317,7 +7316,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7320 "configure"' > conftest.$ac_ext
+ echo '#line 7319 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9313,11 +9312,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9316: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9315: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9320: \$? = $ac_status" >&5
+ echo "$as_me:9319: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9652,11 +9651,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9655: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9654: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9659: \$? = $ac_status" >&5
+ echo "$as_me:9658: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9757,11 +9756,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9760: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9759: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9764: \$? = $ac_status" >&5
+ echo "$as_me:9763: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9812,11 +9811,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9815: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9814: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9819: \$? = $ac_status" >&5
+ echo "$as_me:9818: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12196,7 +12195,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12199 "configure"
+#line 12198 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12292,7 +12291,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12295 "configure"
+#line 12294 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14248,11 +14247,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14251: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14250: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14255: \$? = $ac_status" >&5
+ echo "$as_me:14254: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14347,11 +14346,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14350: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14349: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14354: \$? = $ac_status" >&5
+ echo "$as_me:14353: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14399,11 +14398,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14402: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14401: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14406: \$? = $ac_status" >&5
+ echo "$as_me:14405: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18372,6 +18371,130 @@
+
+###-------------------------------------------------------------------------
+#
+# check for Debian multiarch paths
+#
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}dpkg-architecture", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dpkg-architecture; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_DPKG_ARCH+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $DPKG_ARCH in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_DPKG_ARCH="$DPKG_ARCH" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_DPKG_ARCH="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+DPKG_ARCH=$ac_cv_path_DPKG_ARCH
+if test -n "$DPKG_ARCH"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DPKG_ARCH" >&5
+$as_echo "$DPKG_ARCH" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_DPKG_ARCH"; then
+ ac_pt_DPKG_ARCH=$DPKG_ARCH
+ # Extract the first word of "dpkg-architecture", so it can be a program name with args.
+set dummy dpkg-architecture; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_DPKG_ARCH+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_pt_DPKG_ARCH in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_DPKG_ARCH="$ac_pt_DPKG_ARCH" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_DPKG_ARCH="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_DPKG_ARCH=$ac_cv_path_ac_pt_DPKG_ARCH
+if test -n "$ac_pt_DPKG_ARCH"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DPKG_ARCH" >&5
+$as_echo "$ac_pt_DPKG_ARCH" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_pt_DPKG_ARCH" = x; then
+ DPKG_ARCH=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ DPKG_ARCH=$ac_pt_DPKG_ARCH
+ fi
+else
+ DPKG_ARCH="$ac_cv_path_DPKG_ARCH"
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for multiarch paths" >&5
+$as_echo_n "checking for multiarch paths... " >&6; }
+multiarch_triplet=""
+DEBIAN_MULTIARCH_DIRS=""
+if test -n "$DPKG_ARCH"; then
+ multiarch_triplet=$($DPKG_ARCH -qDEB_HOST_MULTIARCH 2> /dev/null)
+ if test -z "$multiarch_triplet"; then
+ multiarch_triplet=$($DPKG_ARCH -qDEB_HOST_GNU_TYPE)
+ fi
+fi
+if test -n "$multiarch_triplet"; then
+ DEBIAN_MULTIARCH_DIRS="/lib/$multiarch_triplet /usr/lib/$multiarch_triplet"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEBIAN_MULTIARCH_DIRS" >&5
+$as_echo "$DEBIAN_MULTIARCH_DIRS" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+fi
+
+
+
###-------------------------------------------------------------------------
#
# check for libgcrypt
@@ -19872,29 +19995,6 @@
*qt4*)
-lforce=""
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if QT4 is allowed" >&5
-$as_echo_n "checking if QT4 is allowed... " >&6; }
-# Check whether --enable-qt4 was given.
-if test "${enable_qt4+set}" = set; then :
- enableval=$enable_qt4; enable_qt4="$enableval"
-else
- enable_qt4="yes"
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_qt4" >&5
-$as_echo "$enable_qt4" >&6; }
-
-if test "$enable_qt4" = "no"; then
- qt4_libs=""
- qt4_includes=""
- qt4_moc=""
- qt4_uic=""
- have_qt4="no"
-else
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt4 includes" >&5
$as_echo_n "checking for qt4 includes... " >&6; }
@@ -19969,6 +20069,7 @@
local_qt4_libs="\
$qt4_dir/lib${libdirsuffix} \
$QTDIR/lib${libdirsuffix} \
+ $DEBIAN_MULTIARCH_DIRS \
/usr/lib/qt4 \
/usr/local/lib/qt4 \
/usr/lib/qt4/lib${libdirsuffix} \
@@ -20167,29 +20268,12 @@
qt4_uic=""
qt4_includes=""
have_qt4="no"
- if test "$lforce" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
- Compilation of QT applications is enabled but I could not find some QT
- components (see which are missing in messages above).
- If you don't want to compile QT4 applications please use \"--disable-qt4\".
- " >&5
-$as_echo "$as_me: WARNING:
- Compilation of QT applications is enabled but I could not find some QT
+ as_fn_error $? "
+ Compilation of QT applications is enabled but I could not find some Qt
components (see which are missing in messages above).
- If you don't want to compile QT4 applications please use \"--disable-qt4\".
- " >&2;}
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
- QT4 is not explicitly disabled and I could not find some QT4 components
- (see which are missing in messages above).
- If you don't want to compile QT4 applications please use \"--disable-qt4\".
- " >&5
-$as_echo "$as_me: WARNING:
- QT4 is not explicitly disabled and I could not find some QT4 components
- (see which are missing in messages above).
- If you don't want to compile QT4 applications please use \"--disable-qt4\".
- " >&2;}
- fi
+ If you don't want to compile Qt4 applications please explicitly specify
+ which GUIs you want to support using \"--with-guis\".
+ " "$LINENO" 5
else
have_qt4="yes"
@@ -20198,8 +20282,6 @@
fi
-fi
-
GIVEN_CFLAGS=$qt4_includes
INCLUDE_DIRS=`echo | cpp -v 2>&1`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/configure.ac new/gwenhywfar-4.3.0/configure.ac
--- old/gwenhywfar-4.2.1/configure.ac 2011-08-01 20:22:02.000000000 +0200
+++ new/gwenhywfar-4.3.0/configure.ac 2011-09-20 22:01:22.000000000 +0200
@@ -28,8 +28,8 @@
# versions
#
GWENHYWFAR_VERSION_MAJOR=4
-GWENHYWFAR_VERSION_MINOR=2
-GWENHYWFAR_VERSION_PATCHLEVEL=1
+GWENHYWFAR_VERSION_MINOR=3
+GWENHYWFAR_VERSION_PATCHLEVEL=0
GWENHYWFAR_VERSION_BUILD=0
dnl "stable", "rcX", "betaX", "cvs"
GWENHYWFAR_VERSION_TAG="stable"
@@ -40,9 +40,9 @@
#
# SO version for Gwenhywfar
#
-GWENHYWFAR_SO_CURRENT="62"
-GWENHYWFAR_SO_AGE="2"
-GWENHYWFAR_SO_REVISION="1"
+GWENHYWFAR_SO_CURRENT="63"
+GWENHYWFAR_SO_AGE="3"
+GWENHYWFAR_SO_REVISION="0"
GWENHYWFAR_SO_EFFECTIVE="`echo \$(($GWENHYWFAR_SO_CURRENT-$GWENHYWFAR_SO_AGE))`"
@@ -567,6 +567,30 @@
AC_SUBST(PROFILING_LDFLAGS)
+
+###-------------------------------------------------------------------------
+#
+# check for Debian multiarch paths
+#
+AC_PATH_TOOL([DPKG_ARCH], [dpkg-architecture])
+AC_MSG_CHECKING([for multiarch paths])
+multiarch_triplet=""
+DEBIAN_MULTIARCH_DIRS=""
+if test -n "$DPKG_ARCH"; then
+ multiarch_triplet=$($DPKG_ARCH -qDEB_HOST_MULTIARCH 2> /dev/null)
+ if test -z "$multiarch_triplet"; then
+ multiarch_triplet=$($DPKG_ARCH -qDEB_HOST_GNU_TYPE)
+ fi
+fi
+if test -n "$multiarch_triplet"; then
+ DEBIAN_MULTIARCH_DIRS="/lib/$multiarch_triplet /usr/lib/$multiarch_triplet"
+ AC_MSG_RESULT([$DEBIAN_MULTIARCH_DIRS])
+else
+ AC_MSG_RESULT([not found])
+fi
+
+
+
###-------------------------------------------------------------------------
#
# check for libgcrypt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/data/Makefile.in new/gwenhywfar-4.3.0/data/Makefile.in
--- old/gwenhywfar-4.2.1/data/Makefile.in 2011-08-01 20:22:15.000000000 +0200
+++ new/gwenhywfar-4.3.0/data/Makefile.in 2011-09-20 22:02:39.000000000 +0200
@@ -110,6 +110,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/doc/Makefile.in new/gwenhywfar-4.3.0/doc/Makefile.in
--- old/gwenhywfar-4.2.1/doc/Makefile.in 2011-08-01 20:22:15.000000000 +0200
+++ new/gwenhywfar-4.3.0/doc/Makefile.in 2011-09-20 22:02:39.000000000 +0200
@@ -126,6 +126,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/doc/dialog/Makefile.in new/gwenhywfar-4.3.0/doc/dialog/Makefile.in
--- old/gwenhywfar-4.2.1/doc/dialog/Makefile.in 2011-08-01 20:22:15.000000000 +0200
+++ new/gwenhywfar-4.3.0/doc/dialog/Makefile.in 2011-09-20 22:02:39.000000000 +0200
@@ -125,6 +125,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/doc/dialog/images/Makefile.in new/gwenhywfar-4.3.0/doc/dialog/images/Makefile.in
--- old/gwenhywfar-4.2.1/doc/dialog/images/Makefile.in 2011-08-01 20:22:16.000000000 +0200
+++ new/gwenhywfar-4.3.0/doc/dialog/images/Makefile.in 2011-09-20 22:02:39.000000000 +0200
@@ -85,6 +85,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/doc/inherit/Makefile.in new/gwenhywfar-4.3.0/doc/inherit/Makefile.in
--- old/gwenhywfar-4.2.1/doc/inherit/Makefile.in 2011-08-01 20:22:16.000000000 +0200
+++ new/gwenhywfar-4.3.0/doc/inherit/Makefile.in 2011-09-20 22:02:39.000000000 +0200
@@ -119,6 +119,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/gui/Makefile.in new/gwenhywfar-4.3.0/gui/Makefile.in
--- old/gwenhywfar-4.2.1/gui/Makefile.in 2011-08-01 20:22:16.000000000 +0200
+++ new/gwenhywfar-4.3.0/gui/Makefile.in 2011-09-20 22:02:39.000000000 +0200
@@ -124,6 +124,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/gui/cocoa/Makefile.in new/gwenhywfar-4.3.0/gui/cocoa/Makefile.in
--- old/gwenhywfar-4.2.1/gui/cocoa/Makefile.in 2011-08-01 20:22:16.000000000 +0200
+++ new/gwenhywfar-4.3.0/gui/cocoa/Makefile.in 2011-09-20 22:02:39.000000000 +0200
@@ -155,6 +155,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/gui/cpp/Makefile.in new/gwenhywfar-4.3.0/gui/cpp/Makefile.in
--- old/gwenhywfar-4.2.1/gui/cpp/Makefile.in 2011-08-01 20:22:16.000000000 +0200
+++ new/gwenhywfar-4.3.0/gui/cpp/Makefile.in 2011-09-20 22:02:39.000000000 +0200
@@ -131,6 +131,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/gui/fox16/Makefile.in new/gwenhywfar-4.3.0/gui/fox16/Makefile.in
--- old/gwenhywfar-4.2.1/gui/fox16/Makefile.in 2011-08-01 20:22:16.000000000 +0200
+++ new/gwenhywfar-4.3.0/gui/fox16/Makefile.in 2011-09-20 22:02:39.000000000 +0200
@@ -150,6 +150,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/gui/gtk2/Makefile.in new/gwenhywfar-4.3.0/gui/gtk2/Makefile.in
--- old/gwenhywfar-4.2.1/gui/gtk2/Makefile.in 2011-08-01 20:22:16.000000000 +0200
+++ new/gwenhywfar-4.3.0/gui/gtk2/Makefile.in 2011-09-20 22:02:39.000000000 +0200
@@ -147,6 +147,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/gui/gtk2/gtk2_gui_dialog.c new/gwenhywfar-4.3.0/gui/gtk2/gtk2_gui_dialog.c
--- old/gwenhywfar-4.2.1/gui/gtk2/gtk2_gui_dialog.c 2010-09-01 12:52:21.000000000 +0200
+++ new/gwenhywfar-4.3.0/gui/gtk2/gtk2_gui_dialog.c 2011-08-24 17:13:36.000000000 +0200
@@ -221,7 +221,7 @@
g_list_free(tll);
if (topLevel) {
- DBG_ERROR(GWEN_LOGDOMAIN, "Found active window found [%s]",
+ DBG_ERROR(GWEN_LOGDOMAIN, "Found active window [%s]",
gtk_window_get_title(topLevel));
gtk_window_set_transient_for(gw, topLevel);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/gui/qt4/Makefile.in new/gwenhywfar-4.3.0/gui/qt4/Makefile.in
--- old/gwenhywfar-4.2.1/gui/qt4/Makefile.in 2011-08-01 20:22:16.000000000 +0200
+++ new/gwenhywfar-4.3.0/gui/qt4/Makefile.in 2011-09-20 22:02:39.000000000 +0200
@@ -151,6 +151,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/gui/testdialogs/Makefile.in new/gwenhywfar-4.3.0/gui/testdialogs/Makefile.in
--- old/gwenhywfar-4.2.1/gui/testdialogs/Makefile.in 2011-08-01 20:22:16.000000000 +0200
+++ new/gwenhywfar-4.3.0/gui/testdialogs/Makefile.in 2011-09-20 22:02:39.000000000 +0200
@@ -109,6 +109,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/gwenhywfar.spec new/gwenhywfar-4.3.0/gwenhywfar.spec
--- old/gwenhywfar-4.2.1/gwenhywfar.spec 2011-08-01 20:22:28.000000000 +0200
+++ new/gwenhywfar-4.3.0/gwenhywfar.spec 2011-09-20 22:02:48.000000000 +0200
@@ -3,7 +3,7 @@
%define name gwenhywfar
-%define version 4.2.1
+%define version 4.3.0
%define rpm_cxxflags \"-O2 -march=i486 -mcpu=i586\"
%define rpm_cflags \"-O2 -march=i486 -mcpu=i586\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/m4/Makefile.in new/gwenhywfar-4.3.0/m4/Makefile.in
--- old/gwenhywfar-4.2.1/m4/Makefile.in 2011-08-01 20:22:16.000000000 +0200
+++ new/gwenhywfar-4.3.0/m4/Makefile.in 2011-09-20 22:02:40.000000000 +0200
@@ -85,6 +85,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/m4/qt4.m4 new/gwenhywfar-4.3.0/m4/qt4.m4
--- old/gwenhywfar-4.2.1/m4/qt4.m4 2011-04-18 19:16:22.000000000 +0200
+++ new/gwenhywfar-4.3.0/m4/qt4.m4 2011-09-20 22:01:22.000000000 +0200
@@ -6,10 +6,8 @@
AC_DEFUN([AQ_CHECK_QT4],[
dnl PREREQUISITES:
dnl AQ_CHECK_OS must be called before this
-dnl IN:
-dnl $1 = "yes" if QT4 is needed, "no" if QT4 is optional
-dnl You may preset the return variables.
-dnl All variables which already have a value will not be altered
+dnl IN:
+dnl nothing
dnl OUT:
dnl Variables:
dnl have_qt4 - set to "yes" if QT4 exists
@@ -20,24 +18,6 @@
dnl Defines:
dnl HAVE_QT4
-lforce="$1"
-
-AC_MSG_CHECKING(if QT4 is allowed)
-AC_ARG_ENABLE(qt4,
- [ --enable-qt4 enable qt4 (default=yes)],
- enable_qt4="$enableval",
- enable_qt4="yes")
-AC_MSG_RESULT($enable_qt4)
-
-if test "$enable_qt4" = "no"; then
- qt4_libs=""
- qt4_includes=""
- qt4_moc=""
- qt4_uic=""
- have_qt4="no"
-else
-
-
dnl paths for qt4 includes
AC_MSG_CHECKING(for qt4 includes)
AC_ARG_WITH(qt4-includes,
@@ -104,6 +84,7 @@
[local_qt4_libs="\
$qt4_dir/lib${libdirsuffix} \
$QTDIR/lib${libdirsuffix} \
+ $DEBIAN_MULTIARCH_DIRS \
/usr/lib/qt4 \
/usr/local/lib/qt4 \
/usr/lib/qt4/lib${libdirsuffix} \
@@ -271,29 +252,19 @@
qt4_uic=""
qt4_includes=""
have_qt4="no"
- if test "$lforce" = "yes"; then
- AC_MSG_WARN([
- Compilation of QT applications is enabled but I could not find some QT
+ AC_MSG_ERROR([
+ Compilation of QT applications is enabled but I could not find some Qt
components (see which are missing in messages above).
- If you don't want to compile QT4 applications please use "--disable-qt4".
+ If you don't want to compile Qt4 applications please explicitly specify
+ which GUIs you want to support using "--with-guis".
])
- else
- AC_MSG_WARN([
- QT4 is not explicitly disabled and I could not find some QT4 components
- (see which are missing in messages above).
- If you don't want to compile QT4 applications please use "--disable-qt4".
- ])
- fi
else
dnl TODO: AC_TRY_RUN, check whether qversion.h has matching versions
have_qt4="yes"
- AC_DEFINE(HAVE_QT4, 1, [whether QT4 is available])
+ AC_DEFINE(HAVE_QT4, 1, [whether Qt4 is available])
fi
-dnl end of if "$enable_qt4"
-fi
-
AS_SCRUB_INCLUDE(qt4_includes)
AC_SUBST(qt4_libs)
AC_SUBST(qt4_includes)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/plugins/Makefile.in new/gwenhywfar-4.3.0/plugins/Makefile.in
--- old/gwenhywfar-4.2.1/plugins/Makefile.in 2011-08-01 20:22:16.000000000 +0200
+++ new/gwenhywfar-4.3.0/plugins/Makefile.in 2011-09-20 22:02:40.000000000 +0200
@@ -125,6 +125,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/plugins/configmgr/Makefile.in new/gwenhywfar-4.3.0/plugins/configmgr/Makefile.in
--- old/gwenhywfar-4.2.1/plugins/configmgr/Makefile.in 2011-08-01 20:22:16.000000000 +0200
+++ new/gwenhywfar-4.3.0/plugins/configmgr/Makefile.in 2011-09-20 22:02:40.000000000 +0200
@@ -124,6 +124,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/plugins/configmgr/dir/Makefile.in new/gwenhywfar-4.3.0/plugins/configmgr/dir/Makefile.in
--- old/gwenhywfar-4.2.1/plugins/configmgr/dir/Makefile.in 2011-08-01 20:22:16.000000000 +0200
+++ new/gwenhywfar-4.3.0/plugins/configmgr/dir/Makefile.in 2011-09-20 22:02:40.000000000 +0200
@@ -136,6 +136,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/plugins/ct/Makefile.in new/gwenhywfar-4.3.0/plugins/ct/Makefile.in
--- old/gwenhywfar-4.2.1/plugins/ct/Makefile.in 2011-08-01 20:22:17.000000000 +0200
+++ new/gwenhywfar-4.3.0/plugins/ct/Makefile.in 2011-09-20 22:02:40.000000000 +0200
@@ -124,6 +124,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/plugins/ct/ohbci/Makefile.in new/gwenhywfar-4.3.0/plugins/ct/ohbci/Makefile.in
--- old/gwenhywfar-4.2.1/plugins/ct/ohbci/Makefile.in 2011-08-01 20:22:17.000000000 +0200
+++ new/gwenhywfar-4.3.0/plugins/ct/ohbci/Makefile.in 2011-09-20 22:02:40.000000000 +0200
@@ -137,6 +137,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/plugins/dbio/Makefile.in new/gwenhywfar-4.3.0/plugins/dbio/Makefile.in
--- old/gwenhywfar-4.2.1/plugins/dbio/Makefile.in 2011-08-01 20:22:17.000000000 +0200
+++ new/gwenhywfar-4.3.0/plugins/dbio/Makefile.in 2011-09-20 22:02:40.000000000 +0200
@@ -124,6 +124,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/plugins/dbio/csv/Makefile.in new/gwenhywfar-4.3.0/plugins/dbio/csv/Makefile.in
--- old/gwenhywfar-4.2.1/plugins/dbio/csv/Makefile.in 2011-08-01 20:22:17.000000000 +0200
+++ new/gwenhywfar-4.3.0/plugins/dbio/csv/Makefile.in 2011-09-20 22:02:40.000000000 +0200
@@ -137,6 +137,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/plugins/dbio/olddb/Makefile.in new/gwenhywfar-4.3.0/plugins/dbio/olddb/Makefile.in
--- old/gwenhywfar-4.2.1/plugins/dbio/olddb/Makefile.in 2011-08-01 20:22:17.000000000 +0200
+++ new/gwenhywfar-4.3.0/plugins/dbio/olddb/Makefile.in 2011-09-20 22:02:40.000000000 +0200
@@ -137,6 +137,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/plugins/dbio/xmldb/Makefile.in new/gwenhywfar-4.3.0/plugins/dbio/xmldb/Makefile.in
--- old/gwenhywfar-4.2.1/plugins/dbio/xmldb/Makefile.in 2011-08-01 20:22:17.000000000 +0200
+++ new/gwenhywfar-4.3.0/plugins/dbio/xmldb/Makefile.in 2011-09-20 22:02:40.000000000 +0200
@@ -137,6 +137,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/po/Makefile.in new/gwenhywfar-4.3.0/po/Makefile.in
--- old/gwenhywfar-4.2.1/po/Makefile.in 2011-08-01 20:22:17.000000000 +0200
+++ new/gwenhywfar-4.3.0/po/Makefile.in 2011-09-20 22:02:40.000000000 +0200
@@ -85,6 +85,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/src/Makefile.in new/gwenhywfar-4.3.0/src/Makefile.in
--- old/gwenhywfar-4.2.1/src/Makefile.in 2011-08-01 20:22:17.000000000 +0200
+++ new/gwenhywfar-4.3.0/src/Makefile.in 2011-09-20 22:02:40.000000000 +0200
@@ -196,6 +196,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/src/base/Makefile.in new/gwenhywfar-4.3.0/src/base/Makefile.in
--- old/gwenhywfar-4.2.1/src/base/Makefile.in 2011-08-01 20:22:17.000000000 +0200
+++ new/gwenhywfar-4.3.0/src/base/Makefile.in 2011-09-20 22:02:40.000000000 +0200
@@ -135,6 +135,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/src/crypt3/Makefile.in new/gwenhywfar-4.3.0/src/crypt3/Makefile.in
--- old/gwenhywfar-4.2.1/src/crypt3/Makefile.in 2011-08-01 20:22:17.000000000 +0200
+++ new/gwenhywfar-4.3.0/src/crypt3/Makefile.in 2011-09-20 22:02:40.000000000 +0200
@@ -132,6 +132,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/src/cryptmsg/Makefile.in new/gwenhywfar-4.3.0/src/cryptmsg/Makefile.in
--- old/gwenhywfar-4.2.1/src/cryptmsg/Makefile.in 2011-08-01 20:22:17.000000000 +0200
+++ new/gwenhywfar-4.3.0/src/cryptmsg/Makefile.in 2011-09-20 22:02:40.000000000 +0200
@@ -131,6 +131,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/src/crypttoken/Makefile.in new/gwenhywfar-4.3.0/src/crypttoken/Makefile.in
--- old/gwenhywfar-4.2.1/src/crypttoken/Makefile.in 2011-08-01 20:22:17.000000000 +0200
+++ new/gwenhywfar-4.3.0/src/crypttoken/Makefile.in 2011-09-20 22:02:40.000000000 +0200
@@ -132,6 +132,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/src/gui/Makefile.in new/gwenhywfar-4.3.0/src/gui/Makefile.in
--- old/gwenhywfar-4.2.1/src/gui/Makefile.in 2011-08-01 20:22:17.000000000 +0200
+++ new/gwenhywfar-4.3.0/src/gui/Makefile.in 2011-09-20 22:02:40.000000000 +0200
@@ -134,6 +134,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/src/html/Makefile.in new/gwenhywfar-4.3.0/src/html/Makefile.in
--- old/gwenhywfar-4.2.1/src/html/Makefile.in 2011-08-01 20:22:18.000000000 +0200
+++ new/gwenhywfar-4.3.0/src/html/Makefile.in 2011-09-20 22:02:41.000000000 +0200
@@ -133,6 +133,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/src/os/Makefile.in new/gwenhywfar-4.3.0/src/os/Makefile.in
--- old/gwenhywfar-4.2.1/src/os/Makefile.in 2011-08-01 20:22:18.000000000 +0200
+++ new/gwenhywfar-4.3.0/src/os/Makefile.in 2011-09-20 22:02:41.000000000 +0200
@@ -167,6 +167,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/src/os/posix/Makefile.in new/gwenhywfar-4.3.0/src/os/posix/Makefile.in
--- old/gwenhywfar-4.2.1/src/os/posix/Makefile.in 2011-08-01 20:22:18.000000000 +0200
+++ new/gwenhywfar-4.3.0/src/os/posix/Makefile.in 2011-09-20 22:02:41.000000000 +0200
@@ -133,6 +133,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/src/os/windows/Makefile.in new/gwenhywfar-4.3.0/src/os/windows/Makefile.in
--- old/gwenhywfar-4.2.1/src/os/windows/Makefile.in 2011-08-01 20:22:18.000000000 +0200
+++ new/gwenhywfar-4.3.0/src/os/windows/Makefile.in 2011-09-20 22:02:41.000000000 +0200
@@ -133,6 +133,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/src/parser/Makefile.in new/gwenhywfar-4.3.0/src/parser/Makefile.in
--- old/gwenhywfar-4.2.1/src/parser/Makefile.in 2011-08-01 20:22:18.000000000 +0200
+++ new/gwenhywfar-4.3.0/src/parser/Makefile.in 2011-09-20 22:02:41.000000000 +0200
@@ -132,6 +132,7 @@
DOXYGEN_DEFINE = @DOXYGEN_DEFINE@
DOXYGEN_INPUT = @DOXYGEN_INPUT@
DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@
+DPKG_ARCH = @DPKG_ARCH@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.2.1/src/parser/text.c new/gwenhywfar-4.3.0/src/parser/text.c
--- old/gwenhywfar-4.2.1/src/parser/text.c 2010-08-28 15:39:59.000000000 +0200
+++ new/gwenhywfar-4.3.0/src/parser/text.c 2011-09-20 22:01:22.000000000 +0200
@@ -33,10 +33,21 @@
#include