Package: tochnog
Version: 20010124-3.1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my tochnog 20010124-3.2 NMU.
diff -u tochnog-20010124/debian/patch-hevea.diff tochnog-20010124/debian/patch-hevea.diff
--- tochnog-20010124/debian/patch-hevea.diff
+++ tochnog-20010124/debian/patch-hevea.diff
@@ -20,7 +20,7 @@
+ rm -rf tnu
+ mkdir tnu
+ hevea -fix tnu.hva -o tnu.hevea $<
-+ rm -f tnu.image.* *.h{aux,ind,toc}
++ rm -f tnu.image.* *.haux *.hind *.htoc
+ mv tnu.hevea tnu???.png tnu
+ cd tnu && \
+ hacha -tocter tnu.hevea && \
@@ -34,7 +34,7 @@
+ hevea -fix -o tnp/tnp.hevea $<
+ cd tnp && \
+ hacha tnp.hevea && \
-+ rm -f *.h{evea,aux,ind,toc}
++ rm -f *.hevea *.haux *.hind *.htoc
tngid/tngid.html: tngid.tex
- latex2html -local_icons tngid
@@ -44,7 +44,7 @@
+ hevea -fix -o tngid/tngid.hevea $<
+ cd tngid && \
+ hacha tngid.hevea && \
-+ rm -f *.h{evea,aux,ind,toc}
++ rm -f *.hevea *.haux *.hind *.htoc
clean:
rm -f *.ps *.log *.dvi *.aux *.toc *.bak
diff -u tochnog-20010124/debian/changelog tochnog-20010124/debian/changelog
--- tochnog-20010124/debian/changelog
+++ tochnog-20010124/debian/changelog
@@ -1,3 +1,15 @@
+tochnog (20010124-3.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ [ Michael Schutte ]
+ * Fixed hevea patch, which previously used brace expansion, to avoid getting
+ different package contents when using dash (Closes: #459188).
+
+ [ Luk Claes ]
+ * Fix FTBFS with GCC 4.3 (Closes: #417733).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Sat, 08 Mar 2008 18:06:30 +0000
+
tochnog (20010124-3.1) unstable; urgency=medium
* Non-maintainer upload to fix Failure To Build From Source.
diff -u tochnog-20010124/debian/patch-c++.diff tochnog-20010124/debian/patch-c++.diff
--- tochnog-20010124/debian/patch-c++.diff
+++ tochnog-20010124/debian/patch-c++.diff
@@ -25,10 +25,11 @@
diff -Nur tochnog~/src/bounda.cc tochnog/src/bounda.cc
--- tochnog~/src/bounda.cc 2000-12-25 18:36:46.000000000 +0800
+++ tochnog/src/bounda.cc 2006-03-07 04:28:21.000000000 +0800
-@@ -20,6 +20,8 @@
+@@ -20,6 +20,9 @@
#include "tochnog.h"
-
++#include <cstring>
+
+using namespace std;
+
#define EPS_ATAN 1.e-10
@@ -37,10 +38,11 @@
diff -Nur tochnog~/src/calcul.cc tochnog/src/calcul.cc
--- tochnog~/src/calcul.cc 2001-01-20 19:07:15.000000000 +0800
+++ tochnog/src/calcul.cc 2006-03-07 04:28:27.000000000 +0800
-@@ -20,6 +20,8 @@
+@@ -20,6 +20,9 @@
#include "tochnog.h"
-
++#include <cstring>
+
+using namespace std;
+
#define NTYPE 3
@@ -49,10 +51,11 @@
diff -Nur tochnog~/src/check.cc tochnog/src/check.cc
--- tochnog~/src/check.cc 2001-01-20 04:49:11.000000000 +0800
+++ tochnog/src/check.cc 2006-03-07 04:10:46.000000000 +0800
-@@ -20,6 +20,8 @@
+@@ -20,6 +20,9 @@
#include "tochnog.h"
-
++#include <cstring>
+
+using namespace std;
+
long int check( long int idat, long int task )
@@ -85,9 +88,10 @@
diff -Nur tochnog~/src/input.cc tochnog/src/input.cc
--- tochnog~/src/input.cc 2001-01-18 03:30:40.000000000 +0800
+++ tochnog/src/input.cc 2006-03-07 04:28:51.000000000 +0800
-@@ -20,6 +20,8 @@
+@@ -20,6 +20,9 @@
#include "tochnog.h"
++#include <cstring>
+using namespace std;
+
@@ -109,9 +113,10 @@
diff -Nur tochnog~/src/miscel.cc tochnog/src/miscel.cc
--- tochnog~/src/miscel.cc 2001-01-21 16:15:23.000000000 +0800
+++ tochnog/src/miscel.cc 2006-03-07 04:16:06.000000000 +0800
-@@ -19,6 +19,8 @@
+@@ -19,6 +19,9 @@
#include "tochnog.h"
++#include <cstring>
+using namespace std;
+
@@ -145,9 +150,10 @@
diff -Nur tochnog~/src/print_da.cc tochnog/src/print_da.cc
--- tochnog~/src/print_da.cc 2000-12-25 18:36:46.000000000 +0800
+++ tochnog/src/print_da.cc 2006-03-07 04:20:02.000000000 +0800
-@@ -19,6 +19,8 @@
+@@ -19,6 +19,9 @@
#include "tochnog.h"
++#include <cstring>
+using namespace std;
+
@@ -157,9 +163,10 @@
diff -Nur tochnog~/src/print_db.cc tochnog/src/print_db.cc
--- tochnog~/src/print_db.cc 2000-12-25 22:59:16.000000000 +0800
+++ tochnog/src/print_db.cc 2006-03-07 04:19:32.000000000 +0800
-@@ -19,6 +19,8 @@
+@@ -19,6 +19,9 @@
#include "tochnog.h"
++#include <cstring>
+using namespace std;
+
@@ -169,9 +176,10 @@
diff -Nur tochnog~/src/print_dx.cc tochnog/src/print_dx.cc
--- tochnog~/src/print_dx.cc 2000-12-25 18:36:46.000000000 +0800
+++ tochnog/src/print_dx.cc 2006-03-07 04:29:12.000000000 +0800
-@@ -19,6 +19,8 @@
+@@ -19,6 +19,9 @@
#include "tochnog.h"
++#include <cstring>
+using namespace std;
+
@@ -181,9 +189,10 @@
diff -Nur tochnog~/src/print_el.cc tochnog/src/print_el.cc
--- tochnog~/src/print_el.cc 2000-12-25 18:36:46.000000000 +0800
+++ tochnog/src/print_el.cc 2006-03-07 04:21:07.000000000 +0800
-@@ -19,6 +19,8 @@
+@@ -19,6 +19,9 @@
#include "tochnog.h"
++#include <cstring>
+using namespace std;
+
@@ -193,9 +202,10 @@
diff -Nur tochnog~/src/print_g5.cc tochnog/src/print_g5.cc
--- tochnog~/src/print_g5.cc 2000-12-25 18:36:46.000000000 +0800
+++ tochnog/src/print_g5.cc 2006-03-07 04:21:49.000000000 +0800
-@@ -19,6 +19,8 @@
+@@ -19,6 +19,9 @@
#include "tochnog.h"
++#include <cstring>
+using namespace std;
+
@@ -205,9 +215,10 @@
diff -Nur tochnog~/src/print_gm.cc tochnog/src/print_gm.cc
--- tochnog~/src/print_gm.cc 2000-12-25 18:36:46.000000000 +0800
+++ tochnog/src/print_gm.cc 2006-03-07 04:22:02.000000000 +0800
-@@ -19,6 +19,8 @@
+@@ -19,6 +19,9 @@
#include "tochnog.h"
++#include <cstring>
+using namespace std;
+
@@ -217,9 +228,10 @@
diff -Nur tochnog~/src/print_hi.cc tochnog/src/print_hi.cc
--- tochnog~/src/print_hi.cc 2000-12-25 18:36:46.000000000 +0800
+++ tochnog/src/print_hi.cc 2006-03-07 04:22:16.000000000 +0800
-@@ -19,6 +19,8 @@
+@@ -19,6 +19,9 @@
#include "tochnog.h"
++#include <cstring>
+using namespace std;
+
@@ -229,9 +241,10 @@
diff -Nur tochnog~/src/print_ma.cc tochnog/src/print_ma.cc
--- tochnog~/src/print_ma.cc 2000-12-25 18:36:46.000000000 +0800
+++ tochnog/src/print_ma.cc 2006-03-07 04:22:40.000000000 +0800
-@@ -19,6 +19,8 @@
+@@ -19,6 +19,9 @@
#include "tochnog.h"
++#include <cstring>
+using namespace std;
+
@@ -241,9 +254,10 @@
diff -Nur tochnog~/src/print_pl.cc tochnog/src/print_pl.cc
--- tochnog~/src/print_pl.cc 2000-12-25 18:36:46.000000000 +0800
+++ tochnog/src/print_pl.cc 2006-03-07 04:29:24.000000000 +0800
-@@ -19,6 +19,8 @@
+@@ -19,6 +19,9 @@
#include "tochnog.h"
++#include <cstring>
+using namespace std;
+
@@ -253,9 +267,10 @@
diff -Nur tochnog~/src/print_te.cc tochnog/src/print_te.cc
--- tochnog~/src/print_te.cc 2001-01-10 17:25:10.000000000 +0800
+++ tochnog/src/print_te.cc 2006-03-07 04:22:55.000000000 +0800
-@@ -19,6 +19,8 @@
+@@ -19,6 +19,9 @@
#include "tochnog.h"
++#include <cstring>
+using namespace std;
+
@@ -265,9 +280,10 @@
diff -Nur tochnog~/src/print_un.cc tochnog/src/print_un.cc
--- tochnog~/src/print_un.cc 2000-12-25 18:36:46.000000000 +0800
+++ tochnog/src/print_un.cc 2006-03-07 04:23:07.000000000 +0800
-@@ -19,6 +19,8 @@
+@@ -19,6 +19,9 @@
#include "tochnog.h"
++#include <cstring>
+using namespace std;
+
@@ -277,9 +293,10 @@
diff -Nur tochnog~/src/print_vt.cc tochnog/src/print_vt.cc
--- tochnog~/src/print_vt.cc 2000-12-25 18:36:46.000000000 +0800
+++ tochnog/src/print_vt.cc 2006-03-07 04:23:14.000000000 +0800
-@@ -19,6 +19,8 @@
+@@ -19,6 +19,9 @@
#include "tochnog.h"
++#include <cstring>
+using namespace std;
+
@@ -289,9 +306,10 @@
diff -Nur tochnog~/src/range.cc tochnog/src/range.cc
--- tochnog~/src/range.cc 2000-12-25 18:36:46.000000000 +0800
+++ tochnog/src/range.cc 2006-03-07 04:23:36.000000000 +0800
-@@ -19,6 +19,8 @@
+@@ -19,6 +19,9 @@
#include "tochnog.h"
++#include <cstring>
+using namespace std;
+
@@ -337,9 +355,10 @@
diff -Nur tochnog~/src/so.cc tochnog/src/so.cc
--- tochnog~/src/so.cc 2000-12-25 18:36:46.000000000 +0800
+++ tochnog/src/so.cc 2006-03-07 04:24:53.000000000 +0800
-@@ -19,6 +19,8 @@
+@@ -19,6 +19,9 @@
#include "tochnog.h"
++#include <cstring>
+using namespace std;
+
@@ -373,9 +392,10 @@
diff -Nur tochnog~/src/tn.cc tochnog/src/tn.cc
--- tochnog~/src/tn.cc 2000-12-25 18:36:47.000000000 +0800
+++ tochnog/src/tn.cc 2006-03-07 04:29:44.000000000 +0800
-@@ -19,6 +19,8 @@
+@@ -19,6 +19,9 @@
#include "tochnog.h"
++#include <cstring>
+using namespace std;
+
@@ -442,0 +463,72 @@
+--- tochnog/src/database.cc~ 2007-04-04 12:29:02.000000000 +0000
++++ tochnog/src/database.cc 2007-04-04 12:29:10.000000000 +0000
+@@ -19,6 +19,8 @@
+ */
+
+ #include "tochnog.h"
++#include <climits>
++#include <cstring>
+
+ double *dbl_data[MDAT][MVERSION]; // pointer to actual double data
+ long int *int_data[MDAT][MVERSION]; // pointers to actual integer data
+--- tochnog/src/distri.cc~ 2007-04-04 12:29:02.000000000 +0000
++++ tochnog/src/distri.cc 2007-04-04 12:29:10.000000000 +0000
+@@ -19,6 +19,7 @@
+ */
+
+ #include "tochnog.h"
++#include <cstring>
+
+ void distribute( void )
+
+--- tochnog/src/hypoplas.cc~ 2007-04-04 12:29:02.000000000 +0000
++++ tochnog/src/hypoplas.cc 2007-04-04 12:29:10.000000000 +0000
+@@ -19,6 +19,7 @@
+ */
+
+ #include "tochnog.h"
++#include <cstring>
+
+ #define LENGTH_WOLFERSDORFF 8
+ #define LENGTH_INTERGRANULARSTRAIN 5
+--- tochnog/src/initia.cc~ 2007-04-04 12:29:02.000000000 +0000
++++ tochnog/src/initia.cc 2007-04-04 12:29:10.000000000 +0000
+@@ -19,6 +19,7 @@
+ */
+
+ #include "tochnog.h"
++#include <cstring>
+
+ // this routine is only meant to initialize static variables
+
+--- tochnog/src/math.cc~ 2007-04-04 12:29:02.000000000 +0000
++++ tochnog/src/math.cc 2007-04-04 12:29:10.000000000 +0000
+@@ -19,6 +19,7 @@
+
+ #include "tochnog.h"
+
++#include <cstring>
+ #define EPS_Q 1.e-10
+ #define EPS_DET 1.e-10
+
+--- tochnog/src/sysposix.cc~ 2007-04-04 12:29:02.000000000 +0000
++++ tochnog/src/sysposix.cc 2007-04-04 12:29:10.000000000 +0000
+@@ -19,6 +19,8 @@
+
+ #include "tochnog.h"
+ #include "pthread.h"
++
++using namespace std;
+
+ pthread_mutex_t mutex;
+ long int inext=0;
+--- tochnog/src/syssgi.cc~ 2007-04-04 12:29:02.000000000 +0000
++++ tochnog/src/syssgi.cc 2007-04-04 12:29:10.000000000 +0000
+@@ -19,6 +19,7 @@
+
+ #include "tochnog.h"
+ #include "task.h"
++#include <cstring>
+
+ void parallel_sys_initialize( void )
+
