merge QA-Upload; doc-dir as sysmlink

3 files changed, 86 insertions, 69 deletions

diff --git a/debian/patches/fix-types-include.diff b/debian/patches/fix-types-include.diff
new file mode 100644
index 0000000..8643c44
--- /dev/null
+++ b/debian/patches/fix-types-include.diff
@@ -0,0 +1,30 @@
+Author: Pino Toscano <pino@debian.org>
+Description: Fix xbtypes.h usage
+ a) do not redefine xbOffT everytime xbtypes.h is included
+ b) do not include xbtypes.h in xbcdx.cpp, since it will be indirectly pulled
+    by xbase64.h
+Forwarded: no
+Last-Update: 2014-09-13
+
+--- a/xbase64/xbcdx.cpp
++++ b/xbase64/xbcdx.cpp
+@@ -1,4 +1,3 @@
+-#include "xbtypes.h"

+ #include "xbcdx.h"

+ 

+ xbShort xbCdx::CreateIndex(const char* filename, const char *expr, 

+--- a/xbase64/xbtypes.h
++++ b/xbase64/xbtypes.h
+@@ -85,7 +85,6 @@ typedef short int          xbBool;
+ #else
+ #endif
+ #endif      // XB_LOCKING_ON
+-#endif      // __XB_XTYPES_H__
+ 
+ // 64 bit file processing
+ #if defined(HAVE_FSEEKO) && defined(HAVE_FTELLO) && defined(XB_LARGEFILE_SUPPORT)
+@@ -97,3 +96,4 @@ typedef short int          xbBool;
+  #define _fseek fseek
+  typedef long xbOffT;
+ #endif
++#endif      // __XB_XTYPES_H__
diff --git a/debian/patches/lesserg.diff b/debian/patches/lesserg.diff
index d5d32c0..8fca28d 100644
--- a/debian/patches/lesserg.diff
+++ b/debian/patches/lesserg.diff
@@ -1,8 +1,7 @@
 Description: change __GNU LesserG__ to __GNU_LesserG__
 
-diff -up xbase64-3.1.2/xbase64/xbase64.cpp.lesserg xbase64-3.1.2/xbase64/xbase64.cpp
---- xbase64-3.1.2/xbase64/xbase64.cpp.lesserg	2012-01-05 15:31:01.695312436 -0500
-+++ xbase64-3.1.2/xbase64/xbase64.cpp	2012-01-05 15:31:01.717312232 -0500
+--- a/xbase64/xbase64.cpp
++++ b/xbase64/xbase64.cpp
 @@ -38,7 +38,7 @@
  
  */
@@ -12,9 +11,8 @@ diff -up xbase64-3.1.2/xbase64/xbase64.cpp.lesserg xbase64-3.1.2/xbase64/xbase64
    #pragma implementation "xbase64.h"
  #endif
  
-diff -up xbase64-3.1.2/xbase64/xbase64.h.lesserg xbase64-3.1.2/xbase64/xbase64.h
---- xbase64-3.1.2/xbase64/xbase64.h.lesserg	2006-07-17 12:54:50.000000000 -0400
-+++ xbase64-3.1.2/xbase64/xbase64.h	2012-01-05 15:31:01.718312223 -0500
+--- a/xbase64/xbase64.h
++++ b/xbase64/xbase64.h
 @@ -42,7 +42,7 @@
  #ifndef __XB_XBASE_H__
  #define __XB_XBASE_H__
@@ -33,9 +31,17 @@ diff -up xbase64-3.1.2/xbase64/xbase64.h.lesserg xbase64-3.1.2/xbase64/xbase64.h
  #  ifdef XBMAKINGDLL
  #    define XBDLLEXPORT __declspec( dllexport )
  #    define XBDLLEXPORT_DATA(type) __declspec( dllexport ) type
-diff -up xbase64-3.1.2/xbase64/xbcdx.h.lesserg xbase64-3.1.2/xbase64/xbcdx.h
---- xbase64-3.1.2/xbase64/xbcdx.h.lesserg	2012-01-05 15:32:17.398608985 -0500
-+++ xbase64-3.1.2/xbase64/xbcdx.h	2012-01-05 15:32:43.051370614 -0500
+--- a/xbase64/xbcdx.h
++++ b/xbase64/xbcdx.h
+@@ -41,7 +41,7 @@ struct CdxNode
+   xbLong leftSibling;

+   xbLong rightSibling;

+ }

