rpms/cernlib/devel 705-patch-paw_motif-paw-Imakefiles.dpatch, 1.2, 1.3 802-create-shared-libraries.dpatch, 1.1, 1.2 cernlib.spec, 1.5, 1.6 cernlib_2005.05.09.dfsg-1.diff, 1.1, 1.2
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Fri Dec 2 09:57:43 UTC 2005
Author: pertusus
Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14663
Modified Files:
705-patch-paw_motif-paw-Imakefiles.dpatch
802-create-shared-libraries.dpatch cernlib.spec
cernlib_2005.05.09.dfsg-1.diff
Log Message:
- use updated beta debian patchset
- remove the BSD in the licence because there is no library nor binary
under a BSD licence and someone could get the idea that there is
some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
because of cfortran
The directory reordering in toplevel Imakefile is now done in patch 802
and not 705
Index: 705-patch-paw_motif-paw-Imakefiles.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/705-patch-paw_motif-paw-Imakefiles.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 705-patch-paw_motif-paw-Imakefiles.dpatch 1 Dec 2005 14:46:38 -0000 1.2
+++ 705-patch-paw_motif-paw-Imakefiles.dpatch 2 Dec 2005 09:57:41 -0000 1.3
@@ -13,7 +13,7 @@
-LIBDIRS= kernlib packlib code_motif pawlib graflib mathlib geant321 mclibs phtools
-+LIBDIRS= kernlib packlib code_motif graflib mathlib pawlib paw_motif geant321 mclibs phtools
++LIBDIRS= kernlib packlib code_motif pawlib paw_motif graflib mathlib geant321 mclibs phtools
SUBDIRS= $(LIBDIRS) patchy cfortran
Index: 802-create-shared-libraries.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/802-create-shared-libraries.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 802-create-shared-libraries.dpatch 30 Nov 2005 22:01:01 -0000 1.1
+++ 802-create-shared-libraries.dpatch 2 Dec 2005 09:57:41 -0000 1.2
@@ -6,8 +6,17 @@
@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/Imakefile cernlib-2005.05.09.dfsg/src/Imakefile
---- cernlib-2005.05.09.dfsg~/src/Imakefile 2005-11-29 17:06:14.683891311 +0000
-+++ cernlib-2005.05.09.dfsg/src/Imakefile 2005-11-29 17:06:50.910248135 +0000
+--- cernlib-2005.05.09.dfsg~/src/Imakefile 2005-12-01 15:19:24.191267776 +0000
++++ cernlib-2005.05.09.dfsg/src/Imakefile 2005-12-01 15:20:10.310483251 +0000
+@@ -2,7 +2,7 @@
+ #define PassCDebugFlags
+
+
+-LIBDIRS= kernlib packlib code_motif pawlib paw_motif graflib mathlib geant321 mclibs phtools
++LIBDIRS= kernlib packlib mathlib graflib code_motif mclibs phtools pawlib paw_motif geant321
+
+ SUBDIRS= $(LIBDIRS) patchy cfortran
+
@@ -15,6 +15,7 @@
#endif
@@ -17,16 +26,16 @@
INCLUDEDIRS= $(LIBDIRS) cfortran
diff -urNad cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile cernlib-2005.05.09.dfsg/src/code_motif/Imakefile
---- cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile 2005-11-29 17:06:14.555918310 +0000
-+++ cernlib-2005.05.09.dfsg/src/code_motif/Imakefile 2005-11-29 17:06:21.953357641 +0000
+--- cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile 2005-12-01 15:19:24.062295137 +0000
++++ cernlib-2005.05.09.dfsg/src/code_motif/Imakefile 2005-12-01 15:19:31.186783665 +0000
@@ -31,3 +31,4 @@
SubdirLibraryTarget(packlib-lesstif,NullParameter)
InstallLibrary(packlib-lesstif,$(CERN_LIBDIR))
+InstallSharedLibrary(packlib-lesstif,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile
---- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile 2005-11-29 17:06:13.317179648 +0000
-+++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile 2005-11-29 17:06:21.953357641 +0000
+--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile 2005-12-01 15:19:23.018516575 +0000
++++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile 2005-12-01 15:19:31.186783665 +0000
@@ -26,6 +26,7 @@
InstallLibrary(geant321,$(CERN_LIBDIR))
@@ -37,7 +46,7 @@
/*
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile 1996-12-19 14:19:18.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile 2005-11-29 17:06:21.953357641 +0000
++++ cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile 2005-12-01 15:19:31.186783665 +0000
@@ -10,6 +10,7 @@
SubdirLibraryTarget(geant321_parallel,NullParameter)
@@ -48,7 +57,7 @@
diff -urNad cernlib-2005.05.09.dfsg~/src/graflib/Imakefile cernlib-2005.05.09.dfsg/src/graflib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/graflib/Imakefile 2001-12-11 15:06:28.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/graflib/Imakefile 2005-11-29 17:06:21.953357641 +0000
++++ cernlib-2005.05.09.dfsg/src/graflib/Imakefile 2005-12-01 15:19:31.186783665 +0000
@@ -11,9 +11,12 @@
SubdirLibraryTarget(graflib,$(LIBDIRS))
@@ -66,7 +75,7 @@
diff -urNad cernlib-2005.05.09.dfsg~/src/graflib/higz/Imakefile cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile
--- cernlib-2005.05.09.dfsg~/src/graflib/higz/Imakefile 1997-09-02 13:34:47.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile 2005-11-29 17:06:21.967354688 +0000
++++ cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile 2005-12-01 15:19:31.186783665 +0000
@@ -13,6 +13,7 @@
SubdirLibraryTarget(grafX11,$(LIBDIRS))
@@ -77,7 +86,7 @@
diff -urNad cernlib-2005.05.09.dfsg~/src/kernlib/Imakefile cernlib-2005.05.09.dfsg/src/kernlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/kernlib/Imakefile 2002-04-26 14:37:20.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/kernlib/Imakefile 2005-11-29 17:06:21.967354688 +0000
++++ cernlib-2005.05.09.dfsg/src/kernlib/Imakefile 2005-12-01 15:19:31.187783453 +0000
@@ -14,6 +14,7 @@
InstallLibrary(kernlib,$(CERN_LIBDIR))
@@ -87,8 +96,8 @@
test:: LibraryTargetName(kernlib)
diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/Imakefile
---- cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile 2005-11-29 17:06:14.498930333 +0000
-+++ cernlib-2005.05.09.dfsg/src/mathlib/Imakefile 2005-11-29 17:06:21.968354477 +0000
+--- cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile 2005-12-01 15:19:24.005307227 +0000
++++ cernlib-2005.05.09.dfsg/src/mathlib/Imakefile 2005-12-01 15:19:31.187783453 +0000
@@ -19,6 +19,7 @@
SubdirLibraryTarget(mathlib,$(LIBDIRS))
@@ -98,8 +107,8 @@
InstallIncludeSubdirs($(LIBDIRS))
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/Imakefile
---- cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile 2005-11-29 17:06:12.812286166 +0000
-+++ cernlib-2005.05.09.dfsg/src/mclibs/Imakefile 2005-11-29 17:06:21.968354477 +0000
+--- cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile 2005-12-01 15:19:22.512623901 +0000
++++ cernlib-2005.05.09.dfsg/src/mclibs/Imakefile 2005-12-01 15:19:31.187783453 +0000
@@ -13,6 +13,7 @@
TestSubdirs($(LIBDIRS))
@@ -110,7 +119,7 @@
INCLUDEDIRS= cojets eurodec herwig isajet pdf
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile 1996-05-06 20:06:50.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile 2005-11-29 17:06:21.968354477 +0000
++++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile 2005-12-01 15:19:31.187783453 +0000
@@ -12,6 +12,7 @@
SubdirLibraryTarget(cojets,$(LIBDIRS))
@@ -121,7 +130,7 @@
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/eurodec/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/eurodec/Imakefile 1996-05-06 20:06:55.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile 2005-11-29 17:06:21.968354477 +0000
++++ cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile 2005-12-01 15:19:31.187783453 +0000
@@ -12,6 +12,7 @@
SubdirLibraryTarget(eurodec,$(LIBDIRS))
@@ -132,7 +141,7 @@
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile 1997-01-06 17:06:41.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile 2005-11-29 17:06:21.968354477 +0000
++++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile 2005-12-01 15:19:31.187783453 +0000
@@ -10,6 +10,7 @@
InstallLibrary(herwig59,$(CERN_LIBDIR))
@@ -143,7 +152,7 @@
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile 2001-10-08 14:03:02.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile 2005-11-29 17:06:21.968354477 +0000
++++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile 2005-12-01 15:19:31.187783453 +0000
@@ -12,6 +12,7 @@
SubdirLibraryTarget(isajet758,$(LIBDIRS))
@@ -154,7 +163,7 @@
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile 2000-05-29 14:49:59.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile 2005-11-29 17:06:21.969354266 +0000
++++ cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile 2005-12-01 15:19:31.188783241 +0000
@@ -15,6 +15,7 @@
SubdirLibraryTarget(pdflib804,spdf npdf)
@@ -165,7 +174,7 @@
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/photos/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/photos/Imakefile 1999-03-26 10:52:23.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile 2005-11-29 17:06:21.969354266 +0000
++++ cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile 2005-12-01 15:19:31.188783241 +0000
@@ -15,6 +15,7 @@
SubdirLibraryTarget(photos202,code)
@@ -175,8 +184,8 @@
TestSubdirs(test)
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/Imakefile cernlib-2005.05.09.dfsg/src/packlib/Imakefile
---- cernlib-2005.05.09.dfsg~/src/packlib/Imakefile 2005-11-29 17:06:14.373956699 +0000
-+++ cernlib-2005.05.09.dfsg/src/packlib/Imakefile 2005-11-29 17:06:21.969354266 +0000
+--- cernlib-2005.05.09.dfsg~/src/packlib/Imakefile 2005-12-01 15:19:23.885332680 +0000
++++ cernlib-2005.05.09.dfsg/src/packlib/Imakefile 2005-12-01 15:19:31.188783241 +0000
@@ -14,6 +14,7 @@
InstallLibrary(packlib,$(CERN_LIBDIR))
@@ -186,8 +195,8 @@
TestSubdirs($(LIBDIRS))
diff -urNad cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile
---- cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile 2005-11-29 17:06:14.684891100 +0000
-+++ cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile 2005-11-29 17:06:21.969354266 +0000
+--- cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile 2005-12-01 15:19:24.192267563 +0000
++++ cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile 2005-12-01 15:19:31.188783241 +0000
@@ -30,4 +30,5 @@
SubdirLibraryTarget(pawlib-lesstif,$(LIBDIRS))
@@ -196,7 +205,7 @@
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile 1996-10-01 14:12:23.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/pawlib/Imakefile 2005-11-29 17:06:21.969354266 +0000
++++ cernlib-2005.05.09.dfsg/src/pawlib/Imakefile 2005-12-01 15:19:31.188783241 +0000
@@ -11,6 +11,7 @@
SubdirLibraryTarget(pawlib,$(LIBDIRS))
@@ -207,7 +216,7 @@
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/Imakefile cernlib-2005.05.09.dfsg/src/phtools/Imakefile
--- cernlib-2005.05.09.dfsg~/src/phtools/Imakefile 1996-11-14 16:44:33.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/phtools/Imakefile 2005-11-29 17:06:21.970354056 +0000
++++ cernlib-2005.05.09.dfsg/src/phtools/Imakefile 2005-12-01 15:19:31.189783029 +0000
@@ -11,7 +11,7 @@
SubdirLibraryTarget(phtools,$(LIBDIRS))
Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cernlib.spec 1 Dec 2005 14:47:54 -0000 1.5
+++ cernlib.spec 2 Dec 2005 09:57:41 -0000 1.6
@@ -1,11 +1,11 @@
Name: cernlib
Version: 2005
-Release: 6%{?dist}.1
+Release: 7%{?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.
# http://borex.princeton.edu/~kmccarty/faq.html#44
-License: GPL/LGPL/BSD
+License: GPL/LGPL
URL: http://cernlib.web.cern.ch/cernlib/
# mandrake
#BuildRequires: libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel
@@ -688,6 +688,13 @@
%doc debian/debhelper/zftp.README.debian
%changelog
+* Fri Dec 2 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-7
+- use updated beta debian patchset
+- remove the BSD in the licence because there is no library nor binary
+ under a BSD licence and someone could get the idea that there is
+ some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
+ because of cfortran
+
* Tue Nov 29 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-6.1
- update with newer debian patchset for cernlib, fix licence issues
- don't use the include.tar.gz source, instead get include files from
cernlib_2005.05.09.dfsg-1.diff:
Index: cernlib_2005.05.09.dfsg-1.diff
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib_2005.05.09.dfsg-1.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib_2005.05.09.dfsg-1.diff 30 Nov 2005 22:01:01 -0000 1.1
+++ cernlib_2005.05.09.dfsg-1.diff 2 Dec 2005 09:57:41 -0000 1.2
@@ -2744,13 +2744,15 @@
+-/* $Id$
+- *
+- * $Log$
-+- * Revision 1.1 2005/11/30 22:01:01 pertusus
-+- * - update with newer debian patchset for cernlib, fix licence issues
-+- * - don't use the include.tar.gz source, instead get include files from
-+- * the source files
-+- * - build shared libraries
-+- * - simplify the scripts modifications
-+- * - add BuildRequires: libXau-devel to workaround #173530
++- * Revision 1.2 2005/12/02 09:57:41 pertusus
++- * - use updated beta debian patchset
++- * - remove the BSD in the licence because there is no library nor binary
++- * under a BSD licence and someone could get the idea that there is
++- * some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
++- * because of cfortran
++- *
++- * The directory reordering in toplevel Imakefile is now done in patch 802
++- * and not 705
+- *
+- * Revision 1.5 2004/10/05 15:54:40 mclareni
+- * Add configuration file linux-lp64 for Linux 64-bit pointer systems like AMD Opteron and Intel IA64.
@@ -6217,7 +6219,7 @@
+ #endif
--- cernlib-2005.05.09.dfsg.orig/debian/patches/802-create-shared-libraries.dpatch
+++ cernlib-2005.05.09.dfsg/debian/patches/802-create-shared-libraries.dpatch
-@@ -0,0 +1,219 @@
+@@ -0,0 +1,228 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 802-create-shared-libraries.dpatch by <kmccarty at debian.org>
+##
@@ -6226,8 +6228,17 @@
+
+ at DPATCH@
+diff -urNad cernlib-2005.05.09.dfsg~/src/Imakefile cernlib-2005.05.09.dfsg/src/Imakefile
-+--- cernlib-2005.05.09.dfsg~/src/Imakefile 2005-11-29 17:06:14.683891311 +0000
-++++ cernlib-2005.05.09.dfsg/src/Imakefile 2005-11-29 17:06:50.910248135 +0000
++--- cernlib-2005.05.09.dfsg~/src/Imakefile 2005-12-01 15:19:24.191267776 +0000
+++++ cernlib-2005.05.09.dfsg/src/Imakefile 2005-12-01 15:20:10.310483251 +0000
++@@ -2,7 +2,7 @@
++ #define PassCDebugFlags
++
++
++-LIBDIRS= kernlib packlib code_motif pawlib paw_motif graflib mathlib geant321 mclibs phtools
+++LIBDIRS= kernlib packlib mathlib graflib code_motif mclibs phtools pawlib paw_motif geant321
++
++ SUBDIRS= $(LIBDIRS) patchy cfortran
++
+@@ -15,6 +15,7 @@
+ #endif
+
@@ -6237,16 +6248,16 @@
+ INCLUDEDIRS= $(LIBDIRS) cfortran
+
+diff -urNad cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile cernlib-2005.05.09.dfsg/src/code_motif/Imakefile
-+--- cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile 2005-11-29 17:06:14.555918310 +0000
-++++ cernlib-2005.05.09.dfsg/src/code_motif/Imakefile 2005-11-29 17:06:21.953357641 +0000
++--- cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile 2005-12-01 15:19:24.062295137 +0000
+++++ cernlib-2005.05.09.dfsg/src/code_motif/Imakefile 2005-12-01 15:19:31.186783665 +0000
+@@ -31,3 +31,4 @@
+ SubdirLibraryTarget(packlib-lesstif,NullParameter)
+
+ InstallLibrary(packlib-lesstif,$(CERN_LIBDIR))
++InstallSharedLibrary(packlib-lesstif,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
+diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile
-+--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile 2005-11-29 17:06:13.317179648 +0000
-++++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile 2005-11-29 17:06:21.953357641 +0000
++--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile 2005-12-01 15:19:23.018516575 +0000
+++++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile 2005-12-01 15:19:31.186783665 +0000
+@@ -26,6 +26,7 @@
+
+ InstallLibrary(geant321,$(CERN_LIBDIR))
@@ -6257,7 +6268,7 @@
+ /*
+diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile 1996-12-19 14:19:18.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile 2005-11-29 17:06:21.953357641 +0000
+++++ cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile 2005-12-01 15:19:31.186783665 +0000
+@@ -10,6 +10,7 @@
+ SubdirLibraryTarget(geant321_parallel,NullParameter)
+
@@ -6268,7 +6279,7 @@
+
+diff -urNad cernlib-2005.05.09.dfsg~/src/graflib/Imakefile cernlib-2005.05.09.dfsg/src/graflib/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/graflib/Imakefile 2001-12-11 15:06:28.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/graflib/Imakefile 2005-11-29 17:06:21.953357641 +0000
+++++ cernlib-2005.05.09.dfsg/src/graflib/Imakefile 2005-12-01 15:19:31.186783665 +0000
+@@ -11,9 +11,12 @@
+
+ SubdirLibraryTarget(graflib,$(LIBDIRS))
@@ -6286,7 +6297,7 @@
+
+diff -urNad cernlib-2005.05.09.dfsg~/src/graflib/higz/Imakefile cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/graflib/higz/Imakefile 1997-09-02 13:34:47.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile 2005-11-29 17:06:21.967354688 +0000
+++++ cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile 2005-12-01 15:19:31.186783665 +0000
+@@ -13,6 +13,7 @@
+ SubdirLibraryTarget(grafX11,$(LIBDIRS))
+
@@ -6297,7 +6308,7 @@
+
+diff -urNad cernlib-2005.05.09.dfsg~/src/kernlib/Imakefile cernlib-2005.05.09.dfsg/src/kernlib/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/kernlib/Imakefile 2002-04-26 14:37:20.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/kernlib/Imakefile 2005-11-29 17:06:21.967354688 +0000
+++++ cernlib-2005.05.09.dfsg/src/kernlib/Imakefile 2005-12-01 15:19:31.187783453 +0000
+@@ -14,6 +14,7 @@
+
+ InstallLibrary(kernlib,$(CERN_LIBDIR))
@@ -6307,8 +6318,8 @@
+ test:: LibraryTargetName(kernlib)
+
+diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/Imakefile
-+--- cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile 2005-11-29 17:06:14.498930333 +0000
-++++ cernlib-2005.05.09.dfsg/src/mathlib/Imakefile 2005-11-29 17:06:21.968354477 +0000
++--- cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile 2005-12-01 15:19:24.005307227 +0000
+++++ cernlib-2005.05.09.dfsg/src/mathlib/Imakefile 2005-12-01 15:19:31.187783453 +0000
+@@ -19,6 +19,7 @@
+ SubdirLibraryTarget(mathlib,$(LIBDIRS))
+
@@ -6318,8 +6329,8 @@
+ InstallIncludeSubdirs($(LIBDIRS))
+
+diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/Imakefile
-+--- cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile 2005-11-29 17:06:12.812286166 +0000
-++++ cernlib-2005.05.09.dfsg/src/mclibs/Imakefile 2005-11-29 17:06:21.968354477 +0000
++--- cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile 2005-12-01 15:19:22.512623901 +0000
+++++ cernlib-2005.05.09.dfsg/src/mclibs/Imakefile 2005-12-01 15:19:31.187783453 +0000
+@@ -13,6 +13,7 @@
+ TestSubdirs($(LIBDIRS))
+
@@ -6330,7 +6341,7 @@
+ INCLUDEDIRS= cojets eurodec herwig isajet pdf
+diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile 1996-05-06 20:06:50.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile 2005-11-29 17:06:21.968354477 +0000
+++++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile 2005-12-01 15:19:31.187783453 +0000
+@@ -12,6 +12,7 @@
+ SubdirLibraryTarget(cojets,$(LIBDIRS))
+
@@ -6341,7 +6352,7 @@
+
+diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/eurodec/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/mclibs/eurodec/Imakefile 1996-05-06 20:06:55.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile 2005-11-29 17:06:21.968354477 +0000
+++++ cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile 2005-12-01 15:19:31.187783453 +0000
+@@ -12,6 +12,7 @@
+ SubdirLibraryTarget(eurodec,$(LIBDIRS))
+
@@ -6352,7 +6363,7 @@
+
+diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile 1997-01-06 17:06:41.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile 2005-11-29 17:06:21.968354477 +0000
+++++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile 2005-12-01 15:19:31.187783453 +0000
+@@ -10,6 +10,7 @@
+
+ InstallLibrary(herwig59,$(CERN_LIBDIR))
@@ -6363,7 +6374,7 @@
+
+diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile 2001-10-08 14:03:02.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile 2005-11-29 17:06:21.968354477 +0000
+++++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile 2005-12-01 15:19:31.187783453 +0000
+@@ -12,6 +12,7 @@
+ SubdirLibraryTarget(isajet758,$(LIBDIRS))
+
@@ -6374,7 +6385,7 @@
+
+diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile 2000-05-29 14:49:59.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile 2005-11-29 17:06:21.969354266 +0000
+++++ cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile 2005-12-01 15:19:31.188783241 +0000
+@@ -15,6 +15,7 @@
+ SubdirLibraryTarget(pdflib804,spdf npdf)
+
@@ -6385,7 +6396,7 @@
+
+diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/photos/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/mclibs/photos/Imakefile 1999-03-26 10:52:23.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile 2005-11-29 17:06:21.969354266 +0000
+++++ cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile 2005-12-01 15:19:31.188783241 +0000
+@@ -15,6 +15,7 @@
+ SubdirLibraryTarget(photos202,code)
+
@@ -6395,8 +6406,8 @@
+ TestSubdirs(test)
+
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/Imakefile cernlib-2005.05.09.dfsg/src/packlib/Imakefile
-+--- cernlib-2005.05.09.dfsg~/src/packlib/Imakefile 2005-11-29 17:06:14.373956699 +0000
-++++ cernlib-2005.05.09.dfsg/src/packlib/Imakefile 2005-11-29 17:06:21.969354266 +0000
++--- cernlib-2005.05.09.dfsg~/src/packlib/Imakefile 2005-12-01 15:19:23.885332680 +0000
+++++ cernlib-2005.05.09.dfsg/src/packlib/Imakefile 2005-12-01 15:19:31.188783241 +0000
+@@ -14,6 +14,7 @@
+
+ InstallLibrary(packlib,$(CERN_LIBDIR))
@@ -6406,8 +6417,8 @@
+ TestSubdirs($(LIBDIRS))
+
+diff -urNad cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile
-+--- cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile 2005-11-29 17:06:14.684891100 +0000
-++++ cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile 2005-11-29 17:06:21.969354266 +0000
++--- cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile 2005-12-01 15:19:24.192267563 +0000
+++++ cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile 2005-12-01 15:19:31.188783241 +0000
+@@ -30,4 +30,5 @@
+ SubdirLibraryTarget(pawlib-lesstif,$(LIBDIRS))
+
@@ -6416,7 +6427,7 @@
+
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile 1996-10-01 14:12:23.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/pawlib/Imakefile 2005-11-29 17:06:21.969354266 +0000
+++++ cernlib-2005.05.09.dfsg/src/pawlib/Imakefile 2005-12-01 15:19:31.188783241 +0000
+@@ -11,6 +11,7 @@
+ SubdirLibraryTarget(pawlib,$(LIBDIRS))
+
@@ -6427,7 +6438,7 @@
+
+diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/Imakefile cernlib-2005.05.09.dfsg/src/phtools/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/phtools/Imakefile 1996-11-14 16:44:33.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/phtools/Imakefile 2005-11-29 17:06:21.970354056 +0000
+++++ cernlib-2005.05.09.dfsg/src/phtools/Imakefile 2005-12-01 15:19:31.189783029 +0000
+@@ -11,7 +11,7 @@
+ SubdirLibraryTarget(phtools,$(LIBDIRS))
+
@@ -6762,13 +6773,15 @@
+ /* $Id$
+ *
+ * $Log$
-+ * Revision 1.1 2005/11/30 22:01:01 pertusus
-+ * - update with newer debian patchset for cernlib, fix licence issues
-+ * - don't use the include.tar.gz source, instead get include files from
-+ * the source files
-+ * - build shared libraries
-+ * - simplify the scripts modifications
-+ * - add BuildRequires: libXau-devel to workaround #173530
++ * Revision 1.2 2005/12/02 09:57:41 pertusus
++ * - use updated beta debian patchset
++ * - remove the BSD in the licence because there is no library nor binary
++ * under a BSD licence and someone could get the idea that there is
++ * some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
++ * because of cfortran
++ *
++ * The directory reordering in toplevel Imakefile is now done in patch 802
++ * and not 705
+ *
+diff -urNad cernlib-2005.05.09/src/config/MacOSX.cf /tmp/dpep.68wCAR/cernlib-2005.05.09/src/config/MacOSX.cf
+--- cernlib-2005.05.09/src/config/MacOSX.cf 2005-06-10 14:34:58.142950664 -0400
@@ -7684,13 +7697,15 @@
+ /* $Id$
+ *
+ * $Log$
-+ * Revision 1.1 2005/11/30 22:01:01 pertusus
-+ * - update with newer debian patchset for cernlib, fix licence issues
-+ * - don't use the include.tar.gz source, instead get include files from
-+ * the source files
-+ * - build shared libraries
-+ * - simplify the scripts modifications
-+ * - add BuildRequires: libXau-devel to workaround #173530
++ * Revision 1.2 2005/12/02 09:57:41 pertusus
++ * - use updated beta debian patchset
++ * - remove the BSD in the licence because there is no library nor binary
++ * under a BSD licence and someone could get the idea that there is
++ * some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
++ * because of cfortran
++ *
++ * The directory reordering in toplevel Imakefile is now done in patch 802
++ * and not 705
+ *
+diff -urNad cernlib-2005.05.09/src/config/MacOSX.cf /tmp/dpep.68wCAR/cernlib-2005.05.09/src/config/MacOSX.cf
+--- cernlib-2005.05.09/src/config/MacOSX.cf 2005-06-10 14:34:58.142950664 -0400
@@ -9890,7 +9905,7 @@
+ SYSGMOTIF="-lXm -lXt /usr/lib/X11/libX11.r" ;;
--- cernlib-2005.05.09.dfsg.orig/debian/add-ons/Makefile
+++ cernlib-2005.05.09.dfsg/debian/add-ons/Makefile
-@@ -0,0 +1,520 @@
+@@ -0,0 +1,518 @@
+# Variables for installation directories, conforming to GNU standards
+prefix = /usr/local
+exec_prefix = $(prefix)
@@ -10091,8 +10106,6 @@
+# build programs
+cernlib-programs:
+ set -e ; \
-+ rm -f $(CVSCOSRC)/pawlib/paw/programs/comis && \
-+ ln -sf ../../comis/comis $(CVSCOSRC)/pawlib/paw/programs/comis ; \
+ for package in $(BIN_PACKAGES) ; do \
+ if [ -d $(CVSCOSRC)/$$package ] ; then \
+ cd $(CERN_BUILDDIR)/$$package && $(MAKE) \
@@ -11162,12 +11175,14 @@
+
--- cernlib-2005.05.09.dfsg.orig/debian/add-ons/scripts/findsym
+++ cernlib-2005.05.09.dfsg/debian/add-ons/scripts/findsym
-@@ -0,0 +1,52 @@
+@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# find where a symbol is defined
-+# argument 1: "has" == provides a symbol,
-+# "needs" == requires a symbol
++# argument 1: "has" == what object provides a given symbol?
++# "needs" == what object requires a given symbol?
++# "requiredby" == what symbols are required by an object
++# providing a given symbol?
+# argument 2: the symbol to search for
+# argument 3: directory to search in ("." if omitted)
+
@@ -11217,13 +11232,13 @@
+
--- cernlib-2005.05.09.dfsg.orig/debian/add-ons/scripts/README
+++ cernlib-2005.05.09.dfsg/debian/add-ons/scripts/README
-@@ -0,0 +1,44 @@
+@@ -0,0 +1,58 @@
+Nothing in this directory is needed for compiling or building packages.
+It's just a few simple scripts that make my life easier when trying to debug
+library dependencies.
+
-+makedeplist
-+-----------
++makedeplist (no arguments)
++--------------------------
+
+When run in the top-level cernlib source directory after a compilation (note
+that DEB_BUILD_OPTIONS must have been set to "nostrip"), this script will
@@ -11248,18 +11263,32 @@
+If you want to include non-Cernlib libraries in the output, symlink to them
+from the shlib directory, e.g. shlib/libX11.so -> /usr/X11R6/lib/libX11.so
+
-+findsym
-+-------
++findsym {has|needs|requiredby} <symbol> [ <directory> ]
++-------------------------------------------------------
+
+This script will find needed symbols recursively in any .o, .a, or .so files in
+a directory. "findsym has <symbol>" searches for object files that provide a
+given symbol. "findsym needs <symbol>" searches for object files that have the
-+symbol undefined. An optional third argument specifies the starting directory
++symbol undefined. "findsym requiredby <symbol>" prints a list of symbols
++needed by object files that define the given symbol; this command works best
++with object files or shared libs.
++
++An optional third argument specifies the starting directory
+("." by default). Thus, seeing that the file
+ libdeps/libpacklib-lesstif.not-in-cernlib.txt
+contains (among others) the symbol XBell, we run (using an ingenious guess for
-+the starting directory) "findsym has XBell /usr/X11R6/lib" to determine that
-+this is found in libX11.so.
++the starting directory) "./findsym has XBell /usr/X11R6/lib" to determine that
++this symbol is found in libX11.so.
++
++libcomp <oldlib> <newlib>
++-------------------------
++
++This script compares the symbols exported by two dynamic libraries that are
++supposed to be different versions of the same library. Any symbols in the
++first-specified library that are not present in the second-specified library,
++or have a different size, are noted. The intent is to check for preservation
++of ABI compatibility.
++
+
+--Kevin McCarty
--- cernlib-2005.05.09.dfsg.orig/debian/add-ons/scripts/makedeplist
@@ -11356,11 +11385,12 @@
+exit 0
--- cernlib-2005.05.09.dfsg.orig/debian/add-ons/scripts/libcomp
+++ cernlib-2005.05.09.dfsg/debian/add-ons/scripts/libcomp
-@@ -0,0 +1,33 @@
+@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# libcomp - Script to check whether the size of library symbols has
+# changed between versions. For checking ABI compatibility.
++# Requires the "bc" and "binutils" packages to be installed.
+
+# Arguments: $1 - old library; $2 - new library
+
@@ -11663,13 +11693,15 @@
+.\"* $Id$
+.\"*
+.\"* $Log$
-+.\"* Revision 1.1 2005/11/30 22:01:01 pertusus
-+.\"* - update with newer debian patchset for cernlib, fix licence issues
-+.\"* - don't use the include.tar.gz source, instead get include files from
-+.\"* the source files
-+.\"* - build shared libraries
-+.\"* - simplify the scripts modifications
-+.\"* - add BuildRequires: libXau-devel to workaround #173530
++.\"* Revision 1.2 2005/12/02 09:57:41 pertusus
++.\"* - use updated beta debian patchset
++.\"* - remove the BSD in the licence because there is no library nor binary
++.\"* under a BSD licence and someone could get the idea that there is
++.\"* some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
++.\"* because of cfortran
++.\"*
++.\"* The directory reordering in toplevel Imakefile is now done in patch 802
++.\"* and not 705
+.\"*
+.\"* Revision 1.3 2000/10/24 07:29:51 couet
+.\"* - PAW web pages URL updated
@@ -13408,7 +13440,7 @@
+pawlib/sigma/sigma
--- cernlib-2005.05.09.dfsg.orig/debian/changelog
+++ cernlib-2005.05.09.dfsg/debian/changelog
-@@ -0,0 +1,1334 @@
+@@ -0,0 +1,1336 @@
+cernlib (2005.05.09.dfsg-1) unstable; urgency=low
+
+ * Removed the directories src/geant321/peanut and src/geant321/block,
@@ -13433,9 +13465,9 @@
+ binary packages: geant321, libgeant321-2, libgeant321-2-dev.
+
+ * Some additional changes to existing patches suggested by Patrice Dumas
-+ <pertusus at free.fr>:
++ <pertusus at free.fr> in the process of creating Cernlib RPMs:
+ - patch 102: Add src/mathlib/gen/d/old506.F to the list of files to
-+ compile without optimization.
++ compile without optimization; it breaks g77 3.2 otherwise.
+ - patch 207: Have COMIS create temporary shared library files with g77,
+ not gcc. (Resync patch 315.)
+ - patch 210: Change <cfortran.h> to <cfortran/cfortran.h>.
@@ -13444,8 +13476,10 @@
+ in src/packlib/kernlib/kerngen/ccgen/lenocc.c ; it isn't
+ clear that the C version is 64-bit safe.
+ - patch 800: Use "$(FCLINK)" to create shared libs, not "gcc".
-+ - patch 802: For consistency, add InstallSharedLibSubdirs to top-level
-+ Imakefile, even though not used in the Debian package build.
++ - patch 802: Fixes to the top-level Imakefile, even though it isn't used
++ in the Debian package build. For consistency, add
++ InstallSharedLibSubdirs(), and re-order the directory build
++ order to match that in debian/add-ons/Makefile.
+ - patch 804: #include "comis/mdpool.h" or .inc consistently, using a new
+ dpatch shell script 804-link-to-comis-includes.sh to link
+ src/pawlib/comis/comis into src/include/.
@@ -13474,7 +13508,7 @@
+ - Spanish: César Gómez MartÃn <cesar.gomez at gmail.com> (closes: #334390)
+ - Swedish: Daniel Nylander <po at danielnylander.se> (closes: #332334)
+
-+ -- Kevin B. McCarty <kmccarty at debian.org> Tue, 29 Nov 2005 17:41:54 +0000
++ -- Kevin B. McCarty <kmccarty at debian.org> Thu, 1 Dec 2005 15:14:27 +0000
+
+cernlib (2005.05.09-4) unstable; urgency=low
+
More information about the scm-commits
mailing list