rpms/cernlib/devel cernlib_2005.05.09.dfsg-6.diff, NONE, 1.1 112-remove-nonexistent-prototypes-from-gen.h.dpatch, 1.1, 1.2 805-expunge-missing-mathlib-kernlib-symbols.dpatch, 1.1, 1.2 cernlib.spec, 1.30, 1.31 cernlib_2005.05.09.dfsg-5.diff, 1.1, NONE

Patrice Dumas (pertusus) fedora-extras-commits at redhat.com
Wed May 17 13:02:53 UTC 2006


Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22230

Modified Files:
	112-remove-nonexistent-prototypes-from-gen.h.dpatch 
	805-expunge-missing-mathlib-kernlib-symbols.dpatch 
	cernlib.spec 
Added Files:
	cernlib_2005.05.09.dfsg-6.diff 
Removed Files:
	cernlib_2005.05.09.dfsg-5.diff 
Log Message:
* Wed May 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-20
- use new debian patchset. Fix 191631


cernlib_2005.05.09.dfsg-6.diff:

--- NEW FILE cernlib_2005.05.09.dfsg-6.diff ---
--- cernlib-2005.05.09.dfsg.orig/debian/control
+++ cernlib-2005.05.09.dfsg/debian/control
@@ -0,0 +1,896 @@
+Source: cernlib
+Maintainer: Kevin B. McCarty <kmccarty at debian.org>
+Standards-Version: 3.7.2
+Priority: optional
+Section: science
+Build-Depends: gcc-4.0 (>= 4.0.2-4) | gcc (<< 4:4.0), dpatch (>= 2.0.9), patch, mawk | gawk, xutils-dev, debhelper (>= 5.0.0), g77, cfortran (>= 4.4-8), x-dev, libxt-dev, libx11-dev, lesstif2-dev, refblas3-dev | libblas-3.so, lapack3-dev | liblapack-3.so, tetex-bin
+
+Package: cernlib-base
+Architecture: all
+Section: devel
+Conflicts: libcojets1-dev, libgeant1-dev, libherwig59-dev, libisajet758-dev, libkuipx11-1-dev, libmathlib1-dev, libpaw1-dev, libpdflib804-dev, libphtools1-dev, blas2-dev, lapack2-dev
+Description: script to determine Cernlib library dependencies
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This package includes the "cernlib" script that lists the command-line
+ options needed for linking against Cernlib libraries.  The script has
+ been rewritten from the upstream version to calculate
+ dependencies recursively.  Also included are a README.Debian with a summary
+ of changes made to Cernlib to fit it into Debian packaging practices,
+ and a contributed set of Autoconf macros to test for Cernlib libraries.
+
+Package: cernlib-core-dev
+Architecture: all
+Section: science
+Depends: cernlib-base (= ${Source-Version}), libgraflib1-dev, libgrafx11-1-dev, libkernlib1-dev, libpacklib1-lesstif-dev, libmathlib2-dev, libpacklib1-dev, libpawlib2-dev, libpawlib2-lesstif-dev, kuipc, dzedit
+Description: Cernlib development headers, tools, and static libraries
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides the header files and static libraries likely to be
+ wanted by developers using the Cern libraries who are not interested
+ specifically in high energy physics.  It also provides the Cernlib
+ development tools DZedit and KUIPC.  Cernlib analysis programs may be
+ obtained by installing the cernlib-core metapackage.
+
+Package: cernlib-core
+Architecture: all
+Section: science
+Depends: cernlib-base (= ${Source-Version}), kxterm, paw++, paw, paw-common, paw-demos
+Description: Cernlib main libraries and programs
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides the libraries and analysis tools (e.g. PAW) likely
+ to be wanted by most users of the Cern libraries who are not interested
+ specifically in high energy physics.  You cannot do program development by
+ installing only this metapackage; development libraries and tools may
+ be obtained by installing the cernlib-core-dev metapackage or individual
+ lib*-dev packages.
+
+Package: cernlib-extras
+Architecture: all
+Priority: extra
+Section: science
+Depends: cernlib-base (= ${Source-Version}), pawserv, zftp
+Description: miscellaneous Cernlib programs unlikely to be used by many
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides a few additional Cernlib programs not included
+ in any other Cernlib metapackage.  Very few people are likely to be
+ interested in them; currently they include zftp, pawserv and zserv.
+ Notice that the latter two programs run as daemons through inetd and may
+ reduce your system's security!
+ .
+ Installing this package along with the "cernlib" metapackage will supply
+ a complete set of all Cernlib programs and libraries included in Debian.
+
+Package: cernlib-montecarlo
+Architecture: all
+Section: science
+Depends: cernlib-base, montecarlo-base (= ${Source-Version}), libcojets2-dev, libeurodec1-dev, libherwig59-2-dev, libpdflib804-2-dev, libphotos202-dev, libphtools2-dev
+Recommends: libisajet758-2-dev
+Description: Cernlib Monte Carlo libraries
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides various Monte Carlo libraries included in Cernlib
+ (both shared and static).  Likely only physicists will be interested in
+ these packages.  Note that the Geant 3.21 program is not included, but it may
+ be obtained by also installing the geant321 Debian package.
+ .
+ Be aware that the libraries of Ariadne, Fritiof, Jetset, Lepto, and Pythia are
+ not available within Debian due to licensing issues; see the README.Debian
+ file in the montecarlo-base package for information on obtaining them.
+ .
+ Additionally, the Isajet library is not available on the m68k architecture
+ due to a compiler flaw.
+
+Package: cernlib
+Architecture: all
+Section: science
+Depends: cernlib-base (= ${Source-Version}), cernlib-core, cernlib-core-dev, cernlib-montecarlo, geant321-data, geant321-doc, geant321, libgeant321-2, libgeant321-2-dev
+Description: almost complete set of Debian Cernlib packages
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides almost all of the programs and libraries contained
+ in Cernlib.  Most people will likely want only a subset of these.  A few
+ extra Cernlib programs, not of interest to many people, may be obtained via
+ the cernlib-extras metapackage.
+
+Package: dzedit
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Recommends: libpacklib1-dev
+Description: Cernlib's ZEBRA documentation editor
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ DZedit is an interactive interface to the DZDOC (ZEBRA documentation) system
+ developed at CERN.  ZEBRA, part of the Packlib library, permits a developer to
+ create complex data structures in the FORTRAN 77 language; the DZDOC system
+ allows the developer to generate and maintain documentation of ZEBRA data
+ structures.
+
+Package: geant321-data
+Architecture: all
+Section: science
+Depends: cernlib-base
+Description: [Physics] Data for Geant 3.21 detector simulator
+ Geant simulates the passage of subatomic particles through matter, for
+ instance, particle detectors.  For maximum flexibility, Geant simulations
+ are performed by linking Fortran code supplied by the user with the Geant
+ libraries, then running the resulting executable.
+ .
+ This package includes data files for use by Geant.
+
+Package: geant321-doc
+Architecture: all
+Section: doc
+Depends: cernlib-base
+Description: [Physics] Documentation for Geant 3.21
+ Geant simulates the passage of subatomic particles through matter, for
+ instance, particle detectors.  For maximum flexibility, Geant simulations
+ are performed by linking Fortran code supplied by the user with the Geant
+ libraries, then running the resulting executable.
+ .
+ This package includes some documentation about Geant.
+
+Package: geant321
+Architecture: all
+Section: science
+Depends: libgeant321-2-dev, geant321-data, cernlib-base, g77
+Suggests: kxterm, geant321-doc
+Description: [Physics] Particle detector description and simulation tool
+ Geant simulates the passage of subatomic particles through matter, for
+ instance, particle detectors.  For maximum flexibility, Geant simulations
+ are performed by linking Fortran code supplied by the user with the Geant
+ libraries, then running the resulting executable.
+ .
+ This package includes gxint, the script used to perform this linking step.
+
+Package: kuipc
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, cernlib-base
+Recommends: libpacklib1-dev
+Suggests: libpacklib1-lesstif-dev
+Description: Cernlib's Kit for a User Interface Package (KUIP) compiler
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ KUIPC, the Kit for a User Interface Package Compiler, is a tool to simplify
+ the writing of a program's user interface code.  It takes as
+ input a Command Definition File (CDF) that describes the
+ commands to be understood by the program, and outputs C or FORTRAN code that
+ makes the appropriate function calls to set up the user interface.  This
+ code can then be compiled and linked with the rest of the program.  Since
+ the generated code uses KUIP routines, the program must also be linked
+ against the Packlib library that contains them.
+ .
+ KUIPC is no longer actively developed, so aside from its use in the build
+ process of Cernlib, it is of mainly historical interest.
+
+Package: kxterm
+Architecture: any
+Section: science
+Depends: ${shlibs:Depends}, cernlib-base
+Description: Cernlib's KUIP terminal emulator
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ KXterm is a terminal emulator which combines the best features from
+ the (now defunct) Apollo DM pads (like: input and transcript
[...21456 lines suppressed...]
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. Type: select
+#. Choices
+#. Note to translators: only the English word "Both" below should be translated
+#: ./pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, Cả hai"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Máy phục vụ cần chạy từ trình inetd"
+
+#. Type: select
+#. Description
+#: ./pawserv.templates.master:6
+msgid ""
+"This package includes both the pawserv daemon (permitting remote hosts to "
+"read local files while running PAW/Paw++) and the zserv daemon (allowing "
+"remote hosts to log in using CERN's ZFTP protocol).  These servers are run "
+"from inetd; you may enable either or both of them. Unless you have very "
+"specialized requirements, most likely you only want to enable pawserv."
+msgstr "Gói tin này bao gồm cả hai trình nền (dæmon) pawserv (mà cho phép máy tờ xa đọc tập tin địa phương trong khi chạy PAW/Paw++) và trình nền zserv (mà cho phép máy từ xa đăng nhập dùng giao thức ZFTP của CERN). Cả hai trình phục vụ này được chạy từ trình nền inetd; bạn có thể hiệu lực một hay cả hai điều. Tuy nhiên, trừ bạn cần thiết làm việc rất đặc biệt, rất có thể là bạn sẽ muốn hiệu lực chỉ trình pawserv."
--- cernlib-2005.05.09.dfsg.orig/debian/po/pt_BR.po
+++ cernlib-2005.05.09.dfsg/debian/po/pt_BR.po
@@ -0,0 +1,55 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cernlib\n"
+"Report-Msgid-Bugs-To: debian-l10n-portuguese at lists.debian.org\n"
+"POT-Creation-Date: 2004-02-25 17:23-0500\n"
+"PO-Revision-Date: 2005-05-26 16:05-0300\n"
+"Last-Translator: André Luís Lopes <andrelop at debian.org>\n"
+"Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#. Note to translators: only the English word "Both" below should be translated
+#: ../pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, Ambos"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Servidores a serem executados a partir do inetd"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid ""
+"This package includes both the pawserv daemon (permitting remote hosts to "
+"read local files while running PAW/Paw++) and the zserv daemon (allowing "
+"remote hosts to log in using CERN's ZFTP protocol).  These servers are run "
+"from inetd; you may enable either or both of them. Unless you have very "
+"specialized requirements, most likely you only want to enable pawserv."
+msgstr ""
+"Este pacote inclui ambos o daemon pawserv (permitindo hosts remotos "
+"lerem arquivos locais enquanto executando PAW/Paw++) e o daemon zerv "
+"(permitindo hosts remotos a se autenticarem usando o protocolo ZFTP "
+"do CERN). Esses servidores são executados a partir do inetd; você "
+"pode habilitar cada um deles separadamente ou ambos. A menos que você "
+"possua necessidades bastante especializadas, você provavelmente irá "
+"desejar habilitar somente o pawserv."
--- cernlib-2005.05.09.dfsg.orig/debian/po/sv.po
+++ cernlib-2005.05.09.dfsg/debian/po/sv.po
@@ -0,0 +1,53 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# , fuzzy
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: cernlib 2005.05.09-4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-02-25 17:23-0500\n"
+"PO-Revision-Date: 2005-10-06 23:50+0200\n"
+"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
+"Language-Team: Swedish <sv at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. Type: select
+#. Choices
+#. Note to translators: only the English word "Both" below should be translated
+#: ../pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, Båda"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Servrar som ska köras från inetd"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid ""
+"This package includes both the pawserv daemon (permitting remote hosts to "
+"read local files while running PAW/Paw++) and the zserv daemon (allowing "
+"remote hosts to log in using CERN's ZFTP protocol).  These servers are run "
+"from inetd; you may enable either or both of them. Unless you have very "
+"specialized requirements, most likely you only want to enable pawserv."
+msgstr ""
+"Detta paket inkluderar både pawserver-daemonen (tillåter fjärrsystem att "
+"läsa lokala filer när PAW/Paw++ körs) och zserv-daemonen (tillåter fjärrsystem "
+"att logga in med CERN's ZFTP-protokoll).  Dessa servrar körs från inetd; du måste "
+"aktivera någon eller båda av dom. Om du inte har speciella krav så räcker det gott "
+"om pawserv aktiveras."
+
--- cernlib-2005.05.09.dfsg.orig/debian/po/es.po
+++ cernlib-2005.05.09.dfsg/debian/po/es.po
@@ -0,0 +1,55 @@
+# cernlib po-debconf translation to Spanish
+# Copyright (C) 2005 Software in the Public Interest
+# This file is distributed under the same license as the cernlib package.
+#
+# Changes:
+#  - Initial translation
+#         César Gómez Martín <cesar.gomez at gmail.com>
+#
+#   Traductores, si no conoce el formato PO, merece la pena leer la
+#   documentación de gettext, especialmente las secciones dedicadas a este
+#   formato, por ejemplo ejecutando:
+#          info -n '(gettext)PO Files'
+#          info -n '(gettext)Header Entry'
+# Equipo de traducción al español, por favor, lean antes de traducir
+# los siguientes documentos:
+#
+#  - El proyecto de traducción de Debian al español
+#    http://www.debian.org/intl/spanish/
+#    especialmente las notas de traducción en
+#    http://www.debian.org/intl/spanish/notas
+#
+#  - La guía de traducción de po's de debconf:
+#    /usr/share/doc/po-debconf/README-trans
+#    o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cernlib\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-02-25 17:23-0500\n"
+"PO-Revision-Date: 2005-09-01 17:49+0100\n"
+"Last-Translator: César Gómez Martín <cesar.gomez at gmail.com>\n"
+"Language-Team: Debian l10n spanish <debian-l10n-spanish at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Spanish\n"
+"X-Poedit-Country: SPAIN\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. Type: select
+#: ../pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, Ambos"
+
+#. Type: select
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Servidores a ejecutar desde inetd"
+
+#. Type: select
+#: ../pawserv.templates.master:6
+msgid "This package includes both the pawserv daemon (permitting remote hosts to read local files while running PAW/Paw++) and the zserv daemon (allowing remote hosts to log in using CERN's ZFTP protocol).  These servers are run from inetd; you may enable either or both of them. Unless you have very specialized requirements, most likely you only want to enable pawserv."
+msgstr "Este paquete incluye el demonio pawserv (permite a las máquinas remotas leer ficheros locales mientras se ejecuta PAW/Paw++)  y el demonio zserv (permite a las máquinas remotas conectarse a través del protocolo ZFTP del CERN). Estos servidores se ejecutan desde inetd; puede habilitar cualquiera de ellos o los dos. A no ser que tenga algunos requisitos muy especializados, lo más probable es que sólo quiera habilitar pawserv."
+


Index: 112-remove-nonexistent-prototypes-from-gen.h.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/112-remove-nonexistent-prototypes-from-gen.h.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 112-remove-nonexistent-prototypes-from-gen.h.dpatch	30 Nov 2005 22:01:01 -0000	1.1
+++ 112-remove-nonexistent-prototypes-from-gen.h.dpatch	17 May 2006 13:02:50 -0000	1.2
@@ -68,19 +68,6 @@
  PROTOCCALLSFFUN1(FLOAT,FREQ,freq,FLOAT)
  #define FREQ(A2)  CCALLSFFUN1(FREQ,freq,FLOAT,A2)
  
-@@ -255,10 +255,10 @@
- 
- PROTOCCALLSFFUN1(DOUBLE,DFRSIN,dfrsin,DOUBLE)
- #define DFRSIN(A2)  CCALLSFFUN1(DFRSIN,dfrsin,DOUBLE,A2)
--
-+/*
- PROTOCCALLSFFUN2(FLOAT,FUN,fun,INT,FLOATV)
- #define FUN(A2,A3)  CCALLSFFUN2(FUN,fun,INT,FLOATV,A2,A3)
--
-+*/
- PROTOCCALLSFFUN1(FLOAT,G116F1,g116f1,FLOAT)
- #define G116F1(A2)  CCALLSFFUN1(G116F1,g116f1,FLOAT,A2)
- 
 @@ -270,10 +270,10 @@
  
  PROTOCCALLSFFUN1(FLOAT,GAMMA,gamma,FLOAT)


Index: 805-expunge-missing-mathlib-kernlib-symbols.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/805-expunge-missing-mathlib-kernlib-symbols.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 805-expunge-missing-mathlib-kernlib-symbols.dpatch	30 Nov 2005 22:01:01 -0000	1.1
+++ 805-expunge-missing-mathlib-kernlib-symbols.dpatch	17 May 2006 13:02:50 -0000	1.2
@@ -5,9 +5,9 @@
 ## DP: Remove some unreferenced symbols from mathlib and kernlib.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile
---- cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile	2002-09-19 12:44:52.000000000 -0400
-+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile	2005-06-13 11:20:33.838151240 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/kernlib/kerngen/ccgen/Imakefile cernlib-2005.05.09.dfsg/src/kernlib/kerngen/ccgen/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/kernlib/kerngen/ccgen/Imakefile	2006-05-09 16:59:37.545106161 -0400
++++ cernlib-2005.05.09.dfsg/src/kernlib/kerngen/ccgen/Imakefile	2006-05-09 16:59:48.094863874 -0400
 @@ -1,6 +1,8 @@
  #ifndef CERNLIB_VAXVMS
  
@@ -18,9 +18,9 @@
  	readlnf.F renamef.F setenvf.F statf.F systemf.F tmpro.F \ @@\
  	tmproi.F toslat.F unlinkf.F
  
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile
---- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-13 11:12:24.894703741 -0400
-+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-13 11:16:54.864966246 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/d/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/gen/d/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/d/Imakefile	2006-05-09 16:59:38.432917462 -0400
++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/d/Imakefile	2006-05-09 16:59:48.095863661 -0400
 @@ -2,20 +2,22 @@
  #include "pilot.h"
  
@@ -50,25 +50,29 @@
  
  #if defined(CERNLIB_DOUBLE)
  SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile
---- cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile	1996-05-01 09:21:53.000000000 -0400
-+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile	2005-06-13 11:19:42.456136998 -0400
-@@ -1,9 +1,12 @@
--SRCS_F=	addbnd.F bfgs.F bndopt.F bndtst.F bounds.F bucmve.F \ @@\
--	bufopt.F delbnd.F delete.F delslv.F divon.F dvcopy.F dvdot.F \ @@\
--	dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F fun.F genpnt.F \ @@\
--	grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\
--	newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\
--	quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\
-+/* Some files deleted from the below list since they depend upon the
-+   lepto63 library, which cannot be included in Debian for licensing reasons. */
-+
-+SRCS_F=	addbnd.F bfgs.F          bndtst.F bounds.F bucmve.F \ @@\
-+	         delbnd.F delete.F                  dvcopy.F dvdot.F \ @@\
-+	dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F                \ @@\
-+	                  ldlsol.F          modchl.F          mxstep.F \ @@\
-+	newptq.F nmdchl.F         nodaud.F orthvc.F         quad.F \ @@\
-+	quasi.F ranums.F          rlen.F settol.F shrnk.F         \ @@\
- 	treaud.F tredmp.F tstext.F usrint.F usrtrm.F
+diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/Imakefile	1996-05-01 09:21:53.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/Imakefile	2006-05-09 17:00:05.429179570 -0400
+@@ -4,7 +4,7 @@
+ 	grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\
+ 	newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\
+ 	quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\
+-	treaud.F tredmp.F tstext.F usrint.F usrtrm.F
++	treaud.F tredmp.F tstext.F usrint.F usrtrm.F dfun.F
  
  FORTRANSAVEOPTION = FortranSaveFlags
+ 
+diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/dfun.F cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/dfun.F
+--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/dfun.F	1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/dfun.F	2006-05-09 17:01:10.196413696 -0400
+@@ -0,0 +1,10 @@
++C-----------------------------------------------------------------------
++      FUNCTION DFUN(ND,X)
++C-----------------------------------------------------------------------
++C     DUMMY FUNCTION
++C-----------------------------------------------------------------------
++      DOUBLE PRECISION DFUN, X(ND)
++      WRITE (6,10)
++  10  FORMAT(/10X,'DFUN CALLED BUT NOT LINKED')
++      STOP
++      END


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cernlib.spec	13 Apr 2006 22:53:56 -0000	1.30
+++ cernlib.spec	17 May 2006 13:02:50 -0000	1.31
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       19%{?dist}
+Release:       20%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -28,6 +28,7 @@
 %endif
 # for patchy build scripts
 BuildRequires: tcsh
+BuildRequires: gawk
 # there are missing f2c intrinsics in gfortran so gfortran cannot be used to
 # build the cernlib
 BuildRequires: /usr/bin/g77
@@ -81,7 +82,7 @@
 Source201: cernlib-deadpool.txt
 
 # debian patchset
-Patch0: cernlib_2005.05.09.dfsg-5.diff
+Patch0: cernlib_2005.05.09.dfsg-6.diff
 # change file to directory to DATADIR
 Patch1100: cernlib-enforce-FHS.diff
 Patch1: 001-fix-missing-fluka.dpatch
@@ -744,7 +745,6 @@
 %doc cernlib.README copyright
 %doc debian/debhelper/geant321.README.debian 
 %doc debian/debhelper/libpdflib804-2-dev.README.debian
-%doc debian/debhelper/libmathlib2.README.debian 
 %doc debian/debhelper/montecarlo-base.README.debian
 
 # the utils and devel are separated to have the possibility to install
@@ -830,6 +830,9 @@
 
 
 %changelog
+* Wed May 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-20
+- use new debian patchset. Fix 191631
+
 * Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-19
 - add a patch to yexpand, to avoid using $HOME.
 


--- cernlib_2005.05.09.dfsg-5.diff DELETED ---




More information about the fedora-extras-commits mailing list