The attached patch fixes compilation. Should be applied to the
package root (touches debian/patches).
Cheers,
Davide
--
Time flies like an arrow. Fruit flies like a banana.
--
If anything can go wrong it wSegmentation fault
core dumped
diff -urNad paw-2.14.04.dfsg.2/debian/patches/00list paw-2.14.04.dfsg.2.fix/debian/patches/00list
--- paw-2.14.04.dfsg.2/debian/patches/00list 2010-02-02 23:44:32.000000000 +0100
+++ paw-2.14.04.dfsg.2.fix/debian/patches/00list 2010-02-02 23:49:23.392281514 +0100
@@ -6,6 +6,7 @@
119-fix-compiler-warnings.dpatch
120-fix-mlp-cdf-file.dpatch
121-call-gfortran-in-cscrexec.dpatch
+131-define-l_cuserid.dpatch
200-comis-allow-special-chars-in-path.dpatch
207-compile-temp-libs-with-fPIC.dpatch
210-improve-cfortran-header-files.dpatch
diff -urNad paw-2.14.04.dfsg.2/debian/patches/102-dont-optimize-some-code.dpatch paw-2.14.04.dfsg.2.fix/debian/patches/102-dont-optimize-some-code.dpatch
--- paw-2.14.04.dfsg.2/debian/patches/102-dont-optimize-some-code.dpatch 2010-02-02 23:44:32.000000000 +0100
+++ paw-2.14.04.dfsg.2.fix/debian/patches/102-dont-optimize-some-code.dpatch 2010-02-02 23:45:56.100277197 +0100
@@ -7,8 +7,8 @@
@DPATCH@
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile
---- cernlib-2005.05.09/src/pawlib/comis/code/Imakefile 2001-09-14 09:08:51.000000000 -0400
-+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile 2005-06-09 11:19:57.756983183 -0400
+--- cernlib-2005.05.09~/src/pawlib/comis/code/Imakefile 2001-09-14 09:08:51.000000000 -0400
++++ cernlib-2005.05.09/src/pawlib/comis/code/Imakefile 2005-06-09 11:19:57.756983183 -0400
@@ -101,4 +101,10 @@
SpecialFortranLibObjectRule(cskide,cskide,-O0,NullParameter)
#endif
diff -urNad paw-2.14.04.dfsg.2/debian/patches/105-fix-obsolete-xmfontlistcreate-warning.dpatch paw-2.14.04.dfsg.2.fix/debian/patches/105-fix-obsolete-xmfontlistcreate-warning.dpatch
--- paw-2.14.04.dfsg.2/debian/patches/105-fix-obsolete-xmfontlistcreate-warning.dpatch 2010-02-02 23:44:32.000000000 +0100
+++ paw-2.14.04.dfsg.2.fix/debian/patches/105-fix-obsolete-xmfontlistcreate-warning.dpatch 2010-02-02 23:46:08.832277238 +0100
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad cernlib-2005.05.09/src/pawlib/paw/cmotif/att_font.c /tmp/dpep.kv7bf1/cernlib-2005.05.09/src/pawlib/paw/cmotif/att_font.c
---- cernlib-2005.05.09/src/pawlib/paw/cmotif/att_font.c 2000-10-03 10:11:22.000000000 -0400
-+++ /tmp/dpep.kv7bf1/cernlib-2005.05.09/src/pawlib/paw/cmotif/att_font.c 2005-06-09 14:39:00.803818666 -0400
+--- cernlib-2005.05.09~/src/pawlib/paw/cmotif/att_font.c 2000-10-03 10:11:22.000000000 -0400
++++ cernlib-2005.05.09/src/pawlib/paw/cmotif/att_font.c 2005-06-09 14:39:00.803818666 -0400
@@ -215,18 +215,22 @@
*****************************************************************************/
static void MajButton(Widget w, Widget font,Widget pre,int postab)
diff -urNad paw-2.14.04.dfsg.2/debian/patches/108-quote-protect-comis-script.dpatch paw-2.14.04.dfsg.2.fix/debian/patches/108-quote-protect-comis-script.dpatch
--- paw-2.14.04.dfsg.2/debian/patches/108-quote-protect-comis-script.dpatch 2010-02-02 23:44:32.000000000 +0100
+++ paw-2.14.04.dfsg.2.fix/debian/patches/108-quote-protect-comis-script.dpatch 2010-02-02 23:46:20.060277134 +0100
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.tIRzzG/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F
---- cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F 2000-09-25 10:16:36.000000000 -0400
-+++ /tmp/dpep.tIRzzG/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F 2005-06-09 15:41:16.757077306 -0400
+--- cernlib-2005.05.09~/src/pawlib/comis/code/cscrexec.F 2000-09-25 10:16:36.000000000 -0400
++++ cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F 2005-06-09 15:41:16.757077306 -0400
@@ -70,7 +70,7 @@
LEXEC=LENOCC(FEXEC)
OPEN(LUNOUT,FILE=FEXEC(:LEXEC), STATUS='UNKNOWN',ERR=99)
diff -urNad paw-2.14.04.dfsg.2/debian/patches/131-define-l_cuserid.dpatch paw-2.14.04.dfsg.2.fix/debian/patches/131-define-l_cuserid.dpatch
--- paw-2.14.04.dfsg.2/debian/patches/131-define-l_cuserid.dpatch 1970-01-01 01:00:00.000000000 +0100
+++ paw-2.14.04.dfsg.2.fix/debian/patches/131-define-l_cuserid.dpatch 2010-01-25 21:38:32.848728100 +0100
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 131-define-l_cuserid.dpatch by <are...@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Define L_cuserid.
+
+...@dpatch@
+
+diff -urNad paw-2.14.04.dfsg.2~/upstream/2006/src/pawlib/paw/cpaw/bugrep.c paw-2.14.04.dfsg.2/upstream/2006/src/pawlib/paw/cpaw/bugrep.c
+--- paw-2.14.04.dfsg.2~/src/pawlib/paw/cpaw/bugrep.c 2006-12-07 14:26:54.000000000 +0100
++++ paw-2.14.04.dfsg.2/src/pawlib/paw/cpaw/bugrep.c 2010-01-21 14:32:27.000000000 +0100
+@@ -50,6 +50,7 @@
+ #include <assert.h>
+ #include <string.h>
+ #include <stdlib.h>
++#define L_cuserid 9
+
+
+ char *pavers();
diff -urNad paw-2.14.04.dfsg.2/debian/patches/200-comis-allow-special-chars-in-path.dpatch paw-2.14.04.dfsg.2.fix/debian/patches/200-comis-allow-special-chars-in-path.dpatch
--- paw-2.14.04.dfsg.2/debian/patches/200-comis-allow-special-chars-in-path.dpatch 2010-02-02 23:44:32.000000000 +0100
+++ paw-2.14.04.dfsg.2.fix/debian/patches/200-comis-allow-special-chars-in-path.dpatch 2010-02-02 23:46:31.200277239 +0100
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F /tmp/dpep.gkT1Y2/cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F
---- cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F 1997-05-20 05:37:58.000000000 -0400
-+++ /tmp/dpep.gkT1Y2/cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F 2005-06-08 19:34:43.101436210 -0400
+--- cernlib-2005.05.09~/src/pawlib/paw/code/pawfca.F 1997-05-20 05:37:58.000000000 -0400
++++ cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F 2005-06-08 19:34:43.101436210 -0400
@@ -29,6 +29,7 @@
C. * CHFUNC may be the name of a COMIS function *
C. * or a file name. A file cannot contain one of *
diff -urNad paw-2.14.04.dfsg.2/debian/patches/207-compile-temp-libs-with-fPIC.dpatch paw-2.14.04.dfsg.2.fix/debian/patches/207-compile-temp-libs-with-fPIC.dpatch
--- paw-2.14.04.dfsg.2/debian/patches/207-compile-temp-libs-with-fPIC.dpatch 2010-02-02 23:44:32.000000000 +0100
+++ paw-2.14.04.dfsg.2.fix/debian/patches/207-compile-temp-libs-with-fPIC.dpatch 2010-02-02 23:46:45.200277218 +0100
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.srSRmd/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F
---- cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F 2000-09-25 10:16:36.000000000 -0400
-+++ /tmp/dpep.srSRmd/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F 2005-06-09 15:47:44.859676286 -0400
+--- cernlib-2005.05.09~/src/pawlib/comis/code/cscrexec.F 2000-09-25 10:16:36.000000000 -0400
++++ cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F 2005-06-09 15:47:44.859676286 -0400
@@ -81,12 +81,12 @@
WRITE(LUNOUT,'(A)')CHLINE(:L)
IF(FEXT.EQ.'.c')THEN
diff -urNad paw-2.14.04.dfsg.2/debian/patches/210-improve-cfortran-header-files.dpatch paw-2.14.04.dfsg.2.fix/debian/patches/210-improve-cfortran-header-files.dpatch
--- paw-2.14.04.dfsg.2/debian/patches/210-improve-cfortran-header-files.dpatch 2010-02-02 23:44:32.000000000 +0100
+++ paw-2.14.04.dfsg.2.fix/debian/patches/210-improve-cfortran-header-files.dpatch 2010-02-02 23:47:01.812277155 +0100
@@ -7,8 +7,8 @@
@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/comis.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/comis.h
---- cernlib-2005.05.09/src/cfortran/comis.h 1999-10-29 07:41:26.000000000 -0400
-+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/comis.h 2005-06-10 12:51:30.985999665 -0400
+--- cernlib-2005.05.09~/src/cfortran/comis.h 1999-10-29 07:41:26.000000000 -0400
++++ cernlib-2005.05.09/src/cfortran/comis.h 2005-06-10 12:51:30.985999665 -0400
@@ -1,3 +1,11 @@
+#ifndef _COMIS_H
+#define _COMIS_H
@@ -32,8 +32,8 @@
+
+#endif /* #ifndef _COMIS_H */
diff -urNad cernlib-2005.05.09/src/cfortran/paw.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/paw.h
---- cernlib-2005.05.09/src/cfortran/paw.h 2000-10-05 10:27:55.000000000 -0400
-+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/paw.h 2005-06-10 12:51:31.464897452 -0400
+--- cernlib-2005.05.09~/src/cfortran/paw.h 2000-10-05 10:27:55.000000000 -0400
++++ cernlib-2005.05.09/src/cfortran/paw.h 2005-06-10 12:51:31.464897452 -0400
@@ -1,6 +1,20 @@
+#ifndef _PAW_H
+#define _PAW_H
diff -urNad paw-2.14.04.dfsg.2/debian/patches/305-use-POWERPC-not-PPC-as-test.dpatch paw-2.14.04.dfsg.2.fix/debian/patches/305-use-POWERPC-not-PPC-as-test.dpatch
--- paw-2.14.04.dfsg.2/debian/patches/305-use-POWERPC-not-PPC-as-test.dpatch 2010-02-02 23:44:32.000000000 +0100
+++ paw-2.14.04.dfsg.2.fix/debian/patches/305-use-POWERPC-not-PPC-as-test.dpatch 2010-02-02 23:47:50.308277185 +0100
@@ -8,8 +8,8 @@
@DPATCH@
diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/Imakefile /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/pawlib/paw/code/Imakefile
---- cernlib-2005.05.09/src/pawlib/paw/code/Imakefile 1998-09-25 05:33:51.000000000 -0400
-+++ /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/pawlib/paw/code/Imakefile 2005-06-09 10:50:47.068482917 -0400
+--- cernlib-2005.05.09~/src/pawlib/paw/code/Imakefile 1998-09-25 05:33:51.000000000 -0400
++++ cernlib-2005.05.09/src/pawlib/paw/code/Imakefile 2005-06-09 10:50:47.068482917 -0400
@@ -56,7 +56,7 @@
SubdirLibraryTarget(NullParameter,NullParameter)
@@ -20,8 +20,8 @@
#endif
diff -urNad cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile
---- cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile 1999-09-14 05:20:08.000000000 -0400
-+++ /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile 2005-06-09 10:51:15.807396176 -0400
+--- cernlib-2005.05.09~/src/pawlib/paw/ntuple/Imakefile 1999-09-14 05:20:08.000000000 -0400
++++ cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile 2005-06-09 10:51:15.807396176 -0400
@@ -46,7 +46,7 @@
SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad paw-2.14.04.dfsg.2/debian/patches/306-patch-assert.h-for-makedepend.dpatch paw-2.14.04.dfsg.2.fix/debian/patches/306-patch-assert.h-for-makedepend.dpatch
--- paw-2.14.04.dfsg.2/debian/patches/306-patch-assert.h-for-makedepend.dpatch 2010-02-02 23:44:32.000000000 +0100
+++ paw-2.14.04.dfsg.2.fix/debian/patches/306-patch-assert.h-for-makedepend.dpatch 2010-01-25 21:32:09.457096185 +0100
@@ -6,9 +6,9 @@
## DP: makedepend (cf. Debian bug # 171908).
@DPATCH@
-diff -urNad cernlib-2005.05.09/src/include/assert.h /tmp/dpep.9sKNsJ/cernlib-2005.05.09/src/include/assert.h
---- cernlib-2005.05.09/src/include/assert.h 1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep.9sKNsJ/cernlib-2005.05.09/src/include/assert.h 2005-06-09 12:50:41.751880968 -0400
+diff -urNad cernlib-2005.05.09~/src/include/assert.h cernlib-2005.05.09/src/include/assert.h
+--- cernlib-2005.05.09~/src/include/assert.h 1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09/src/include/assert.h 2005-06-09 12:50:41.751880968 -0400
@@ -0,0 +1,153 @@
+#ifndef CERNLIB_LINUX
+# include "/usr/include/assert.h"
diff -urNad paw-2.14.04.dfsg.2/debian/patches/308-use-canonical-cfortran-location.dpatch paw-2.14.04.dfsg.2.fix/debian/patches/308-use-canonical-cfortran-location.dpatch
--- paw-2.14.04.dfsg.2/debian/patches/308-use-canonical-cfortran-location.dpatch 2010-02-02 23:44:32.000000000 +0100
+++ paw-2.14.04.dfsg.2.fix/debian/patches/308-use-canonical-cfortran-location.dpatch 2010-02-02 23:47:38.640277197 +0100
@@ -7,8 +7,8 @@
@DPATCH@
diff -urNad cernlib-2005.05.09/src/pawlib/paw/testsuite/tuple/tuple.c /tmp/dpep.d3syqe/cernlib-2005.05.09/src/pawlib/paw/testsuite/tuple/tuple.c
---- cernlib-2005.05.09/src/pawlib/paw/testsuite/tuple/tuple.c 1996-04-17 10:46:29.000000000 -0400
-+++ /tmp/dpep.d3syqe/cernlib-2005.05.09/src/pawlib/paw/testsuite/tuple/tuple.c 2005-06-09 13:14:58.654908060 -0400
+--- cernlib-2005.05.09~/src/pawlib/paw/testsuite/tuple/tuple.c 1996-04-17 10:46:29.000000000 -0400
++++ cernlib-2005.05.09/src/pawlib/paw/testsuite/tuple/tuple.c 2005-06-09 13:14:58.654908060 -0400
@@ -16,7 +16,7 @@
#include <float.h>
diff -urNad paw-2.14.04.dfsg.2/debian/patches/313-comis-preserves-filename-case.dpatch paw-2.14.04.dfsg.2.fix/debian/patches/313-comis-preserves-filename-case.dpatch
--- paw-2.14.04.dfsg.2/debian/patches/313-comis-preserves-filename-case.dpatch 2010-02-02 23:44:32.000000000 +0100
+++ paw-2.14.04.dfsg.2.fix/debian/patches/313-comis-preserves-filename-case.dpatch 2010-02-02 23:48:04.088277479 +0100
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/pawint3.F /tmp/dpep.GROFhd/cernlib-2005.05.09/src/pawlib/paw/code/pawint3.F
---- cernlib-2005.05.09/src/pawlib/paw/code/pawint3.F 1999-05-20 03:37:18.000000000 -0400
-+++ /tmp/dpep.GROFhd/cernlib-2005.05.09/src/pawlib/paw/code/pawint3.F 2005-06-09 15:23:49.276738602 -0400
+--- cernlib-2005.05.09~/src/pawlib/paw/code/pawint3.F 1999-05-20 03:37:18.000000000 -0400
++++ cernlib-2005.05.09/src/pawlib/paw/code/pawint3.F 2005-06-09 15:23:49.276738602 -0400
@@ -140,7 +140,7 @@
CHUTIT = ' '
*
diff -urNad paw-2.14.04.dfsg.2/debian/patches/705-patch-paw_motif-paw-Imakefiles.dpatch paw-2.14.04.dfsg.2.fix/debian/patches/705-patch-paw_motif-paw-Imakefiles.dpatch
--- paw-2.14.04.dfsg.2/debian/patches/705-patch-paw_motif-paw-Imakefiles.dpatch 2010-02-02 23:44:32.000000000 +0100
+++ paw-2.14.04.dfsg.2.fix/debian/patches/705-patch-paw_motif-paw-Imakefiles.dpatch 2010-01-21 15:25:54.536276966 +0100
@@ -6,9 +6,9 @@
## DP: its own library.
@DPATCH@
-diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/Imakefile
---- cernlib-2005.05.09/src/Imakefile 2005-06-13 16:04:27.418461884 -0400
-+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/Imakefile 2005-06-13 16:04:48.698899728 -0400
+diff -urNad cernlib-2005.05.09~/src/Imakefile cernlib-2005.05.09/src/Imakefile
+--- cernlib-2005.05.09~/src/Imakefile 2005-06-13 16:04:27.418461884 -0400
++++ cernlib-2005.05.09/src/Imakefile 2005-06-13 16:04:48.698899728 -0400
@@ -2,7 +2,7 @@
#define PassCDebugFlags
@@ -18,9 +18,9 @@
SUBDIRS= $(LIBDIRS) patchy cfortran
-diff -urNad cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile
---- cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile 1999-08-31 04:47:07.000000000 -0400
-+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile 2005-06-13 16:05:01.263206159 -0400
+diff -urNad cernlib-2005.05.09~/src/pawlib/paw/cdf/Imakefile cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile
+--- cernlib-2005.05.09~/src/pawlib/paw/cdf/Imakefile 1999-08-31 04:47:07.000000000 -0400
++++ cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile 2005-06-13 16:05:01.263206159 -0400
@@ -1,6 +1,6 @@
#define IHaveCDF
@@ -29,9 +29,9 @@
#ifdef CERNLIB_IBMRT
/* Otherwise cc dies with internal compiler error on pawcdf.
-diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/code/Imakefile
---- cernlib-2005.05.09/src/pawlib/paw/code/Imakefile 2005-06-13 16:04:26.689618135 -0400
-+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/code/Imakefile 2005-06-13 16:04:33.962059051 -0400
+diff -urNad cernlib-2005.05.09~/src/pawlib/paw/code/Imakefile cernlib-2005.05.09/src/pawlib/paw/code/Imakefile
+--- cernlib-2005.05.09~/src/pawlib/paw/code/Imakefile 2005-06-13 16:04:26.689618135 -0400
++++ cernlib-2005.05.09/src/pawlib/paw/code/Imakefile 2005-06-13 16:04:33.962059051 -0400
@@ -11,8 +11,8 @@
pautit.F pavect.F paw.F pawbrk.F pawdef.F pawfca.F \ @@\
pawfitz.F pawfop.F pawfu1.F pawfu2.F \ @@\
@@ -43,9 +43,9 @@
pawsim.F pawusr.F pawuwf.F paxcut.F pazdz.F pazfz.F pazrz.F \ @@\
pchain.F pchclo.F pchncd.F pchrop.F pcnext.F pfclos.F \ @@\
pfhigz.F pfindc.F pfindf.F pfindf1.F pfindv.F pfinit.F pflog.F \ @@\
-diff -urNad cernlib-2005.05.09/src/pawlib/paw/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/Imakefile
---- cernlib-2005.05.09/src/pawlib/paw/Imakefile 2000-06-27 11:27:03.000000000 -0400
-+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/Imakefile 2005-06-13 16:04:33.962059051 -0400
+diff -urNad cernlib-2005.05.09~/src/pawlib/paw/Imakefile cernlib-2005.05.09/src/pawlib/paw/Imakefile
+--- cernlib-2005.05.09~/src/pawlib/paw/Imakefile 2000-06-27 11:27:03.000000000 -0400
++++ cernlib-2005.05.09/src/pawlib/paw/Imakefile 2005-06-13 16:04:33.962059051 -0400
@@ -9,6 +9,9 @@
LIBDIRS= code cpaw cdf ntuple mlpfit
@@ -64,18 +64,18 @@
SUBDIRS= $(LIBDIRS) programs piafs hbpiaf stagerd paw
-diff -urNad cernlib-2005.05.09/src/paw_motif/cdf/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/cdf/Imakefile
---- cernlib-2005.05.09/src/paw_motif/cdf/Imakefile 1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/cdf/Imakefile 2005-06-13 16:04:33.963058837 -0400
+diff -urNad cernlib-2005.05.09~/src/paw_motif/cdf/Imakefile cernlib-2005.05.09/src/paw_motif/cdf/Imakefile
+--- cernlib-2005.05.09~/src/paw_motif/cdf/Imakefile 1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09/src/paw_motif/cdf/Imakefile 2005-06-13 16:04:33.963058837 -0400
@@ -0,0 +1,5 @@
+#define IHaveCDF
+
+SRCS_CDF= pamcdf.cdf
+
+SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/paw_motif/code/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/code/Imakefile
---- cernlib-2005.05.09/src/paw_motif/code/Imakefile 1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/code/Imakefile 2005-06-13 16:04:33.963058837 -0400
+diff -urNad cernlib-2005.05.09~/src/paw_motif/code/Imakefile cernlib-2005.05.09/src/paw_motif/code/Imakefile
+--- cernlib-2005.05.09~/src/paw_motif/code/Imakefile 1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09/src/paw_motif/code/Imakefile 2005-06-13 16:04:33.963058837 -0400
@@ -0,0 +1,7 @@
+SRCS_F= pawintm.F pawpp.F
+
@@ -84,9 +84,9 @@
+
+SubdirLibraryTarget(NullParameter,NullParameter)
+
-diff -urNad cernlib-2005.05.09/src/paw_motif/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/Imakefile
---- cernlib-2005.05.09/src/paw_motif/Imakefile 2000-06-27 11:27:03.000000000 -0400
-+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/Imakefile 2005-06-13 16:04:33.963058837 -0400
+diff -urNad cernlib-2005.05.09~/src/paw_motif/Imakefile cernlib-2005.05.09/src/paw_motif/Imakefile
+--- cernlib-2005.05.09~/src/paw_motif/Imakefile 2000-06-27 11:27:03.000000000 -0400
++++ cernlib-2005.05.09/src/paw_motif/Imakefile 2005-06-13 16:04:33.963058837 -0400
@@ -7,7 +7,7 @@
MotifDependantMakeVar(MOTIF_DIRS,cmotif fmotif fpanelsc)
MotifDependantMakeVar(PAWPP_DIRS,fpanelsf tree uimx)
diff -urNad paw-2.14.04.dfsg.2/debian/patches/801-non-optimized-rule-uses-fPIC-g.dpatch paw-2.14.04.dfsg.2.fix/debian/patches/801-non-optimized-rule-uses-fPIC-g.dpatch
--- paw-2.14.04.dfsg.2/debian/patches/801-non-optimized-rule-uses-fPIC-g.dpatch 2010-02-02 23:44:32.000000000 +0100
+++ paw-2.14.04.dfsg.2.fix/debian/patches/801-non-optimized-rule-uses-fPIC-g.dpatch 2010-02-02 23:48:20.508277271 +0100
@@ -7,8 +7,8 @@
@DPATCH@
diff -urNad cernlib-2005.05.09/src/paw_motif/fmotif/Imakefile /tmp/dpep.gResDB/cernlib-2005.05.09/src/paw_motif/fmotif/Imakefile
---- cernlib-2005.05.09/src/paw_motif/fmotif/Imakefile 1996-09-23 10:20:46.000000000 -0400
-+++ /tmp/dpep.gResDB/cernlib-2005.05.09/src/paw_motif/fmotif/Imakefile 2005-06-09 10:37:55.631538119 -0400
+--- cernlib-2005.05.09~/src/paw_motif/fmotif/Imakefile 1996-09-23 10:20:46.000000000 -0400
++++ cernlib-2005.05.09/src/paw_motif/fmotif/Imakefile 2005-06-09 10:37:55.631538119 -0400
@@ -3,7 +3,7 @@
plotisto.F pmhist.F pminit.F show_chain.F
@@ -19,8 +19,8 @@
SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile /tmp/dpep.gResDB/cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile
---- cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile 1999-09-14 05:20:08.000000000 -0400
-+++ /tmp/dpep.gResDB/cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile 2005-06-09 10:40:47.421285771 -0400
+--- cernlib-2005.05.09~/src/pawlib/paw/ntuple/Imakefile 1999-09-14 05:20:08.000000000 -0400
++++ cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile 2005-06-09 10:40:47.421285771 -0400
@@ -46,8 +46,8 @@
SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad paw-2.14.04.dfsg.2/debian/patches/803-link-binaries-dynamically.dpatch paw-2.14.04.dfsg.2.fix/debian/patches/803-link-binaries-dynamically.dpatch
--- paw-2.14.04.dfsg.2/debian/patches/803-link-binaries-dynamically.dpatch 2010-02-02 23:44:32.000000000 +0100
+++ paw-2.14.04.dfsg.2.fix/debian/patches/803-link-binaries-dynamically.dpatch 2010-02-02 23:48:33.524277153 +0100
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile
---- cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile 2005-06-13 15:26:19.418526524 -0400
-+++ /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile 2005-06-13 15:27:38.102678258 -0400
+--- cernlib-2005.05.09~/src/pawlib/paw/programs/Imakefile 2005-06-13 15:26:19.418526524 -0400
++++ cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile 2005-06-13 15:27:38.102678258 -0400
@@ -20,7 +20,7 @@
InstallScript(paw,$(CERN_BINDIR))
diff -urNad paw-2.14.04.dfsg.2/paw.diff paw-2.14.04.dfsg.2.fix/paw.diff
--- paw-2.14.04.dfsg.2/paw.diff 1970-01-01 01:00:00.000000000 +0100
+++ paw-2.14.04.dfsg.2.fix/paw.diff 2010-01-25 21:22:51.898511744 +0100
@@ -0,0 +1,11 @@
+diff -urNad paw-2.14.04.dfsg.2~/upstream/2006/src/pawlib/paw/cpaw/bugrep.c paw-2.14.04.dfsg.2/upstream/2006/src/pawlib/paw/cpaw/bugrep.c
+--- paw-2.14.04.dfsg.2~/upstream/2006/src/pawlib/paw/cpaw/bugrep.c 2006-12-07 14:26:54.000000000 +0100
++++ paw-2.14.04.dfsg.2/upstream/2006/src/pawlib/paw/cpaw/bugrep.c 2010-01-21 14:32:27.000000000 +0100
+@@ -50,6 +50,7 @@
+ #include <assert.h>
+ #include <string.h>
+ #include <stdlib.h>
++#define L_cuserid 9
+
+
+ char *pavers();
