? cint/stl/.cvsignore Index: .cvsignore =================================================================== RCS file: /user/cvs/root/.cvsignore,v retrieving revision 1.4 diff -u -r1.4 .cvsignore --- .cvsignore 30 Mar 2004 13:32:34 -0000 1.4 +++ .cvsignore 23 May 2005 15:35:07 -0000 @@ -5,3 +5,9 @@ work.pc work.pcl .def +build-arch-stamp +build-indep-stamp +configure-stamp +debian +log +semantic.cache Index: configure =================================================================== RCS file: /user/cvs/root/configure,v retrieving revision 1.236 diff -u -r1.236 configure --- configure 16 May 2005 21:31:17 -0000 1.236 +++ configure 23 May 2005 15:35:08 -0000 @@ -887,7 +887,6 @@ ;; --disable-*) f=`echo $1 | sed -e 's/--disable/enable/' -e 's/-/_/g'` - echo "Disabling $f" eval $f=no for c in $options ; do if test "x$c" = "x$f" ; then @@ -1619,110 +1618,24 @@ # libAfterImage due to many new features, use always the builtin_afterimage if test "x$enable_builtin_afterimage" = "xno" || test "x$enable_builtin_afterimage" = "" ; then - echo "#### Can currently not use the system libAfterImage ####" + # Assume failure enable_builtin_afterimage="yes" + checking_msg "for afterimage-config" + if `which afterimage-config > /dev/null 2>&1` ; then + which afterimage-config + # we found afterimage-config - now check the version number + asimage_version=`afterimage-config --version | awk 'BEGIN { FS="." } { printf "%d", $1 * 1000 + $2 }'` + if test $asimage_version -gt 1003 ; then + echo "WARNING: System libAfterImage is too new, using built-in" + else + enable_builtin_afterimage="no" + asextralib=`afterimage-config --libs` + asimageincdir=`afterimage-config --cflags | sed 's/-I//g'` + fi + else + echo "not found" + fi fi - if test "x$enable_builtin_afterimage" = "xno" || - test "x$enable_builtin_afterimage" = "" ; then - # Figure out if libAfterImage is on the system, and if so, if it usable - asimage_libdirs="$ASIMAGE $ASIMAGE/include \ - /usr/lib /usr/local/lib \ - /usr/lib/libAfterImage /usr/local/lib/libAfterImage \ - /usr/lib/libAfterBase /usr/local/lib/libAfterBase \ - /usr/lib/afterstep /usr/local/lib/afterstep \ - /usr/lib/libAfter /usr/local/lib/libAfter \ - /opt/libAfter" - asimage_incdirs="$ASIMAGE $ASIMAGE/include \ - /usr/include /usr/local/include \ - /usr/include/libAfterImage /usr/local/include/libAfterImage \ - /usr/include/libAfterBase /usr/local/include/libAfterBase \ - /usr/include/afterstep /usr/local/include/afterstep \ - /usr/include/libAfter /usr/local/include/libAfter \ - /opt/libAfter" - - asimageincdirtmp=$asimageincdir - check_header "astypes.h" "$asimageincdirtmp" $asimage_incdirs - asimageincdir=$found_dir - asimagetypes=$found_hdr - check_header "afterimage.h" "$asimageincdirtmp" $asimage_incdirs - asimageincdir="$asimageincdir $found_dir" - asimageimage=$found_hdr - - asimagelibdirtmp=$asimagelibdir - check_library "libAfterBase" "$enable_shared" "$asimagelibdirtmp" \ - $asimage_libdirs - asimagelib=$found_lib - asimagelibdir=$found_dir - - check_library "libAfterImage" "$enable_shared" "$asimagelibdirtmp" \ - $asimage_libdirs - asimagelib="$asimagelib $found_lib" - asimagelibdir="$asimagelibdir $found_dir" - - if test "x$asimageincdir" = "x" \ - || test "x$asimagelib" = "x" \ - || test "x$asimagetypes" = "x" \ - || test "x$asimageimage" = "x" ; then - asimagelib= - asimagelibdir= - asimageincdir= - enable_builtin_afterimage="yes" - fi - unset asimagelibdirtmp - fi - # If we didn't find the system libAfterImage, or the user didn't ask - # for a system library, then see if we have various headers needed. - if test "x$enable_builtin_afterimage" = "xyes" ; then - check_header "jpeglib.h" "" $ASIMAGE $ASIMAGE/include \ - /usr/local/include /usr/include /opt/include $finkdir/include - asjpegincdir=$found_dir - check_header "png.h" "" $ASIMAGE $ASIMAGE/include \ - /usr/local/include /usr/include /usr/local/include/libpng \ - /opt/include $finkdir/include - aspngincdir=$found_dir - check_header "tiffio.h" "" $ASIMAGE $ASIMAGE/include \ - /usr/local/include /usr/include /opt/include $finkdir/include - astiffincdir=$found_dir - check_header "gif_lib.h" "" $ASIMAGE $ASIMAGE/include \ - /usr/local/include /usr/include /opt/include $finkdir/include - asgifincdir=$found_dir - - asextralib="" - asextralibdir="" - found_libz="" - found_dirz="" - # libz must be before libpng, if libz is not found don't - # add libpng which needs libz - # don't look for libungif since we use the one built-in in libAfterImage - #for k in libjpeg libtiff libungif libz libpng ; do - for k in libjpeg libtiff libz libpng ; do - check_library $k "$enable_shared" "" \ - $ASIMAGE $ASIMAGE/lib /usr/local/lib /usr/lib /opt/lib $finkdir/lib - if test "x$k" = "xlibz" ; then - found_libz=$found_lib - found_dirz=$found_dir - continue; - fi - if test "x$k" = "xlibpng" && test "x$found_libz" = "x" ; then - break; - fi - if test ! "x$found_lib" = "x" ; then - asextralib="$asextralib $found_lib" - asextralibdir="$asextralibdir $found_dir" - fi - done - if test "x$asextralib" = "x" ; then - asextralib="" - asextralibdir="" - asjpegincdir="" - aspngincdir="" - astiffincdir="" - asgifincdir="" - else - asextralib="$asextralib $found_libz" - asextralibdir="$asextralibdir $found_dirz" - fi -fi message "Checking whether to build included libAfterImage" echo "$enable_builtin_afterimage" fi Index: build/package/common/root-xrootd.install.in =================================================================== RCS file: /user/cvs/root/build/package/common/root-xrootd.install.in,v retrieving revision 1.1 diff -u -r1.1 root-xrootd.install.in --- build/package/common/root-xrootd.install.in 21 Mar 2005 21:33:32 -0000 1.1 +++ build/package/common/root-xrootd.install.in 23 May 2005 15:35:08 -0000 @@ -1,5 +1,5 @@ @prefix@/lib/root/libXrdOfs.so +@prefix@/lib/root/libXrdPosix.so @prefix@/lib/root/libXrdRootd.so -@prefix@/lib/root/libXrdSec.so @prefix@/lib/root/libXrdSeckrb4.so @prefix@/lib/root/libXrdSeckrb5.so Index: build/package/debian/changelog =================================================================== RCS file: /user/cvs/root/build/package/debian/changelog,v retrieving revision 1.4 diff -u -r1.4 changelog --- build/package/debian/changelog 21 Mar 2005 21:34:36 -0000 1.4 +++ build/package/debian/changelog 23 May 2005 15:35:08 -0000 @@ -1,3 +1,9 @@ +root (5.01.01-1) unstable; urgency=low + + * New upstream + + -- Christian Holm Christensen Mon, 23 May 2005 13:42:03 +0200 + root (4.03.03) unstable; urgency=low * New upstream ROOT version Index: build/package/lib/makebuilddepend.sh =================================================================== RCS file: /user/cvs/root/build/package/lib/makebuilddepend.sh,v retrieving revision 1.3 diff -u -r1.3 makebuilddepend.sh --- build/package/lib/makebuilddepend.sh 6 Apr 2005 09:10:20 -0000 1.3 +++ build/package/lib/makebuilddepend.sh 23 May 2005 15:35:08 -0000 @@ -11,7 +11,7 @@ root-cint) ;; root-doc) ;; *alien) echo -n ", AliEn-Client" ;; -# *asimage) echo -n ", AfterStep-devel" ;; + *asimage) echo -n ", AfterStep-devel" ;; *asimage) ;; *castor) echo -n ", CASTOR-client" ;; *chirp) ;; Index: build/package/lib/makelist =================================================================== RCS file: /user/cvs/root/build/package/lib/makelist,v retrieving revision 1.1 diff -u -r1.1 makelist --- build/package/lib/makelist 21 Mar 2005 21:33:32 -0000 1.1 +++ build/package/lib/makelist 23 May 2005 15:35:08 -0000 @@ -24,8 +24,12 @@ all: liblist devlist binlist ifneq ($(LIB),) +ifneq ($(NOVERS),1) PKGLIBS := $(ALLLIBS) $(ALLLIBS:%.so=%.so.$(MAJOR)) \ $(ALLLIBS:%.so=%.so.$(MAJOR).$(MINOR)) +else +PKGLIBS := $(ALLLIBS) +endif liblist: @for f in $(PKGLIBS) ; do echo $$f ; done >> $(OUT)/$(LIB).install else Index: build/package/lib/makelists.sh =================================================================== RCS file: /user/cvs/root/build/package/lib/makelists.sh,v retrieving revision 1.1 diff -u -r1.1 makelists.sh --- build/package/lib/makelists.sh 21 Mar 2005 21:33:32 -0000 1.1 +++ build/package/lib/makelists.sh 23 May 2005 15:35:08 -0000 @@ -46,12 +46,14 @@ pyroot) lib=root-plugin-python ; dev=$lib ; bin=$lib ;; rfio) lib=root-plugin-castor ; dev=$lib ; bin=$lib ;; cint) lib=root-cint; dev=$lib ; bin=$lib - extra="ALLLIBS=/usr/lib/root/libCint.so" ;; + extra="ALLLIBS=/usr/lib/root/libCint.so" ;; srputils) lib=root-plugin-srp ; dev=$lib ; bin=$lib ;; xmlparser) lib=root-plugin-xml ; dev=$lib ; bin=$lib ;; krb5auth) lib=root-plugin-krb5 ; dev=$lib ; bin=$lib ;; - rootd|proofd|xrootd) + rootd|proofd) lib=root-$d ; dev=$lib ; bin=$lib ;; + xrootd) lib=root-$d ; dev=$lib ; bin=$lib + extra="ALLLIBS= NOVERS=1" ;; build|freetype|win*|main) continue ;; *) lib=root-plugin-$d ; dev=$lib ; bin=$lib ;; esac @@ -60,6 +62,7 @@ # Update package list for based on the Module.mk in thie currenly # investiaged directory # + echo "Making list for $d (dev=$dev lib=$lib bin=$bin extra=$extra)" build/package/lib/makelist DIRS=$d DEV=$dev LIB=$lib BIN=$bin \ VERSION=$version PREFIX=$prefix OUT=$outdir $extra \ --no-print-directory all Index: cint/include/.cvsignore =================================================================== RCS file: /user/cvs/root/cint/include/.cvsignore,v retrieving revision 1.2 diff -u -r1.2 .cvsignore --- cint/include/.cvsignore 26 Sep 2003 09:10:56 -0000 1.2 +++ cint/include/.cvsignore 23 May 2005 15:35:08 -0000 @@ -1,2 +1,3 @@ iosenum.h systypes.h +*.so.* Index: cint/include/sys/.cvsignore =================================================================== RCS file: /user/cvs/root/cint/include/sys/.cvsignore,v retrieving revision 1.1 diff -u -r1.1 .cvsignore --- cint/include/sys/.cvsignore 26 Sep 2003 09:11:15 -0000 1.1 +++ cint/include/sys/.cvsignore 23 May 2005 15:35:08 -0000 @@ -1 +1,2 @@ types.h +*.so.* Index: peac/src/TProofPEAC.cxx =================================================================== RCS file: /user/cvs/root/peac/src/TProofPEAC.cxx,v retrieving revision 1.2 diff -u -r1.2 TProofPEAC.cxx --- peac/src/TProofPEAC.cxx 8 Feb 2005 22:40:36 -0000 1.2 +++ peac/src/TProofPEAC.cxx 23 May 2005 15:35:08 -0000 @@ -191,7 +191,7 @@ fHeartbeatTimer->Connect("Timeout()", "TProofPEAC", this, "SendHeartbeat()"); fHeartbeatTimer->Start(fHBPeriod*1000, kFALSE); } else { - return TProof::StartSlaves(); + return TProof::StartSlaves(kTRUE); } return kTRUE;