+-#ifdef __GNU LesserC__

++#ifdef __GNU_LesserC__

+ 	__attribute__((packed))

+ #endif

+ ;

 @@ -50,7 +50,7 @@ struct CdxInnerNode: public CdxNode
  {

    char keys[500];

@@ -54,9 +60,8 @@ diff -up xbase64-3.1.2/xbase64/xbcdx.h.lesserg xbase64-3.1.2/xbase64/xbcdx.h
  	__attribute__((packed))

  #endif

  ;

-diff -up xbase64-3.1.2/xbase64/xbdate.cpp.lesserg xbase64-3.1.2/xbase64/xbdate.cpp
---- xbase64-3.1.2/xbase64/xbdate.cpp.lesserg	2006-07-17 12:54:42.000000000 -0400
-+++ xbase64-3.1.2/xbase64/xbdate.cpp	2012-01-05 15:31:01.719312213 -0500
+--- a/xbase64/xbdate.cpp
++++ b/xbase64/xbdate.cpp
 @@ -40,7 +40,7 @@
  
  */
@@ -66,9 +71,8 @@ diff -up xbase64-3.1.2/xbase64/xbdate.cpp.lesserg xbase64-3.1.2/xbase64/xbdate.c
    #pragma implementation "xbdate.h"
  #endif
  
-diff -up xbase64-3.1.2/xbase64/xbdate.h.lesserg xbase64-3.1.2/xbase64/xbdate.h
---- xbase64-3.1.2/xbase64/xbdate.h.lesserg	2006-07-17 12:54:50.000000000 -0400
-+++ xbase64-3.1.2/xbase64/xbdate.h	2012-01-05 15:31:01.721312195 -0500
+--- a/xbase64/xbdate.h
++++ b/xbase64/xbdate.h
 @@ -45,7 +45,7 @@
  #ifndef __XB_XBDATE_H__
  #define __XB_XBDATE_H__
@@ -78,9 +82,8 @@ diff -up xbase64-3.1.2/xbase64/xbdate.h.lesserg xbase64-3.1.2/xbase64/xbdate.h
  #pragma interface
  #endif
  
-diff -up xbase64-3.1.2/xbase64/xbdbf.cpp.lesserg xbase64-3.1.2/xbase64/xbdbf.cpp
---- xbase64-3.1.2/xbase64/xbdbf.cpp.lesserg	2006-07-17 12:54:42.000000000 -0400
-+++ xbase64-3.1.2/xbase64/xbdbf.cpp	2012-01-05 15:31:01.722312185 -0500
+--- a/xbase64/xbdbf.cpp
++++ b/xbase64/xbdbf.cpp
 @@ -39,7 +39,7 @@
  
  */
@@ -90,9 +93,8 @@ diff -up xbase64-3.1.2/xbase64/xbdbf.cpp.lesserg xbase64-3.1.2/xbase64/xbdbf.cpp
    #pragma implementation "xbdbf.h"
  #endif
  
-diff -up xbase64-3.1.2/xbase64/xbdbf.h.lesserg xbase64-3.1.2/xbase64/xbdbf.h
---- xbase64-3.1.2/xbase64/xbdbf.h.lesserg	2006-07-17 12:54:50.000000000 -0400
-+++ xbase64-3.1.2/xbase64/xbdbf.h	2012-01-05 15:31:01.723312175 -0500
+--- a/xbase64/xbdbf.h
++++ b/xbase64/xbdbf.h
 @@ -41,7 +41,7 @@
  #ifndef __XB_DBF_H__
  #define __XB_DBF_H__
@@ -102,9 +104,8 @@ diff -up xbase64-3.1.2/xbase64/xbdbf.h.lesserg xbase64-3.1.2/xbase64/xbdbf.h
  #pragma interface
  #endif
  
-diff -up xbase64-3.1.2/xbase64/xbexp.cpp.lesserg xbase64-3.1.2/xbase64/xbexp.cpp
---- xbase64-3.1.2/xbase64/xbexp.cpp.lesserg	2006-07-17 12:54:42.000000000 -0400
-+++ xbase64-3.1.2/xbase64/xbexp.cpp	2012-01-05 15:31:01.725312157 -0500
+--- a/xbase64/xbexp.cpp
++++ b/xbase64/xbexp.cpp
 @@ -38,7 +38,7 @@
  
  */
@@ -114,9 +115,8 @@ diff -up xbase64-3.1.2/xbase64/xbexp.cpp.lesserg xbase64-3.1.2/xbase64/xbexp.cpp
    #pragma implementation "xbexp.h"
  #endif
  
-diff -up xbase64-3.1.2/xbase64/xbexp.h.lesserg xbase64-3.1.2/xbase64/xbexp.h
---- xbase64-3.1.2/xbase64/xbexp.h.lesserg	2006-07-17 12:54:50.000000000 -0400
-+++ xbase64-3.1.2/xbase64/xbexp.h	2012-01-05 15:31:01.726312148 -0500
+--- a/xbase64/xbexp.h
++++ b/xbase64/xbexp.h
 @@ -42,7 +42,7 @@
  #ifndef __XB_EXP_H__
  #define __XB_EXP_H__
@@ -126,9 +126,8 @@ diff -up xbase64-3.1.2/xbase64/xbexp.h.lesserg xbase64-3.1.2/xbase64/xbexp.h
  #pragma interface
  #endif
  
-diff -up xbase64-3.1.2/xbase64/xbfile.cpp.lesserg xbase64-3.1.2/xbase64/xbfile.cpp
---- xbase64-3.1.2/xbase64/xbfile.cpp.lesserg	2006-07-17 12:54:42.000000000 -0400
-+++ xbase64-3.1.2/xbase64/xbfile.cpp	2012-01-05 15:31:01.727312139 -0500
+--- a/xbase64/xbfile.cpp
++++ b/xbase64/xbfile.cpp
 @@ -39,7 +39,7 @@
  
  */
@@ -138,9 +137,8 @@ diff -up xbase64-3.1.2/xbase64/xbfile.cpp.lesserg xbase64-3.1.2/xbase64/xbfile.c
    #pragma implementation "xbfile.h"
  #endif
  
-diff -up xbase64-3.1.2/xbase64/xbfile.h.lesserg xbase64-3.1.2/xbase64/xbfile.h
---- xbase64-3.1.2/xbase64/xbfile.h.lesserg	2006-07-17 12:54:50.000000000 -0400
-+++ xbase64-3.1.2/xbase64/xbfile.h	2012-01-05 15:31:01.728312130 -0500
+--- a/xbase64/xbfile.h
++++ b/xbase64/xbfile.h
 @@ -45,7 +45,7 @@
  #ifndef __XB_FILE_H__

  #define __XB_FILE_H__

@@ -150,9 +148,8 @@ diff -up xbase64-3.1.2/xbase64/xbfile.h.lesserg xbase64-3.1.2/xbase64/xbfile.h
  #pragma interface
  #endif
  
-diff -up xbase64-3.1.2/xbase64/xbfilter.cpp.lesserg xbase64-3.1.2/xbase64/xbfilter.cpp
---- xbase64-3.1.2/xbase64/xbfilter.cpp.lesserg	2006-07-17 12:54:42.000000000 -0400
-+++ xbase64-3.1.2/xbase64/xbfilter.cpp	2012-01-05 15:31:01.729312120 -0500
+--- a/xbase64/xbfilter.cpp
++++ b/xbase64/xbfilter.cpp
 @@ -38,7 +38,7 @@
  
  */
@@ -162,9 +159,8 @@ diff -up xbase64-3.1.2/xbase64/xbfilter.cpp.lesserg xbase64-3.1.2/xbase64/xbfilt
    #pragma implementation "xbfilter.h"
  #endif
  
-diff -up xbase64-3.1.2/xbase64/xbfilter.h.lesserg xbase64-3.1.2/xbase64/xbfilter.h
---- xbase64-3.1.2/xbase64/xbfilter.h.lesserg	2006-07-17 12:54:50.000000000 -0400
-+++ xbase64-3.1.2/xbase64/xbfilter.h	2012-01-05 15:31:01.731312101 -0500
+--- a/xbase64/xbfilter.h
++++ b/xbase64/xbfilter.h
 @@ -44,7 +44,7 @@
  #ifndef __XB_FILTER_H__
  #define __XB_FILTER_H__
@@ -174,9 +170,8 @@ diff -up xbase64-3.1.2/xbase64/xbfilter.h.lesserg xbase64-3.1.2/xbase64/xbfilter
  #pragma interface
  #endif
  
-diff -up xbase64-3.1.2/xbase64/xbindex.cpp.lesserg xbase64-3.1.2/xbase64/xbindex.cpp
---- xbase64-3.1.2/xbase64/xbindex.cpp.lesserg	2006-07-17 12:54:42.000000000 -0400
-+++ xbase64-3.1.2/xbase64/xbindex.cpp	2012-01-05 15:31:01.732312092 -0500
+--- a/xbase64/xbindex.cpp
++++ b/xbase64/xbindex.cpp
 @@ -37,7 +37,7 @@
         USA
  */
@@ -186,9 +181,8 @@ diff -up xbase64-3.1.2/xbase64/xbindex.cpp.lesserg xbase64-3.1.2/xbase64/xbindex
    #pragma implementation "xbindex.h"
  #endif
  
-diff -up xbase64-3.1.2/xbase64/xbindex.h.lesserg xbase64-3.1.2/xbase64/xbindex.h
---- xbase64-3.1.2/xbase64/xbindex.h.lesserg	2006-07-17 12:54:50.000000000 -0400
-+++ xbase64-3.1.2/xbase64/xbindex.h	2012-01-05 15:31:01.733312083 -0500
+--- a/xbase64/xbindex.h
++++ b/xbase64/xbindex.h
 @@ -43,7 +43,7 @@
  #ifndef __XB_INDEX_H__

  #define __XB_INDEX_H__

@@ -198,9 +192,8 @@ diff -up xbase64-3.1.2/xbase64/xbindex.h.lesserg xbase64-3.1.2/xbase64/xbindex.h
  #pragma interface

  #endif

  

-diff -up xbase64-3.1.2/xbase64/xblock.cpp.lesserg xbase64-3.1.2/xbase64/xblock.cpp
---- xbase64-3.1.2/xbase64/xblock.cpp.lesserg	2012-01-05 15:31:01.696312427 -0500
-+++ xbase64-3.1.2/xbase64/xblock.cpp	2012-01-05 15:31:01.734312074 -0500
+--- a/xbase64/xblock.cpp
++++ b/xbase64/xblock.cpp
 @@ -42,7 +42,7 @@
         USA
  */
@@ -210,9 +203,8 @@ diff -up xbase64-3.1.2/xbase64/xblock.cpp.lesserg xbase64-3.1.2/xbase64/xblock.c
    #pragma implementation "xblock.h"
  #endif
  
-diff -up xbase64-3.1.2/xbase64/xblock.h.lesserg xbase64-3.1.2/xbase64/xblock.h
---- xbase64-3.1.2/xbase64/xblock.h.lesserg	2006-07-17 12:54:50.000000000 -0400
-+++ xbase64-3.1.2/xbase64/xblock.h	2012-01-05 15:31:01.735312065 -0500
+--- a/xbase64/xblock.h
++++ b/xbase64/xblock.h
 @@ -44,7 +44,7 @@
  #ifndef __XB_XBLOCK_H__
  #define __XB_XBLOCK_H__
@@ -222,9 +214,8 @@ diff -up xbase64-3.1.2/xbase64/xblock.h.lesserg xbase64-3.1.2/xbase64/xblock.h
  #pragma interface
  #endif
  
-diff -up xbase64-3.1.2/xbase64/xbndx.cpp.lesserg xbase64-3.1.2/xbase64/xbndx.cpp
---- xbase64-3.1.2/xbase64/xbndx.cpp.lesserg	2006-07-17 12:54:42.000000000 -0400
-+++ xbase64-3.1.2/xbase64/xbndx.cpp	2012-01-05 15:31:01.737312045 -0500
+--- a/xbase64/xbndx.cpp
++++ b/xbase64/xbndx.cpp
 @@ -36,7 +36,7 @@
  
  */
@@ -234,9 +225,8 @@ diff -up xbase64-3.1.2/xbase64/xbndx.cpp.lesserg xbase64-3.1.2/xbase64/xbndx.cpp
    #pragma implementation "xbndx.h"
  #endif
  
-diff -up xbase64-3.1.2/xbase64/xbndx.h.lesserg xbase64-3.1.2/xbase64/xbndx.h
---- xbase64-3.1.2/xbase64/xbndx.h.lesserg	2006-07-17 12:54:50.000000000 -0400
-+++ xbase64-3.1.2/xbase64/xbndx.h	2012-01-05 15:31:01.738312036 -0500
+--- a/xbase64/xbndx.h
++++ b/xbase64/xbndx.h
 @@ -41,7 +41,7 @@
  #ifndef __XB_NDX_H__

  #define __XB_NDX_H__

@@ -246,9 +236,8 @@ diff -up xbase64-3.1.2/xbase64/xbndx.h.lesserg xbase64-3.1.2/xbase64/xbndx.h
  #pragma interface

  #endif

  

-diff -up xbase64-3.1.2/xbase64/xbntx.cpp.lesserg xbase64-3.1.2/xbase64/xbntx.cpp
---- xbase64-3.1.2/xbase64/xbntx.cpp.lesserg	2006-07-17 12:54:42.000000000 -0400
-+++ xbase64-3.1.2/xbase64/xbntx.cpp	2012-01-05 15:31:01.740312018 -0500
+--- a/xbase64/xbntx.cpp
++++ b/xbase64/xbntx.cpp
 @@ -40,7 +40,7 @@
         USA
  */
@@ -258,9 +247,8 @@ diff -up xbase64-3.1.2/xbase64/xbntx.cpp.lesserg xbase64-3.1.2/xbase64/xbntx.cpp
    #pragma implementation "xbntx.h"
  #endif
  
-diff -up xbase64-3.1.2/xbase64/xbntx.h.lesserg xbase64-3.1.2/xbase64/xbntx.h
---- xbase64-3.1.2/xbase64/xbntx.h.lesserg	2006-07-17 12:54:50.000000000 -0400
-+++ xbase64-3.1.2/xbase64/xbntx.h	2012-01-05 15:31:01.741312009 -0500
+--- a/xbase64/xbntx.h
++++ b/xbase64/xbntx.h
 @@ -42,7 +42,7 @@
  #ifndef __XB_NTX_H__

  #define __XB_NTX_H__

@@ -270,9 +258,8 @@ diff -up xbase64-3.1.2/xbase64/xbntx.h.lesserg xbase64-3.1.2/xbase64/xbntx.h
  #pragma interface

  #endif

  

-diff -up xbase64-3.1.2/xbase64/xbstring.cpp.lesserg xbase64-3.1.2/xbase64/xbstring.cpp
---- xbase64-3.1.2/xbase64/xbstring.cpp.lesserg	2006-07-17 12:54:42.000000000 -0400
-+++ xbase64-3.1.2/xbase64/xbstring.cpp	2012-01-05 15:31:01.742312000 -0500
+--- a/xbase64/xbstring.cpp
++++ b/xbase64/xbstring.cpp
 @@ -38,7 +38,7 @@
  
  */
@@ -282,9 +269,8 @@ diff -up xbase64-3.1.2/xbase64/xbstring.cpp.lesserg xbase64-3.1.2/xbase64/xbstri
    #pragma implementation "xbstring.h"
  #endif
  
-diff -up xbase64-3.1.2/xbase64/xbstring.h.lesserg xbase64-3.1.2/xbase64/xbstring.h
---- xbase64-3.1.2/xbase64/xbstring.h.lesserg	2006-07-17 12:54:50.000000000 -0400
-+++ xbase64-3.1.2/xbase64/xbstring.h	2012-01-05 15:31:01.743311990 -0500
+--- a/xbase64/xbstring.h
++++ b/xbase64/xbstring.h
 @@ -41,7 +41,7 @@
  #ifndef __XBSTRING_H__
  #define __XBSTRING_H__
diff --git a/debian/patches/series b/debian/patches/series
index 9721eb0..ff72ecd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ autoconf-updates.diff
 lesserg.diff
 c++-includes.diff
 gcc-fixes.diff
+fix-types-include.diff