summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/0100-typo.patch54
-rw-r--r--debian/patches/autoconf-updates.diff2
-rw-r--r--debian/patches/c++-includes.diff2
-rw-r--r--debian/patches/fixconfig.diff16
-rw-r--r--debian/patches/gcc-fixes.diff2
-rw-r--r--debian/patches/lesserg.diff2
-rw-r--r--debian/patches/series1
7 files changed, 74 insertions, 5 deletions
diff --git a/debian/patches/0100-typo.patch b/debian/patches/0100-typo.patch
new file mode 100644
index 0000000..58bbd5a
--- /dev/null
+++ b/debian/patches/0100-typo.patch
@@ -0,0 +1,54 @@
+Description: Fix some typos
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Last-Update: 2014-08-03
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/bin/dbfxtrct.cpp
+===================================================================
+--- trunk.orig/bin/dbfxtrct.cpp 2014-08-03 09:38:06.163215123 +0200
++++ trunk/bin/dbfxtrct.cpp 2014-08-03 09:39:31.829216623 +0200
+@@ -48,7 +48,7 @@
+ {
+ std::cout << "\nUsage: dbfxtrct -iDATABASE.DBF -sINDEX.N[TD]X -f -F -dMM/DD/YY\n";
+ std::cout << "\nWhere DATABASE.DBF is the name of the database file to dump\n";
+- std::cout << "INDEX.NTX or .NDX is an optional index sort paramater\n";
++ std::cout << "INDEX.NTX or .NDX is an optional index sort parameter\n";
+ std::cout << "-f optional field name list in first record\n";
+ std::cout << "-F optional field name and attributes in first record\n";
+ std::cout << "MM/DD/YY is an optional output date format for any date fields\n";
+@@ -70,7 +70,7 @@
+ char buf[200];
+ xbExpn exp( &x );
+
+-/* Get the input paramaters
++/* Get the input parameters
+
+ -i input datafile name
+ -s optional sort index name
+@@ -82,7 +82,7 @@
+ {
+ p = av[i];
+ if( *p != '-' ){
+- std::cout << "Invalid paramater " << *p << std::endl;
++ std::cout << "Invalid parameter " << *p << std::endl;
+ Usage();
+ return 1;
+ }
+@@ -98,7 +98,7 @@
+ else if( *p == 'd' )
+ x.SetDefaultDateFormat( ++p );
+ else{
+- std::cout << "Invalid paramater " << *p << std::endl;
++ std::cout << "Invalid parameter " << *p << std::endl;
+ Usage();
+ return 1;
+ }
+@@ -146,7 +146,7 @@
+ }
+
+
+-/* if -f or -F paramater, dump the header information */
++/* if -f or -F parameter, dump the header information */
+ if( FieldOption ){
+ for( xbLong l = 0; l < d.FieldCount(); l++ ){
+ if( l ) std::cout << ",";
diff --git a/debian/patches/autoconf-updates.diff b/debian/patches/autoconf-updates.diff
index af5acf0..02dcfe7 100644
--- a/debian/patches/autoconf-updates.diff
+++ b/debian/patches/autoconf-updates.diff
@@ -1,3 +1,5 @@
+Description: patch to run autoconf
+
Index: b/AUTHORS
===================================================================
--- /dev/null
diff --git a/debian/patches/c++-includes.diff b/debian/patches/c++-includes.diff
index 9eada08..764a842 100644
--- a/debian/patches/c++-includes.diff
+++ b/debian/patches/c++-includes.diff
@@ -1,3 +1,5 @@
+Description: add req. #include
+
Index: b/xbase64/xbase64.cpp
===================================================================
--- a/xbase64/xbase64.cpp
diff --git a/debian/patches/fixconfig.diff b/debian/patches/fixconfig.diff
index c7bbf75..8ffb5b5 100644
--- a/debian/patches/fixconfig.diff
+++ b/debian/patches/fixconfig.diff
@@ -1,8 +1,10 @@
-Index: b/xbase64-config.in
+Description: Change LD
+
+Index: trunk/xbase64-config.in
===================================================================
---- a/xbase64-config.in
-+++ b/xbase64-config.in
-@@ -5,7 +5,7 @@
+--- trunk.orig/xbase64-config.in 2014-08-02 20:45:57.681245919 +0200
++++ trunk/xbase64-config.in 2014-08-02 20:46:09.461487567 +0200
+@@ -5,10 +5,10 @@
exec_prefix_set=no
CC="@CC@"
CXX="@CXX@"
@@ -10,4 +12,8 @@ Index: b/xbase64-config.in
+LD="@LD@"
usage="\
- Usage: xbase-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--cc] [--cxx] [--ld]"
+-Usage: xbase-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--cc] [--cxx] [--ld]"
++Usage: xbase64-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--cc] [--cxx] [--ld]"
+
+ if test $# -eq 0; then
+ echo "${usage}" 1>&2
diff --git a/debian/patches/gcc-fixes.diff b/debian/patches/gcc-fixes.diff
index e8a4b38..5a3149c 100644
--- a/debian/patches/gcc-fixes.diff
+++ b/debian/patches/gcc-fixes.diff
@@ -1,3 +1,5 @@
+Description: some fixes
+
Index: b/bin/dumprecs.cpp
===================================================================
--- a/bin/dumprecs.cpp
diff --git a/debian/patches/lesserg.diff b/debian/patches/lesserg.diff
index b6eb71e..d5d32c0 100644
--- a/debian/patches/lesserg.diff
+++ b/debian/patches/lesserg.diff
@@ -1,3 +1,5 @@
+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
diff --git a/debian/patches/series b/debian/patches/series
index c1a72e7..9721eb0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+0100-typo.patch
fixconfig.diff
autoconf-updates.diff
lesserg.diff