Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv24224

Modified Files:
        clhep2.info 
Added Files:
        clhep2-doc.info clhep2.patch 
Log Message:
Backport packages changes from 10.7.

--- NEW FILE: clhep2-doc.info ---
Package: clhep2-doc
Version: 2.1.0.1
Revision: 11
Description: Documentation for CLHEP
Maintainer: Remi Mommsen <remigius.momm...@cern.ch>
Source: 
http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-%v.tgz
Source-MD5: dadfbe2c94a3f644cd085489c36b1bfd
SourceDirectory: %v/CLHEP
Suggests: clhep2 (>= %v-%r)
BuildDepends: <<
  tetex-base,
  latex2html
<<
PatchScript: <<
  #!/bin/sh -ev
  # Fix for no longer existing psfig.sty
  /usr/bin/sed -i '.bak' 's/input{psfig.sty}/usepackage{epsfig}/g' 
GenericFunctions/doc/genericFunctions.tex
<<
CompileScript: <<
  ./configure %c --cache-file=%b/config.cache --enable-shared 
--disable-dependency-tracking
  make docs
<<
InstallScript: <<
  #!/bin/sh -ev
  make install-docs prefix=%i/share/doc/clhep
  /bin/mv %i/share/doc/clhep/doc/* %i/share/doc/clhep
  /bin/rmdir %i/share/doc/clhep/doc
<<
DescDetail: <<
This package contains the documentation for the CLHEP package.
<<
License: Restrictive/Distributable
Homepage: http://cern.ch/clhep

--- NEW FILE: clhep2.patch ---
--- CLHEP.orig/Random/src/TripleRand.cc 2010-06-16 19:24:53.000000000 +0200
+++ CLHEP.new/Random/src/TripleRand.cc  2011-08-02 15:29:22.000000000 +0200
@@ -200,13 +200,13 @@
 
 TripleRand::operator float() {
   return (float)
-    ( ( integerCong ^ tausworthe ^ hurd ) * twoToMinus_32() 
+    ( ( integerCong ^ tausworthe ^ (unsigned int)hurd ) * twoToMinus_32() 
                                        + nearlyTwoToMinus_54() );
                                        // make sure non-zero!
 }
 
 TripleRand::operator unsigned int() {
-  return integerCong ^ tausworthe ^ hurd;
+  return integerCong ^ tausworthe ^ (unsigned int)hurd;
 }
 
 Hurd288Engine & TripleRand::Hurd()            { return hurd; }

Index: clhep2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/clhep2.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- clhep2.info 29 Jul 2011 09:19:23 -0000      1.11
+++ clhep2.info 3 Aug 2011 13:47:36 -0000       1.12
@@ -1,6 +1,6 @@
 Package: clhep2
 Version: 2.1.0.1
-Revision: 11
+Revision: 12
 BuildDependsOnly: true
 Description: Class library for high energy physics
 Maintainer: Remi Mommsen <remigius.momm...@cern.ch>
@@ -8,14 +8,16 @@
 Source-MD5: dadfbe2c94a3f644cd085489c36b1bfd
 SourceDirectory: %v/CLHEP
 GCC: 4.0
-NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1
 Depends: %n-shlibs (=%v-%r)
-BuildDepends: tetex-base, latex2html, gcc4.0 (>=4.0.1-5026)
+BuildDepends: fink (>= 0.24.12)
 Conflicts: clhep
 Replaces: clhep
+Suggests: clhep2-doc
+PatchFile: %n.patch
+PatchFile-MD5: c7e63aa63154402d4b0f80c531d9c596
 PatchScript: <<
   #!/bin/sh -ev
+  %{default_script}
   for file in `/usr/bin/find . -name "Makefile.in" -print` ; do
     /usr/bin/sed -i '.bak' 's/\($(CXXLINK).*\)-o $\@/\1/' $file
     /usr/bin/sed -i '.bak' 's/-@VERSION@/\.@VERSION@/' $file
@@ -27,24 +29,18 @@
     /usr/bin/sed -i '.bak' 's=-Wl,-install_name,=-install_name %p/lib/=' $file
     /usr/bin/sed -i '.bak' 's/^      build_shared="no"/      
build_shared="yes"/' $file
   done 
-
-  # Fix for no longer existing psfig.sty
-  /usr/bin/sed -i '.bak' 's/input{psfig.sty}/usepackage{epsfig}/g' 
GenericFunctions/doc/genericFunctions.tex
 <<
 CompileScript: <<
   ./configure %c --cache-file=%b/config.cache --enable-shared 
--disable-dependency-tracking
   make
-  # create documentation
-  make docs
 <<
 InstallScript: <<
   #!/bin/sh -ev
   make install prefix=%i
-  make install-docs prefix=%i/share/doc/clhep
-  /bin/mv %i/share/doc/clhep/doc/* %i/share/doc/clhep
-  /bin/rmdir %i/share/doc/clhep/doc
+  mkdir -p %i/share/doc/clhep
   cp %b/README %i/share/doc/clhep
   cp %b/ChangeLog %i/share/doc/clhep
+  cp %b/COPYING* %i/share/doc/clhep
   cd %i/lib
   for file in `/bin/ls -1 libCLHEP*.%v.*` ; do
     instname=`echo $file | /usr/bin/sed 's/\.%v//'`


------------------------------------------------------------------------------
BlackBerry&reg; DevCon Americas, Oct. 18-20, San Francisco, CA
The must-attend event for mobile developers. Connect with experts. 
Get tools for creating Super Apps. See the latest technologies.
Sessions, hands-on labs, demos & much more. Register early & save!
http://p.sf.net/sfu/rim-blackberry-1
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to