Imported Upstream version 2.1.2

47bd180a · Michael Meskes · 376a9af5 · 47bd180a · 47bd180a · 47bd180a
Commit 47bd180a authored Mar 30, 2010 by Michael Meskes
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,11 +4,14 @@
 # options available for user's input
 OPTION(WANT_DEBUG "Set the debug build and possible additional outputs" OFF)
 OPTION(WANT_INTERNAL_QSCINTILLA "Use internal/bundled QScintilla2 source" OFF)
-OPTION(ENABLE_ORACLE "Disable Oracle support at all. Including detection" ON)
-OPTION(ENABLE_PGSQL "Disable PostgreSQL support. Including detection" ON)
+OPTION(ENABLE_ORACLE "Enable/Disable Oracle support at all. Including detection" ON)
+OPTION(ENABLE_PGSQL "Enable/Disable PostgreSQL support. Including detection" ON)
+OPTION(ENABLE_DB2 "Enable/Disable DB2 support. Including detection" ON)
 OPTION(WANT_RPM "Enable additional RPM related stuff. Additional make package_rpm target" ON)
 OPTION(WANT_BUNDLE "Enable Mac OS X bundle build" OFF)
 OPTION(WANT_BUNDLE_STANDALONE "Do not copy required libs and tools into bundle (WANT_BUNDLE)" ON)
+OPTION(USE_TROTL "Use trotl OCI wrapper library" OFF)
+OPTION(USE_PCH "Use percompiled headers" OFF)

 #Set our CMake minimum version
 #Require 2.4.2 for Qt finding
@@ -48,7 +51,7 @@ PROJECT(TOra)
 #where VERSION_SUFFIX is of the form "", "cvs" or "Ncvs" (N being the minor patch level)
 SET (VERSION_MAJOR "2")
 SET (VERSION_MINOR "1")
-SET (VERSION_PATCH "1")
+SET (VERSION_PATCH "2")
 SET (VERSION_SUFFIX "")
 SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX})
 MESSAGE(STATUS "TOra ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}")
@@ -86,8 +89,8 @@ endif (NOT TORA_DOC_DIR)
 ##############################################################################################################
 ########## check for the CPU we build for                                                           ##########

-IF (GCC)
-
+IF (CMAKE_COMPILER_IS_GNUCC)
+  
 EXECUTE_PROCESS(
    COMMAND ${CMAKE_C_COMPILER} -dumpmachine
    OUTPUT_VARIABLE MACHINE
@@ -113,7 +116,12 @@ IF (_machine_ppc)
    SET(ARCH_PPC 1)
 ENDIF (_machine_ppc)

-ENDIF (GCC)
+SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}")
+SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}")
+SET(CMAKE_CXX_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -ggdb3 -fno-inline -rdynamic")
+SET(CMAKE_C_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -gbdb3 -fno-inline -rdynamic")
+
+ENDIF (CMAKE_COMPILER_IS_GNUCC)

 #Convert our simpler command line option to the CMake style
 #None, Debug, Release, .. or custom ones
@@ -136,8 +144,6 @@ ELSE (MSVC)
 ENDIF (MSVC)


-SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}")
-SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}")
 # Required for win wjen there is used an external qscintilla lib
 IF (WIN32 AND NOT DEFINED WANT_INTERNAL_QSCINTILLA)
  SET(CMAKE_CXX_FLAGS_RELEASE "/DQSCINTILLA_DLL ${CMAKE_CXX_FLAGS_RELEASE}")
@@ -222,7 +228,7 @@ ELSE (NOT ENABLE_PGSQL)
    MESSAGE(" ")
    MESSAGE(WARNING " No PostgreSQL environment has been found.")
    MESSAGE(WARNING " Specify -DPOSTGRESQL_PATH_INCLUDES=path")
-    MESSAGE(WARNING " and -DPOSTGRESQL_PATH_LIB manually")
+    MESSAGE(WARNING "     and -DPOSTGRESQL_PATH_LIB=path manually")
 	#MESSAGE (STATUS "PostgreSQL includes: ${POSTGRESQL_INCLUDE_DIR} vs. ${POSTGRESQL_PATH_INCLUDES}")
 	#MESSAGE (STATUS "PostgreSQL libs: ${POSTGRESQL_LIBRARIES} vs. ${POSTGRESQL_PATH_LIB}")
    MESSAGE(" ")
