People,
I have a fix for bug #552905, which concerns the orphaned paw
package. One needs to patch the upstream source and (meta-patch?) two
of the existing Debian patches. Would anyone mind reviewing this before
I post it to the BTS?
Meta-patch follows, dpatch is attached.
--8<--8<--8<--8<--8<--8<--8<--8<--8<--8<--8<--8<--8<--8<--8<
diff -urNad
paw-2.14.04.dfsg.2~/debian/patches/306-patch-assert.h-for-makedepend.dpatch
paw-2.14.04.dfsg.2/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-01-25 21:04:21.000000000 +0100
+++ paw-2.14.04.dfsg.2/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/705-patch-paw_motif-paw-Imakefiles.dpatch
paw-2.14.04.dfsg.2/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-01-25 21:04:21.000000000 +0100
+++ paw-2.14.04.dfsg.2/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)
--8<--8<--8<--8<--8<--8<--8<--8<--8<--8<--8<--8<--8<--8<--8<
Cheers,
Davide
--
Time flies like an arrow. Fruit flies like a banana.
--
If anything can go wrong it wSegmentation fault
core dumped
131-define-l_cuserid.dpatch
Description: Binary data
