|
|
4b5a59b |
#! /bin/sh /usr/share/dpatch/dpatch-run
|
|
|
4b5a59b |
## 001-fix-missing-fluka.dpatch by <kmccarty@debian.org>
|
|
|
4b5a59b |
##
|
|
|
4b5a59b |
## All lines beginning with `## DP:' are a description of the patch.
|
|
|
f1ed284 |
## DP: Deal with FLUKA code having been purged from Debian's CERNLIB source.
|
|
|
4b5a59b |
|
|
|
4b5a59b |
@DPATCH@
|
|
|
db20d4b |
diff -urNad geant321-3.21.14.dfsg~/src/geant321/Imakefile geant321-3.21.14.dfsg/src/geant321/Imakefile
|
|
|
db20d4b |
--- geant321-3.21.14.dfsg~/src/geant321/Imakefile 1998-03-05 03:20:07.000000000 -0800
|
|
|
db20d4b |
+++ geant321-3.21.14.dfsg/src/geant321/Imakefile 2008-01-04 17:00:47.000000000 -0800
|
|
|
4b5a59b |
@@ -4,10 +4,11 @@
|
|
|
4b5a59b |
|
|
|
4b5a59b |
AllTarget(geant321)
|
|
|
4b5a59b |
|
|
|
4b5a59b |
-LIBDIRS= block cdf cgpack fiface fluka gbase gcons gdraw \ @@\
|
|
|
f1ed284 |
+/* FLUKA removed from Debian source package for copyright reasons. */
|
|
|
4b5a59b |
+LIBDIRS= cdf cgpack gbase gcons gdraw \ @@\
|
|
|
4b5a59b |
geocad ggeom gheisha ghits ghrout ghutils giface \ @@\
|
|
|
4b5a59b |
giopa gkine gphys gscan gstrag gtrak guser gxint \ @@\
|
|
|
4b5a59b |
- miface miguti neutron peanut
|
|
|
4b5a59b |
+ miface miguti neutron
|
|
|
4b5a59b |
|
|
|
4b5a59b |
|
|
|
4b5a59b |
SUBDIRS= $(LIBDIRS) data examples gxuser geant321
|
|
|
4b5a59b |
@@ -25,9 +26,12 @@
|
|
|
4b5a59b |
InstallLibrary(geant321,$(CERN_LIBDIR))
|
|
|
4b5a59b |
InstallLibraryAlias(geant321,geant,$(CERN_LIBDIR))
|
|
|
4b5a59b |
|
|
|
f1ed284 |
+/* FLUKA removed from Debian source package for copyright reasons. */
|
|
|
4b5a59b |
+/*
|
|
|
4b5a59b |
SubdirDataFile($(LIBRARY),flukaaf.dat,data)
|
|
|
4b5a59b |
|
|
|
4b5a59b |
InstallNonExecFileTarget(install.lib,flukaaf.dat,$(CERN_LIBDIR))
|
|
|
4b5a59b |
+*/
|
|
|
4b5a59b |
|
|
|
4b5a59b |
/* This will install the correct link for xsneut95.dat at CERN;
|
|
|
4b5a59b |
* If you want a local copy of the file, just copy it there
|
|
|
db20d4b |
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/Imakefile
|
|
|
db20d4b |
--- geant321-3.21.14.dfsg~/src/geant321/examples/Imakefile 1996-03-06 09:31:38.000000000 -0800
|
|
|
db20d4b |
+++ geant321-3.21.14.dfsg/src/geant321/examples/Imakefile 2008-01-04 17:01:20.000000000 -0800
|
|
|
db20d4b |
@@ -1,7 +1,10 @@
|
|
|
db20d4b |
#define IHaveSubdirs
|
|
|
db20d4b |
#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' /* for NamedMakeSubdirs */
|
|
|
db20d4b |
|
|
|
db20d4b |
+/* gexam4 needs fluka
|
|
|
db20d4b |
SUBDIRS= gexam1 gexam2 gexam3 gexam4 gexam5
|
|
|
db20d4b |
+*/
|
|
|
db20d4b |
+SUBDIRS= gexam1 gexam2 gexam3 gexam5
|
|
|
db20d4b |
|
|
|
db20d4b |
TestSubdirs($(SUBDIRS))
|
|
|
db20d4b |
|
|
|
db20d4b |
diff -urNad geant321-3.21.14.dfsg~/src/geant321/geant321/gcnmec.inc geant321-3.21.14.dfsg/src/geant321/geant321/gcnmec.inc
|
|
|
db20d4b |
--- geant321-3.21.14.dfsg~/src/geant321/geant321/gcnmec.inc 1995-10-24 03:20:31.000000000 -0700
|
|
|
db20d4b |
+++ geant321-3.21.14.dfsg/src/geant321/geant321/gcnmec.inc 2008-01-04 17:00:47.000000000 -0800
|
|
|
24be4e6 |
@@ -16,13 +16,14 @@
|
|
|
24be4e6 |
PARAMETER(NMECA=45,IBLOWN=23)
|
|
|
24be4e6 |
CHARACTER*4 CHNMEC(NMECA)
|
|
|
24be4e6 |
*
|
|
|
24be4e6 |
-* *** Two blank spaces for FISF and CAPF which do not exist
|
|
|
24be4e6 |
+* *** Null out all FLUKA mechanisms since we've removed FLUKA code
|
|
|
24be4e6 |
+* *** for DFSG reasons. -- Kevin McCarty, for Debian
|
|
|
24be4e6 |
*
|
|
|
24be4e6 |
* *** The low-neutron cross-sections have to be at the end for the
|
|
|
24be4e6 |
* *** logics of the routine to work, and they have to start at
|
|
|
24be4e6 |
* *** IBLOWN
|
|
|
24be4e6 |
DATA CHNMEC /
|
|
|
24be4e6 |
- + 'HADF', 'INEF', 'ELAF', 'NULL', 'NULL',
|
|
|
24be4e6 |
+ + 'NULL', 'NULL', 'NULL', 'NULL', 'NULL',
|
|
|
24be4e6 |
+ 'HADG', 'INEG', 'ELAG', 'FISG', 'CAPG',
|
|
|
24be4e6 |
+ 'LOSS', 'PHOT', 'ANNI', 'COMP', 'BREM',
|
|
|
24be4e6 |
+ 'PAIR', 'DRAY', 'PFIS', 'RAYL', 'MUNU',
|
|
|
db20d4b |
diff -urNad geant321-3.21.14.dfsg~/src/geant321/miface/Imakefile geant321-3.21.14.dfsg/src/geant321/miface/Imakefile
|
|
|
db20d4b |
--- geant321-3.21.14.dfsg~/src/geant321/miface/Imakefile 1995-10-24 03:21:53.000000000 -0700
|
|
|
db20d4b |
+++ geant321-3.21.14.dfsg/src/geant321/miface/Imakefile 2008-01-04 17:00:47.000000000 -0800
|
|
|
4b5a59b |
@@ -1,5 +1,5 @@
|
|
|
4b5a59b |
SRCS_F= \ @@\
|
|
|
4b5a59b |
- gfmdis.F gfmfin.F gmicap.F gmiset.F gmorin.F gmplxs.F gmxsec.F
|
|
|
4b5a59b |
+ gmicap.F gmiset.F gmorin.F gmplxs.F gmxsec.F
|
|
|
4b5a59b |
|
|
|
4b5a59b |
#ifdef CERNLIB_QMVAOS
|
|
|
4b5a59b |
FORTRANSAVEOPTION=FortranSaveFlags
|