@@ -231,6 +237,24 @@ ELSE (NOT ENABLE_PGSQL)
 ENDIF (NOT ENABLE_PGSQL)


+IF (NOT ENABLE_DB2)
+    MESSAGE(STATUS "DB2 support is disabled by user choice")
+ELSE (NOT ENABLE_DB2)
+
+    FIND_PACKAGE(DB2)
+    IF (DB2_FOUND)
+        ADD_DEFINITIONS(-DHAVE_DB2)
+    ELSE (DB2_FOUND)
+        MESSAGE(" ")
+        MESSAGE(WARNING " No DB2 client libraries have been found.")
+        MESSAGE(WARNING " TOra can be build without it - without DB2 support.")
+        MESSAGE(WARNING " Specify -DDB2_PATH_INCLUDES=path")
+        MESSAGE(WARNING "     and -DDB2_PATH_LIB=path manually")
+        MESSAGE(" ")
+    ENDIF (DB2_FOUND)
+
+ENDIF (NOT ENABLE_DB2)
+
 ##############################################################################################################
 ########## Include Setup                                                                            ##########


--- a/ChangeLog
+++ b/ChangeLog
-2005-02-16  Henrik Johnson and others  <someemail>
-	* tora: automake wants this.
+tora (2.1.2-1) unstable; urgency=low
+
+  * Improved: Add editor option for uppler/lowercase object names
+  * Improved: Db extract/compare tool now remembers widgets states
+  * New: Filesystem completer for target line edit
+  * Improved: Compatibility with sql+
+  * New: Color/pixmap identifier for connection
+  * Improved: Schema browser improvements
+  * New: Ability to add external static check
+  * New: Save package specification and body to one file
+  * New: Initial support for creating/modifying tables
+  * Bugfixes
+
+tora (2.1.1-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Nathan Neulinger <nneul@neulinger.org> Tue, 13 Oct 2009 13:44:40 -0600
+
+tora (2.1.0-1) unstable; urgency=low
+
+  * New upstream version, the rebuild closes: #540046.
+  * Bumped Standards-Version to 3.8.3, no changes needed.
+  * New project homepage.
+  * Removed no longer needed 01_missing_includes.dpatch.
+  * Removed no longer used dh_desktop call.
+  * Added README.source file.
+
+ -- Michael Meskes <meskes@debian.org>  Fri, 11 Sep 2009 12:37:52 +0200
+
+tora (2.0.0-4) unstable; urgency=low
+
+  * Added patch to add missing include directives, closes: #526166
+
+ -- Michael Meskes <meskes@debian.org>  Mon, 04 May 2009 16:12:37 +0200
+
+tora (2.0.0-3) unstable; urgency=low
+
+  * Cleaned up packaging a little bit.
+  * Added homepage information to control file.
+  * Bumped Standards-Version to 3.8.1.
+  * Released to unstable.
+
+ -- Michael Meskes <meskes@debian.org>  Tue, 07 Apr 2009 13:16:05 +0200
+
+tora (2.0.0-2) experimental; urgency=low
+
+  * Added build dependency on libpq-dev to get full PostgreSQL support.
+
+ -- Michael Meskes <meskes@debian.org>  Tue, 06 Jan 2009 08:49:43 +0100
+
+tora (2.0.0-1) experimental; urgency=low
+
+  * New upstream version for KDE4/Qt4.
+  * Added watch file.
+  * Updated to standards version 3.8.0, no additional changes needed.
+  * No longer need texinfo to build, the html files are part of the tarball.
+  * Streamlined build dependencies.
+  * Updated copyright file.
+
+ -- Michael Meskes <meskes@debian.org>  Sat, 03 Jan 2009 20:51:13 +0100
+
+tora (1.3.23-1) unstable; urgency=low
+
+  * New upstream version
+  * Moved config.* handling from clean target to configure target.
+
+ -- Michael Meskes <meskes@debian.org>  Wed, 26 Mar 2008 09:55:07 +0100
+
+tora (1.3.22-7) unstable; urgency=low
+
+  * Removed build dependency on libqt3-compat-headers, closes: #464914
+  * Added include directives needed by gcc-4.3, closes: #462239
+
+ -- Michael Meskes <meskes@debian.org>  Mon, 11 Feb 2008 10:57:12 +0100
+
+tora (1.3.22-6) unstable; urgency=low
+
+  * Fixed clean target yet again so building twice in a row is possible.
+  * Bumped up build dependency on debhelper to correct version.
+
+ -- Michael Meskes <meskes@debian.org>  Thu, 10 Jan 2008 11:55:07 +0100
+
+tora (1.3.22-5) unstable; urgency=low
+
+  * Bumped standards version to 3.7.3.
+  * Bumped tora.dekstop to version 1.0, closes: #455588
+  * Added call to dh_desktop.
+  * Bumbed debhelper version to 5.
+  * Build-depend on autotools-dev and cp up-to-date files to archive.
+  * Do not ignore errors in "make clean".
+
+ -- Michael Meskes <meskes@debian.org>  Tue, 11 Dec 2007 10:32:06 +0100
+
+tora (1.3.22-4) unstable; urgency=low
+
+  * Removed build dependency on g++, closes: #452976
+  * Also removed build dependency on libqt3-mt-dev because kdelibs4-dev
+    depends on it.
+  * Made menu file adhere new standard.
+  * Do not install sources for help files.
+
+ -- Michael Meskes <meskes@debian.org>  Thu, 06 Dec 2007 10:13:24 +0100
+
+tora (1.3.22-3) unstable; urgency=low
+
+  * Moved to team maintenance:
+    Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>.
+
+ -- Michael Meskes <meskes@debian.org>  Thu, 22 Nov 2007 11:12:43 +0100
+
+tora (1.3.22-2) unstable; urgency=low
+
+  * Fixed help system
+  * Moved translations to /usr/share, closes: #448950
+  * Remove deprecated debian.patch file.
+
+ -- Michael Meskes <meskes@debian.org>  Tue, 20 Nov 2007 13:05:47 +0100
+
+tora (1.3.22-1) unstable; urgency=low
+
+  * New upstream version.
+  * Added texinfo to Build-Depends, closes: #443296
+  * Build process now uses dpatch.
+
+ -- Michael Meskes <meskes@debian.org>  Fri, 21 Sep 2007 13:48:45 +0200
+
+tora (1.3.21pre22-3) unstable; urgency=low
+
+  * Do not remove files from the orig tarball in our clean target, closes: #442749
+  * Resynced with svn to prepare for upcoming 1.3.22 release.
+
+ -- Michael Meskes <meskes@debian.org>  Tue, 18 Sep 2007 11:15:46 +0200
+
+tora (1.3.21pre22-2) unstable; urgency=low
+
+  * Fixed incorrect display of UTF-8 characters, closes: #418524
+  
+ -- Michael Meskes <meskes@debian.org>  Fri, 08 Jun 2007 14:44:29 +0200
+
+tora (1.3.21pre22-1) unstable; urgency=low
+
+  * Applied latest upstream pre1.3.22 patch.
+  * Moved to qscintilla 1.7.
+  
+ -- Michael Meskes <meskes@debian.org>  Tue, 22 May 2007 15:35:55 +0200
+
+tora (1.3.21-3) unstable; urgency=low
+
+  * Added XDG menu support, closes: #354166
+  
+ -- Michael Meskes <meskes@debian.org>  Mon, 17 Apr 2006 13:41:02 +0200
+ 
+tora (1.3.21-2) unstable; urgency=low
+
+  * Added patch by Martin Michlmayr to make tora compile with G++ 4.1,
+    closes: #357810
+  * Fixed URL in copyright file, closes: #358394
+  
+ -- Michael Meskes <meskes@debian.org>  Fri, 24 Mar 2006 13:30:31 +0100
+
+tora (1.3.21-1) unstable; urgency=low
+
+  * New upstream version, fixing the bug that urged me to call autogen.sh and
+    thus making the package build again without build-depending on automake et
+    al., closes: #352513
+  * Added most of the debian specific patch to upstream sources.
+  
+ -- Michael Meskes <meskes@debian.org>  Mon, 13 Feb 2006 15:02:29 +0100
+
+tora (1.3.20-1) unstable; urgency=low
+
+  * New upstream version.
+  * Use the 16x16 icon that is provided by upstream. 
+  
+ -- Michael Meskes <meskes@debian.org>  Sat, 11 Feb 2006 10:24:33 +0100
+
+tora (1.3.18-4) unstable; urgency=low
+
+  * Changed QODBC to QODBC3 one more time, closes: #347373
+
+ -- Michael Meskes <meskes@debian.org>  Thu, 12 Jan 2006 13:32:24 +0100
+
+tora (1.3.18-3) unstable; urgency=low
+
+  * Updated libtool so hopefully Debian GNU/k*BSD is supported now
+    closes: #342702
+  * Added 16x16 menu icon
+  * Updated debhelper to version 4
+
+ -- Michael Meskes <meskes@debian.org>  Sun, 11 Dec 2005 19:03:49 +0100
+
+tora (1.3.18-2) unstable; urgency=low
+
+  * Added --enable-libsuffix= to make sure kdelibs are found even on sparc,
+    closes: #328124
+
+ -- Michael Meskes <meskes@debian.org>  Fri, 16 Sep 2005 08:48:14 +0200
+ 
+tora (1.3.18-1) unstable; urgency=low
+
+  * New upstream version 
+  * Compiled against KDE 3.4.2, closes: #312432
+
+ -- Michael Meskes <meskes@debian.org>  Tue,  6 Sep 2005 13:32:17 +0200
+ 
+tora (1.3.16-1) unstable; urgency=low
+
+  * New upstream version 
+
+ -- Michael Meskes <meskes@debian.org>  Sun,  6 Mar 2005 11:08:40 +0100
+ 
+tora (1.3.15-1) unstable; urgency=low
+
+  * New upstream version 
+  * Changed QODBC to QODBC3, closes: #285510
+
+ -- Michael Meskes <meskes@debian.org>  Fri,  4 Mar 2005 11:26:34 +0100
+ 
+tora (1.3.14.1-3) unstable; urgency=low
+
+  * This time really add the build-depend on kdebase-bin
+
+ -- Michael Meskes <meskes@debian.org>  Mon,  5 Jul 2004 20:26:14 +0200
+
+tora (1.3.14.1-2) unstable; urgency=low
+
+  * Build-depend on kdebase-bin (closes: #253765)
+  * Changed configure.pl to check for kdcop instead of kwin.
+
+ -- Michael Meskes <meskes@debian.org>  Mon,  5 Jul 2004 12:47:34 +0200
+
+tora (1.3.14.1-1) unstable; urgency=low
+
+  * New upstream version.
+  * Made sure KDE files are installed (closes: #253765)
+
+ -- Michael Meskes <meskes@debian.org>  Sun,  4 Jul 2004 17:12:34 +0200
+
+tora (1.3.13-3) unstable; urgency=low
+
+  * Updated standards version.
+  * Added man page.
+  * Added symlink from /usr/share/doc/tora to help files.
+  * Make sure all built files are cleaned.
+  * Compile without "new check".
+  * Added kderemove="y" to menu entry.  Use icons already installed in
+    KDE structure; don't install twice.  Improved menu text.
+  * Updated copyright.
+
+ -- Michael Meskes <meskes@debian.org>  Wed, 24 Mar 2004 19:27:28 +0100
+
+tora (1.3.13-2) unstable; urgency=low
+
+  * Added icon, improved capitalization of menu entry.
+
+ -- Michael Meskes <meskes@debian.org>  Mon, 01 Mar 2004 11:30:15 +0100
+
+tora (1.3.13-1) unstable; urgency=low
+
+  * New upstream version 
+
+ -- Michael Meskes <meskes@debian.org>  Sun, 15 Feb 2004 10:47:47 +0100
+
+tora (1.3.12-1) unstable; urgency=low
+
+  * New upstream version 
+
+ -- Michael Meskes <meskes@debian.org>  Tue, 21 Oct 2003 19:13:32 +0200
+
+tora (1.3.11-1) unstable; urgency=low
+
+  * New upstream version 
+  * Moved help files from /usr/lib to /usr/share
+
+ -- Michael Meskes <meskes@debian.org>  Sun, 31 Aug 2003 12:15:51 +0200
+
+tora (1.3.9.2-3) unstable; urgency=low
+
+  * Removed full screen opening (closes: #167590)
+  * Added patch from CVS so changed values are saved.
+  * Added my patches to doc/
+
+ -- Michael Meskes <meskes@debian.org>  Sun, 15 Jun 2003 14:31:11 +0200
+
+tora (1.3.9.2-2) unstable; urgency=low
+
+  * Include qobjectlist.h instead of qobjcoll.h (closes: #181522)
+  * Include qt3-compat-headers in Build-Depends until kdelibs4-dev is fixed
+  * Made sure qt3-mt is used (closes: #183063)
+
+ -- Michael Meskes <meskes@debian.org>  Mon, 24 Feb 2003 14:31:50 +0100
+
+tora (1.3.9.2-1) unstable; urgency=low
+
+  * New upstream version
+  * Compiled against new libqt3 (closes: #181091)
+
+ -- Michael Meskes <meskes@debian.org>  Mon, 17 Feb 2003 00:56:12 +0100
+
+tora (1.3.8-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Michael Meskes <meskes@debian.org>  Fri, 11 Oct 2002 09:09:50 +0200
+
+tora (1.3.7-4) unstable; urgency=low
+
+  * Fixed dependancy to list -mt qt3 modules (closes: #154259)
+  * Added several fixes to compiler warnings from CVS.
+
+ -- Michael Meskes <meskes@debian.org>  Sun,  1 Sep 2002 11:44:46 +0200
+
+tora (1.3.7-3) unstable; urgency=low
+
+  * Added compiler optimization (closes: #159036).
+  
+ -- Michael Meskes <meskes@debian.org>  Sun,  1 Sep 2002 11:44:46 +0200
+tora (1.3.7-2) unstable; urgency=low
+
+  * Fixed Built-Depends to note that qt 3.0.5 or greater is needed
+    (closes: #156420).
+
+ -- Michael Meskes <meskes@debian.org>  Mon, 12 Aug 2002 18:07:51 +0200
+ 
+tora (1.3.7-1) unstable; urgency=low
+
+  * New upstream version.
+  * Compiled against libqt3 3.0.5 which should fix missing connection provider
+    problem (closes: #154259).
+
+ -- Michael Meskes <meskes@debian.org>  Mon, 12 Aug 2002 13:57:08 +0200
+tora (1.3.6.1-2) unstable; urgency=low
+
+  * Changed Suggests to Depends as tora won't work without a database
+    connector. (closes: #152251)
+
+ -- Michael Meskes <meskes@debian.org>  Sun, 14 Jul 2002 09:54:07 +0200
+
+tora (1.3.6.1-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Michael Meskes <meskes@debian.org>  Fri,  5 Jul 2002 12:29:52 +0200
+
+tora (1.3.6-1) unstable; urgency=low
+
+  * New upstream version.
+  * Added some more patches from CVS to fix several minor bugs.
+
+ -- Michael Meskes <meskes@debian.org>  Wed,  3 Jul 2002 10:37:51 +0200
+ 
+tora (1.3.5.1-1) unstable; urgency=low
+
+  * New upstream version with several minor bugfixes
+
+ -- Michael Meskes <meskes@debian.org>  Fri, 19 Apr 2002 10:32:16 +0200
+
+tora (1.3.5-1) unstable; urgency=low
+
+  * New upstream version with new style selection code and other improvements.
+  * Fixed spelling bug in help file (closes: 143344).
+
+ -- Michael Meskes <meskes@debian.org>  Wed, 17 Apr 2002 19:54:18 +0200
+tora (1.3.4-3) unstable; urgency=low
+
+  * Deactivated style selection stuff (ENABLE_STYLE) to make tora compile
+    again (closes: 141919, 142128).
+
+ -- Michael Meskes <meskes@debian.org>  Sun, 14 Apr 2002 14:54:47 +0200
+ 
+tora (1.3.4-2) unstable; urgency=low
+
+  * Added upstream fixes.
+  * Added menu entry.
+
+ -- Michael Meskes <meskes@debian.org>  Sat,  9 Mar 2002 20:23:02 +0100
+ 
+tora (1.3.4-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Michael Meskes <meskes@debian.org>  Thu,  7 Mar 2002 12:42:50 +0100
+
+
+tora (1.3.3-4) unstable; urgency=low
+
+  * Added more upstream fixes (closes: 133777)
+
+ -- Michael Meskes <meskes@debian.org>  Sun,  3 Mar 2002 11:26:44 +0100
+
+tora (1.3.3-3) unstable; urgency=low
+
+  * Added some upstream fixes (closes: 134133)
+
+ -- Michael Meskes <meskes@debian.org>  Sun, 17 Feb 2002 18:42:01 +0100
+
+tora (1.3.3-2) unstable; urgency=low
+
+  * Added Suggests for database modules (closes: 132724)
+  * Added some upstream fixes
+  * Added missing images (closes: 132791)
+
+ -- Michael Meskes <meskes@debian.org>  Wed, 13 Feb 2002 20:13:34 +0100
+
+tora (1.3.3-1) unstable; urgency=low
+
+  * Initial Release (closes: 130650)
+
+ -- Michael Meskes <meskes@debian.org>  Fri, 25 Jan 2002 09:37:32 +0100

--- a/Makefile.in
+++ b/Makefile.in
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -84,6 +84,11 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/m4/ax_cflags_gcc_option.m4 \
 	$(top_srcdir)/config/m4/cppunit.m4 \
+	$(top_srcdir)/config/m4/libtool.m4 \
+	$(top_srcdir)/config/m4/ltoptions.m4 \
+	$(top_srcdir)/config/m4/ltsugar.m4 \
+	$(top_srcdir)/config/m4/ltversion.m4 \
+	$(top_srcdir)/config/m4/lt~obsolete.m4 \
 	$(top_srcdir)/config/m4/oracle.m4 \
 	$(top_srcdir)/config/m4/pcre.m4 \
 	$(top_srcdir)/config/m4/postgresql.m4 \
@@ -174,14 +179,13 @@ CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -189,11 +193,13 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 ISODATE = @ISODATE@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LRELEASE = @LRELEASE@
 LTLIBOBJS = @LTLIBOBJS@
@@ -201,11 +207,15 @@ LUPDATE = @LUPDATE@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MOC = @MOC@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 ORACLE_CXXFLAGS = @ORACLE_CXXFLAGS@
 ORACLE_LDFLAGS = @ORACLE_LDFLAGS@
 ORACLE_LIBS = @ORACLE_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -243,7 +253,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 ac_path_moc = @ac_path_moc@
 ac_path_rcc = @ac_path_rcc@
 ac_path_uic = @ac_path_uic@
@@ -277,6 +287,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -397,7 +408,7 @@ distclean-libtool:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -422,7 +433,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"

 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -589,7 +600,8 @@ distdir: $(DISTFILES)
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  dist-hook
 	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -633,17 +645,17 @@ dist dist-all: distdir
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac

--- a/NEWS
+++ b/NEWS
+2.1.2:
+2009-10-14: Added win32 cross compile scripts/patches/notes from ZippyDufus <zippydufus@yahoo.com>
+
+# lots of notes missing for 2.x series
+
 1.4:
 *: Updates for QT4 build support


--- a/README.LAYOUT
+++ b/README.LAYOUT
@@ -19,6 +19,7 @@ tora/
   +--rpm/
   |
   +--src/
+   |    +--help/ <--- symlinks to doc/help
   |    +--i18n/
   |    +--icons/
   |    +--templates/
@@ -50,6 +51,7 @@ debian:

 doc:
 	- for documentation
+          note that there is a symlink to this folder from src/help

 ext:
 	- directory for external libraries which are part of the 

--- a/README.RELEASE
+++ b/README.RELEASE