Hi, NMU patch is attached.
Christoph -- [EMAIL PROTECTED] | http://www.df7cb.de/
debdiff annoyance-filter_1.0.0b-4.dsc annoyance-filter_1.0.0b-4.1.dsc
annoyance-filter-1.0.0b/debian/changelog | 9 +++
annoyance-filter-1.0.0b/debian/rules | 4 -
annoyance-filter.cc | 79 ++++++++++++++-----------------
statlib.cc | 42 ++++++++--------
4 files changed, 70 insertions(+), 64 deletions(-)
reverted:
--- annoyance-filter-1.0.0b/annoyance-filter.cc
+++ annoyance-filter-1.0.0b.orig/annoyance-filter.cc
@@ -1,5 +1,5 @@
/*254:*/
+#line 9898 "annoyance-filter.w"
-#line 9901 "annoyance-filter.w"
#define REVDATE "2003-09-24"
#define Xfile string("X-Annoyance-Filter") \
@@ -24,7 +24,7 @@
#define Annotate(c) (annotations.test(c) ) \
+#line 9899 "annoyance-filter.w"
-#line 9902 "annoyance-filter.w"
/*232:*/
@@ -33,7 +33,7 @@
#include "config.h"
/*238:*/
+#line 9153 "annoyance-filter.w"
-#line 9156 "annoyance-filter.w"
#ifdef WIN32
#undef HAVE_MMAP
@@ -45,7 +45,7 @@
/*233:*/
+#line 9043 "annoyance-filter.w"
-#line 9045 "annoyance-filter.w"
#include <iostream>
#include <iomanip>
@@ -78,9 +78,8 @@
#line 9019 "annoyance-filter.w"
/*234:*/
+#line 9075 "annoyance-filter.w"
-#line 9077 "annoyance-filter.w"
-#include <alloc.h>
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
@@ -91,10 +90,8 @@
/*:234*/
#line 9020 "annoyance-filter.w"
-#include <cassert>
-
/*235:*/
+#line 9089 "annoyance-filter.w"
-#line 9092 "annoyance-filter.w"
#ifdef HAVE_STAT
#include <sys/stat.h>
@@ -110,7 +107,7 @@
#endif
/*:235*/
+#line 9021 "annoyance-filter.w"
-#line 9023 "annoyance-filter.w"
#ifdef WIN32
@@ -121,7 +118,7 @@
#include "statlib.h"
/*237:*/
+#line 9131 "annoyance-filter.w"
-#line 9134 "annoyance-filter.w"
#if defined(HAVE_GNUPLOT) && defined(HAVE_NETPBM) && defined(HAVE_SYSTEM)
#define HAVE_PLOT_UTILITIES
@@ -136,11 +133,11 @@
#endif
/*:237*/
+#line 9030 "annoyance-filter.w"
-#line 9032 "annoyance-filter.w"
/*236:*/
+#line 9109 "annoyance-filter.w"
-#line 9112 "annoyance-filter.w"
#if defined(HAVE_SOCKET) && defined(HAVE_SIGNAL)
#define POP3_PROXY_SERVER
@@ -157,11 +154,11 @@
#endif
/*:236*/
+#line 9032 "annoyance-filter.w"
-#line 9034 "annoyance-filter.w"
/*:232*/
+#line 9901 "annoyance-filter.w"
-#line 9904 "annoyance-filter.w"
/*226:*/
#line 8874 "annoyance-filter.w"
@@ -172,7 +169,7 @@
static bool saveParserDiagnostics= false;
/*:226*//*241:*/
+#line 9192 "annoyance-filter.w"
-#line 9195 "annoyance-filter.w"
static bool verbose= false;
#ifdef TYPE_LOG
@@ -190,7 +187,7 @@
static bool popProxyTrace= false;
/*:241*//*250:*/
+#line 9832 "annoyance-filter.w"
-#line 9835 "annoyance-filter.w"
#define ISOch(x) (static_cast<unsigned char> ((x) & 0xFF))
@@ -207,7 +204,7 @@
: (x))
/*:250*//*251:*/
+#line 9851 "annoyance-filter.w"
-#line 9854 "annoyance-filter.w"
const unsigned char isoalpha[32]= {
0,0,0,0,0,0,0,0,127,255,255,224,127,255,255,224,0,0,0,0,0,0,0,0,255,255,
@@ -225,7 +222,7 @@
};
/*:251*/
+#line 9902 "annoyance-filter.w"
-#line 9905 "annoyance-filter.w"
/*10:*/
#line 1250 "annoyance-filter.w"
@@ -2179,10 +2176,10 @@
#endif
/*:194*/
+#line 9903 "annoyance-filter.w"
-#line 9906 "annoyance-filter.w"
/*239:*/
+#line 9165 "annoyance-filter.w"
-#line 9168 "annoyance-filter.w"
static double mailBias= 2.0;
static unsigned int minOccurrences= 5;
@@ -2199,12 +2196,12 @@
static bool bsdFolder= false;
/*:239*//*240:*/
+#line 9184 "annoyance-filter.w"
-#line 9187 "annoyance-filter.w"
static unsigned int nTested= 0;
/*:240*/
+#line 9904 "annoyance-filter.w"
-#line 9907 "annoyance-filter.w"
/*11:*/
#line 1352 "annoyance-filter.w"
@@ -6594,7 +6591,7 @@
#endif
/*:215*/
+#line 9905 "annoyance-filter.w"
-#line 9908 "annoyance-filter.w"
/*225:*/
#line 8869 "annoyance-filter.w"
@@ -6603,13 +6600,13 @@
static fastDictionary fDict;
/*:225*//*249:*/
+#line 9822 "annoyance-filter.w"
-#line 9825 "annoyance-filter.w"
static tokenDefinition isoToken;
static tokenDefinition asciiToken;
/*:249*/
+#line 9906 "annoyance-filter.w"
-#line 9909 "annoyance-filter.w"
/*184:*/
#line 7748 "annoyance-filter.w"
@@ -6679,7 +6676,7 @@
}
/*:231*//*242:*/
+#line 9213 "annoyance-filter.w"
-#line 9216 "annoyance-filter.w"
static void usage(void)
{
@@ -6738,7 +6735,7 @@
}
/*:242*/
+#line 9907 "annoyance-filter.w"
-#line 9910 "annoyance-filter.w"
/*219:*/
#line 8718 "annoyance-filter.w"
@@ -6887,7 +6884,7 @@
}
/*:227*//*246:*/
+#line 9772 "annoyance-filter.w"
-#line 9775 "annoyance-filter.w"
static unsigned int nOptionalCaps= 0;
@@ -6901,14 +6898,14 @@
}
/*:246*/
+#line 9908 "annoyance-filter.w"
-#line 9911 "annoyance-filter.w"
/*223:*/
#line 8834 "annoyance-filter.w"
/*253:*/
+#line 9883 "annoyance-filter.w"
-#line 9886 "annoyance-filter.w"
#ifdef Jig
#endif
@@ -6933,7 +6930,7 @@
;
/*243:*/
+#line 9278 "annoyance-filter.w"
-#line 9281 "annoyance-filter.w"
@@ -7140,13 +7137,13 @@
case 206:
{
/*252:*/
+#line 9874 "annoyance-filter.w"
-#line 9877 "annoyance-filter.w"
#ifdef Jig
#endif
/*:252*/
+#line 9483 "annoyance-filter.w"
-#line 9486 "annoyance-filter.w"
;
}
break;
@@ -7365,12 +7362,12 @@
case 201:
{
/*245:*/
+#line 9758 "annoyance-filter.w"
-#line 9761 "annoyance-filter.w"
cout<<PRODUCT" "VERSION<<endl;
cout<<"Last revised: "REVDATE<<endl;
/*247:*/
+#line 9788 "annoyance-filter.w"
-#line 9791 "annoyance-filter.w"
#ifdef HAVE_PDF_DECODER
printOptionalCapability("Decoding strings in PDF attachments");
@@ -7397,7 +7394,7 @@
}
/*:247*/
+#line 9761 "annoyance-filter.w"
-#line 9764 "annoyance-filter.w"
;
cout<<"The latest version is always available from:"<<endl;
cout<<" http://www.fourmilab.ch/annoyance-filter/";<<endl;
@@ -7405,7 +7402,7 @@
cout<<" [EMAIL PROTECTED]"<<endl;
/*:245*/
+#line 9700 "annoyance-filter.w"
-#line 9703 "annoyance-filter.w"
;
}
return 0;
@@ -7432,7 +7429,7 @@
}
/*244:*/
+#line 9733 "annoyance-filter.w"
-#line 9736 "annoyance-filter.w"
if(pTokenTrace&&(pDiagFilename=="")){
cerr<<"Warning: --ptrace requested but no --pdiag file specified."<<endl;
@@ -7455,7 +7452,7 @@
}
/*:244*/
+#line 9725 "annoyance-filter.w"
-#line 9728 "annoyance-filter.w"
;
/*:243*/
@@ -7492,7 +7489,7 @@
}
/*:223*/
+#line 9909 "annoyance-filter.w"
-#line 9912 "annoyance-filter.w"
reverted:
--- annoyance-filter-1.0.0b/statlib.cc
+++ annoyance-filter-1.0.0b.orig/statlib.cc
@@ -8,7 +8,7 @@
/*4:*/
+#line 121 "statlib.w"
-#line 122 "statlib.w"
#include "dcdflib.h"
#include "statlib.h"
@@ -17,10 +17,10 @@
#line 92 "statlib.w"
/*5:*/
+#line 129 "statlib.w"
-#line 130 "statlib.w"
/*11:*/
+#line 379 "statlib.w"
-#line 380 "statlib.w"
double normalDistribution::p_from_mu_sigma_x(double mu,double sigma,double x){
double p,q,bound;
@@ -70,14 +70,14 @@
}
/*:11*//*12:*/
+#line 435 "statlib.w"
-#line 436 "statlib.w"
double normalDistribution::CDF_P(double x){
return p_from_mu_sigma_x(mu,sigma,x);
}
/*:12*//*14:*/
+#line 549 "statlib.w"
-#line 550 "statlib.w"
double chiSquareDistribution::p_from_k_x(double k,double x){
double p,q,bound;
@@ -115,14 +115,14 @@
}
/*:14*//*15:*/
+#line 593 "statlib.w"
-#line 594 "statlib.w"
double chiSquareDistribution::CDF_P(double x){
return p_from_k_x(k,x);
}
/*:15*//*17:*/
+#line 709 "statlib.w"
-#line 710 "statlib.w"
double gammaDistribution::p_from_alpha_lambda_x(double alpha,double
lambda,double x){
double p,q,bound;
@@ -172,14 +172,14 @@
}
/*:17*//*18:*/
+#line 761 "statlib.w"
-#line 762 "statlib.w"
double gammaDistribution::CDF_P(double x){
return p_from_alpha_lambda_x(alpha,lambda,x);
}
/*:18*//*20:*/
+#line 880 "statlib.w"
-#line 881 "statlib.w"
double betaDistribution::p_from_a_b_x(double a,double b,double x){
double p,q,y,bound;
@@ -232,14 +232,14 @@
}
/*:20*//*21:*/
+#line 935 "statlib.w"
-#line 936 "statlib.w"
double betaDistribution::CDF_P(double x){
return p_from_a_b_x(a,b,x);
}
/*:21*//*23:*/
+#line 1039 "statlib.w"
-#line 1040 "statlib.w"
double tDistribution::p_from_k_x(double k,double x){
double p,q,bound;
@@ -277,14 +277,14 @@
}
/*:23*//*24:*/
+#line 1083 "statlib.w"
-#line 1084 "statlib.w"
double tDistribution::CDF_P(double x){
return p_from_k_x(k,x);
}
/*:24*//*26:*/
+#line 1204 "statlib.w"
-#line 1205 "statlib.w"
double FDistribution::p_from_u_v_x(double u,double v,double x){
double p,q,bound;
@@ -334,14 +334,14 @@
}
/*:26*//*27:*/
+#line 1256 "statlib.w"
-#line 1257 "statlib.w"
double FDistribution::CDF_P(double x){
return p_from_u_v_x(u,v,x);
}
/*:27*//*29:*/
+#line 1351 "statlib.w"
-#line 1352 "statlib.w"
double poissonDistribution::p_from_lambda_x(double lambda,double x){
double p,q,bound;
@@ -379,14 +379,14 @@
}
/*:29*//*30:*/
+#line 1395 "statlib.w"
-#line 1396 "statlib.w"
double poissonDistribution::CDF_P(double x){
return p_from_lambda_x(lambda,x);
}
/*:30*//*32:*/
+#line 1521 "statlib.w"
-#line 1522 "statlib.w"
double binomialDistribution::p_from_n_r_s(double n,double r,double s){
double p,q,ri,bound;
@@ -439,14 +439,14 @@
}
/*:32*//*33:*/
+#line 1580 "statlib.w"
-#line 1581 "statlib.w"
double binomialDistribution::CDF_P(double x){
return p_from_n_r_s(n,r,x);
}
/*:33*//*35:*/
+#line 1697 "statlib.w"
-#line 1698 "statlib.w"
double negativeBinomialDistribution::p_from_n_r_s(double n,double r,double s){
double p,q,ri,bound;
@@ -499,14 +499,14 @@
}
/*:35*//*36:*/
+#line 1752 "statlib.w"
-#line 1753 "statlib.w"
double negativeBinomialDistribution::CDF_P(double x){
return p_from_n_r_s(n,r,x);
}
/*:36*/
+#line 130 "statlib.w"
-#line 131 "statlib.w"
/*:5*/
diff -u annoyance-filter-1.0.0b/debian/changelog
annoyance-filter-1.0.0b/debian/changelog
--- annoyance-filter-1.0.0b/debian/changelog
+++ annoyance-filter-1.0.0b/debian/changelog
@@ -1,3 +1,12 @@
+annoyance-filter (1.0.0b-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Apply workaround-patch by Andreas Jochens to fix FTBFS with gcc-4.0
+ (Closes: #300174).
+ * Fix clean target.
+
+ -- Christoph Berg <[EMAIL PROTECTED]> Mon, 7 Nov 2005 15:36:27 +0100
+
annoyance-filter (1.0.0b-4) unstable; urgency=low
* no changes - increasing version number (again) to force rebuild with gcc
3.3
diff -u annoyance-filter-1.0.0b/debian/rules
annoyance-filter-1.0.0b/debian/rules
--- annoyance-filter-1.0.0b/debian/rules
+++ annoyance-filter-1.0.0b/debian/rules
@@ -26,7 +26,7 @@
config.status: configure
dh_testdir
# Add here commands to configure the package.
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+ CFLAGS=-fpermissive ./configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info
build: build-stamp
@@ -35,7 +35,7 @@
dh_testdir
# Add here commands to compile the package.
- rm annoyance-filter.cc statlib.cc
+ -rm annoyance-filter.cc statlib.cc
$(MAKE)
#/usr/bin/docbook-to-man debian/annoyance-filter.sgml >
annoyance-filter.1
signature.asc
Description: Digital signature
