[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00_rc1-25-gbcd9604

Lifeng Sun lifongsun at gmail.com
Tue Jun 19 02:25:14 UTC 2012 

The following commit has been merged in the master branch:
commit 9d09d52ba6545d3d08a1b17b124a6c70fe23074a
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Thu Jun 7 19:36:19 2012 +0800

    Revise patchset for 5.34.00.

diff --git a/debian/patches/02-build-libroot-misc-memstat-package.patch b/debian/patches/02-build-libroot-misc-memstat-package.patch
index 8c126d2..f60be31 100644
--- a/debian/patches/02-build-libroot-misc-memstat-package.patch
+++ b/debian/patches/02-build-libroot-misc-memstat-package.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -6075,6 +6075,7 @@
+@@ -6142,6 +6142,7 @@
      test "x$enable_xml"      = "xyes" && pl="$pl libroot-io-xmlparser"
      test "x$enable_mathmore" = "xyes" && pl="$pl libroot-math-mathmore"
      test "x$enable_unuran"   = "xyes" && pl="$pl libroot-math-unuran"
diff --git a/debian/patches/03-build-libroot-bonjour-package.patch b/debian/patches/03-build-libroot-bonjour-package.patch
index 41e4a46..b2b906d 100644
--- a/debian/patches/03-build-libroot-bonjour-package.patch
+++ b/debian/patches/03-build-libroot-bonjour-package.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -6077,6 +6077,7 @@
+@@ -6144,6 +6144,7 @@
      test "x$enable_unuran"   = "xyes" && pl="$pl libroot-math-unuran"
      test "x$enable_memstat"  = "xyes" && pl="$pl libroot-misc-memstat"
      test "x$enable_table"    = "xyes" && pl="$pl libroot-misc-table"
@@ -8,7 +8,7 @@
      test "x$enable_ldap"     = "xyes" && pl="$pl libroot-net-ldap"
      test "x$enable_clarens"  = "xyes" && pl="$pl libroot-proof-clarens"
      test "x$enable_roofit"   = "xyes" && pl="$pl libroot-roofit"
-@@ -6095,7 +6096,6 @@
+@@ -6162,7 +6163,6 @@
      test "x$enable_minuit2"  = "xyes" && pl="$pl root-plugin-math-minuit2"
      test "x$enable_pythia6"  = "xyes" && pl="$pl root-plugin-montecarlo-pythia6"
      test "x$enable_alien"    = "xyes" && pl="$pl root-plugin-net-alien"
diff --git a/debian/patches/04-build-libroot-html-package.patch b/debian/patches/04-build-libroot-html-package.patch
index 8defc10..696eb56 100644
--- a/debian/patches/04-build-libroot-html-package.patch
+++ b/debian/patches/04-build-libroot-html-package.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -6119,6 +6119,7 @@
+@@ -6186,6 +6186,7 @@
          libroot-gui-ged \
          libroot-hist \
          libroot-hist-spectrum \
diff --git a/debian/patches/05-rename-package-libroot-proof-proofplayer.patch b/debian/patches/05-rename-package-libroot-proof-proofplayer.patch
index c120ebb..194ea8a 100644
--- a/debian/patches/05-rename-package-libroot-proof-proofplayer.patch
+++ b/debian/patches/05-rename-package-libroot-proof-proofplayer.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -6137,6 +6137,7 @@
+@@ -6204,6 +6204,7 @@
          libroot-net \
          libroot-net-auth \
          libroot-proof \
@@ -8,7 +8,7 @@
          libroot-tmva \
          libroot-tree \
          libroot-tree-treeplayer \
-@@ -6153,7 +6154,6 @@
+@@ -6220,7 +6221,6 @@
          root-plugin-io-sql \
          root-plugin-io-xml \
          root-plugin-math-fumili \
diff --git a/debian/patches/15-enable-extra-ldflags.patch b/debian/patches/15-enable-extra-ldflags.patch
index 8656ab1..57e090f 100644
--- a/debian/patches/15-enable-extra-ldflags.patch
+++ b/debian/patches/15-enable-extra-ldflags.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -6444,7 +6444,7 @@
+@@ -6511,7 +6511,7 @@
  
      sed -e "s|@useconfig@|FALSE|" \
          -e "s|@cflags@||"         \
@@ -9,7 +9,7 @@
              < Makefile.tmp > Makefile.tmpp
      mv Makefile.tmpp Makefile.tmp
  fi
-@@ -6578,7 +6578,7 @@
+@@ -6645,7 +6645,7 @@
      -e "s|@ldapincdir@|$ldapincdir|"            \
      -e "s|@ldaplib@|$ldaplib|"                  \
      -e "s|@ldaplibdir@|$ldaplibdir|"            \
diff --git a/debian/patches/22-fix-typo-succes-success.patch b/debian/patches/22-fix-typo-succes-success.patch
index f7acc24..a8c6e79 100644
--- a/debian/patches/22-fix-typo-succes-success.patch
+++ b/debian/patches/22-fix-typo-succes-success.patch
@@ -319,7 +319,7 @@
  }
 --- a/net/net/src/TWebFile.cxx
 +++ b/net/net/src/TWebFile.cxx
-@@ -1345,7 +1345,7 @@
+@@ -1350,7 +1350,7 @@
  //______________________________________________________________________________
  Int_t TWebSystem::Unlink(const char *)
  {
@@ -361,7 +361,7 @@
  
 --- a/roofit/roostats/src/LikelihoodInterval.cxx
 +++ b/roofit/roostats/src/LikelihoodInterval.cxx
-@@ -191,7 +191,7 @@
+@@ -192,7 +192,7 @@
  {  
     // Compute lower limit, check first if limit has been computed 
     // status is a boolean flag which will b set to false in case of error
@@ -370,7 +370,7 @@
     // in case of error return also a lower limit value of zero
  
     double lower = 0; 
-@@ -205,7 +205,7 @@
+@@ -206,7 +206,7 @@
  {  
     // Compute upper limit, check first if limit has been computed 
     // status is a boolean flag which will b set to false in case of error
@@ -381,7 +381,7 @@
     double lower = 0; 
 --- a/sql/oracle/src/TOracleServer.cxx
 +++ b/sql/oracle/src/TOracleServer.cxx
-@@ -216,7 +216,7 @@
+@@ -219,7 +219,7 @@
  Bool_t TOracleServer::Exec(const char* sql)
  {
     // Execute sql command wich does not produce any result set.
diff --git a/debian/patches/23-fix-typo-preceed-preced.patch b/debian/patches/23-fix-typo-preceed-preced.patch
index 1cef5d0..bbc1c77 100644
--- a/debian/patches/23-fix-typo-preceed-preced.patch
+++ b/debian/patches/23-fix-typo-preceed-preced.patch
@@ -104,7 +104,7 @@
  //     int det_id;           /* Detector id information                */
 --- a/proof/proofd/src/XrdProofdAux.cxx
 +++ b/proof/proofd/src/XrdProofdAux.cxx
-@@ -1603,7 +1603,7 @@
+@@ -1542,7 +1542,7 @@
  {
     // Parse a path in the form of "<before>[.<pid>][.<after>]", filling 'rest'
     // and returning 'pid'.
@@ -210,7 +210,7 @@
  	RooAbsPdf* newOne = proto->pdf(lastPdf.c_str());
 --- a/roofit/histfactory/src/HistoToWorkspaceFactoryFast.cxx
 +++ b/roofit/histfactory/src/HistoToWorkspaceFactoryFast.cxx
-@@ -719,11 +719,11 @@
+@@ -737,11 +737,11 @@
      string pdfName(pdfNameChar);
      map<string,string>::iterator it;
      string edit="EDIT::customized("+pdfName+",";
@@ -225,7 +225,7 @@
      }
      edit+=")";
      cout << edit<< endl;
-@@ -743,7 +743,7 @@
+@@ -766,7 +766,7 @@
      string edit="EDIT::newSimPdf("+pdfName+",";
      string editList;
      string lastPdf=pdfName;
@@ -234,7 +234,7 @@
      unsigned int numReplacements = 0;
      unsigned int nskipped = 0;
      map<string,double>::iterator it;
-@@ -798,10 +798,10 @@
+@@ -821,10 +821,10 @@
  
        // replace alphas with alphaOfBeta and replace constraints
        //cout <<         "alpha_"+it->first+"Constraint=beta_" + it->first+ "Constraint" << endl;
@@ -248,7 +248,7 @@
  
        /*
        if( proto->pdf(("alpha_"+it->first+"Constraint").c_str()) && proto->var(("alpha_"+it->first).c_str()) )
-@@ -815,7 +815,7 @@
+@@ -838,7 +838,7 @@
  	edit="EDIT::"+lastPdf+"_("+lastPdf+","+editList+")";
  	lastPdf+="_"; // append an underscore for the edit
  	editList=""; // reset edit list
@@ -257,7 +257,7 @@
  	cout << "Going to issue this edit command\n" << edit<< endl;
  	proto->factory( edit.c_str() );
  	RooAbsPdf* newOne = proto->pdf(lastPdf.c_str());
-@@ -850,10 +850,10 @@
+@@ -873,10 +873,10 @@
  
        // replace alphas with alphaOfBeta and replace constraints
        cout <<         "alpha_"+it->first+"Constraint=beta_" + it->first+ "Constraint" << endl;
@@ -271,7 +271,7 @@
  
        if( proto->pdf(("alpha_"+it->first+"Constraint").c_str()) && proto->var(("alpha_"+it->first).c_str()) )
  	cout << " checked they are there" << proto->pdf(("alpha_"+it->first+"Constraint").c_str()) << " " << proto->var(("alpha_"+it->first).c_str()) << endl;
-@@ -865,7 +865,7 @@
+@@ -888,7 +888,7 @@
  	edit="EDIT::"+lastPdf+"_("+lastPdf+","+editList+")";
  	lastPdf+="_"; // append an underscore for the edit
  	editList=""; // reset edit list
@@ -280,7 +280,7 @@
  	cout << edit<< endl;
  	proto->factory( edit.c_str() );
  	RooAbsPdf* newOne = proto->pdf(lastPdf.c_str());
-@@ -917,10 +917,10 @@
+@@ -940,10 +940,10 @@
  
        // replace alphas with alphaOfBeta and replace constraints
        cout <<         "alpha_"+it->first+"Constraint=beta_" + it->first+ "Constraint" << endl;
@@ -294,7 +294,7 @@
  
        if( proto->pdf(("alpha_"+it->first+"Constraint").c_str()) && proto->var(("alpha_"+it->first).c_str()) )
  	cout << " checked they are there" << proto->pdf(("alpha_"+it->first+"Constraint").c_str()) << " " << proto->var(("alpha_"+it->first).c_str()) << endl;
-@@ -932,7 +932,7 @@
+@@ -955,7 +955,7 @@
  	edit="EDIT::"+lastPdf+"_("+lastPdf+","+editList+")";
  	lastPdf+="_"; // append an underscore for the edit
  	editList=""; // reset edit list
@@ -303,7 +303,7 @@
  	cout << edit<< endl;
  	proto->factory( edit.c_str() );
  	RooAbsPdf* newOne = proto->pdf(lastPdf.c_str());
-@@ -961,15 +961,15 @@
+@@ -984,15 +984,15 @@
  
        // replace constraints
        cout << "alpha_"+it->first+"Constraint=one" << endl;
diff --git a/debian/patches/26-fix-typo-avaliable-available.patch b/debian/patches/26-fix-typo-avaliable-available.patch
index ca2997b..1896858 100644
--- a/debian/patches/26-fix-typo-avaliable-available.patch
+++ b/debian/patches/26-fix-typo-avaliable-available.patch
@@ -31,7 +31,7 @@
      esac
 --- a/configure
 +++ b/configure
-@@ -1201,7 +1201,7 @@
+@@ -1245,7 +1245,7 @@
              echo "Attempts at guessing your architecture failed."
              echo "(triplet is $arch:$chip:$rele)"
              echo "Please specify the architecture as the first argument."
diff --git a/debian/patches/35-fix-typo-recieve-receive.patch b/debian/patches/35-fix-typo-recieve-receive.patch
index ad64b5c..87fc2e4 100644
--- a/debian/patches/35-fix-typo-recieve-receive.patch
+++ b/debian/patches/35-fix-typo-recieve-receive.patch
@@ -11,7 +11,7 @@
  // 
 --- a/net/rpdutils/src/rpdutils.cxx
 +++ b/net/rpdutils/src/rpdutils.cxx
-@@ -3605,7 +3605,7 @@
+@@ -3606,7 +3606,7 @@
  //______________________________________________________________________________
  int RpdCheckSpecialPass(const char *passwd)
  {
diff --git a/debian/patches/41-fix-typo-interupted-interrupted.patch b/debian/patches/41-fix-typo-interupted-interrupted.patch
index ec9e3d4..a4174d5 100644
--- a/debian/patches/41-fix-typo-interupted-interrupted.patch
+++ b/debian/patches/41-fix-typo-interupted-interrupted.patch
@@ -1,6 +1,6 @@
 --- a/roofit/roostats/src/HypoTestInverterOriginal.cxx
 +++ b/roofit/roostats/src/HypoTestInverterOriginal.cxx
-@@ -330,7 +330,7 @@
+@@ -331,7 +331,7 @@
      
      // check if failed status
      if ( status==false ) {
diff --git a/debian/patches/46-fix-typo-explicitely-explicitly.patch b/debian/patches/46-fix-typo-explicitely-explicitly.patch
index fbd78c4..ac28477 100644
--- a/debian/patches/46-fix-typo-explicitely-explicitly.patch
+++ b/debian/patches/46-fix-typo-explicitely-explicitly.patch
@@ -22,7 +22,7 @@
  # #!/bin/sh
 --- a/configure
 +++ b/configure
-@@ -2874,7 +2874,7 @@
+@@ -2941,7 +2941,7 @@
         mysqllib=$found_lib
         mysqllibdir=$found_dir
  
@@ -294,7 +294,7 @@
           dset->Lookup(kTRUE, &listOfMissingFiles);
 --- a/proof/proofx/src/TXSocket.cxx
 +++ b/proof/proofx/src/TXSocket.cxx
-@@ -2094,7 +2094,7 @@
+@@ -2095,7 +2095,7 @@
     Int_t tryreconnect = gEnv->GetValue("TXSocket.Reconnect", 1);
     if (tryreconnect == 0 || fXrdProofdVersion < 1005) {
        if (tryreconnect == 0)
@@ -363,7 +363,7 @@
        // and the group is denied
        if (usrok == -1 || (!grpok && usrok != 1)) return -1;
     }
-@@ -935,7 +935,7 @@
+@@ -938,7 +938,7 @@
  
     // Groups
     if (!fGroupsMgr)
diff --git a/debian/patches/47-fix-typo-enviroment-environment.patch b/debian/patches/47-fix-typo-enviroment-environment.patch
index f4c9b99..3353a83 100644
--- a/debian/patches/47-fix-typo-enviroment-environment.patch
+++ b/debian/patches/47-fix-typo-enviroment-environment.patch
@@ -82,17 +82,6 @@
     //           location, where Instant Client files are extracted
     //       3) Run odbc_install.exe from account with administrative rights
     //       3) In $ORACLE_HOME/network/admin/ directory appropriate *.ora files
---- a/sql/oracle/inc/TOracleStatement.h
-+++ b/sql/oracle/inc/TOracleStatement.h
-@@ -40,7 +40,7 @@
-       char* namebuf;
-    };
- 
--   Environment           *fEnv;         // enviroment 
-+   Environment           *fEnv;         // environment 
-    Connection            *fConn;        // connection to Oracle
-    Statement             *fStmt;        // executed statement
-    ResultSet             *fResult;      // query result (rows)
 --- a/tmva/test/setup.sh
 +++ b/tmva/test/setup.sh
 @@ -48,7 +48,7 @@
@@ -115,3 +104,14 @@
        message(STATUS "                  Alternatively, you can also enable the option 'builtin_xrootd' to build XROOTD  internally'") 
        message(STATUS "                  For the time being switching OFF 'xrootd' option")
        set(xrootd OFF CACHE BOOL "" FORCE)
+--- a/sql/oracle/inc/TOracleStatement.h
++++ b/sql/oracle/inc/TOracleStatement.h
+@@ -41,7 +41,7 @@
+       char* namebuf;
+    };
+ 
+-   oracle::occi::Environment *fEnv;         // enviroment 
++   oracle::occi::Environment *fEnv;         // environment 
+    oracle::occi::Connection  *fConn;        // connection to Oracle
+    oracle::occi::Statement   *fStmt;        // executed statement
+    oracle::occi::ResultSet   *fResult;      // query result (rows)
diff --git a/debian/patches/52-fix-typo-choosen-chosen.patch b/debian/patches/52-fix-typo-choosen-chosen.patch
index 25b12a4..b9ef3e1 100644
--- a/debian/patches/52-fix-typo-choosen-chosen.patch
+++ b/debian/patches/52-fix-typo-choosen-chosen.patch
@@ -22,7 +22,7 @@
        return;
 --- a/hist/hist/src/TFormula.cxx
 +++ b/hist/hist/src/TFormula.cxx
-@@ -3718,7 +3718,7 @@
+@@ -3721,7 +3721,7 @@
     //
     //          pdata[operand={Var,Par,Const}][offset]
     //          pdata[fOperOffsets0[i]][fOperOffset1[i+1]]
diff --git a/debian/patches/56-fix-typo-appropiate-appropriate.patch b/debian/patches/56-fix-typo-appropiate-appropriate.patch
index 70d376c..20f5616 100644
--- a/debian/patches/56-fix-typo-appropiate-appropriate.patch
+++ b/debian/patches/56-fix-typo-appropiate-appropriate.patch
@@ -102,7 +102,7 @@
  9
 --- a/roofit/roofitcore/src/RooAbsPdf.cxx
 +++ b/roofit/roofitcore/src/RooAbsPdf.cxx
-@@ -1679,7 +1679,7 @@
+@@ -1707,7 +1707,7 @@
    }
  
  
@@ -111,7 +111,7 @@
    RooDataSet* data ;
    if (protoData) {
      data = generate(whatVars,*protoData,nEvents,verbose,randProto,resampleProto) ;
-@@ -2099,7 +2099,7 @@
+@@ -2127,7 +2127,7 @@
  			<< GetName() << "::expectedEvents() = " << expectedEvents(&whatVars)<< endl ;
    }
  
diff --git a/debian/patches/64-support-mipsel.patch b/debian/patches/64-support-mipsel.patch
index f885456..456c90a 100644
--- a/debian/patches/64-support-mipsel.patch
+++ b/debian/patches/64-support-mipsel.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -1177,7 +1177,7 @@
+@@ -1221,7 +1221,7 @@
          linux:alpha:*)         arch=linuxalphagcc   ;;
          linux:arm*:*)          arch=linuxarm        ;;
          linux:hppa*:*)         arch=linux           ;;
diff --git a/debian/patches/69-support-pythia8.patch b/debian/patches/69-support-pythia8.patch
index 310fe1e..e0a6c0a 100644
--- a/debian/patches/69-support-pythia8.patch
+++ b/debian/patches/69-support-pythia8.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -6095,6 +6095,7 @@
+@@ -6162,6 +6162,7 @@
      test "x$enable_gviz"     = "xyes" && pl="$pl root-plugin-graf2d-gviz"
      test "x$enable_minuit2"  = "xyes" && pl="$pl root-plugin-math-minuit2"
      test "x$enable_pythia6"  = "xyes" && pl="$pl root-plugin-montecarlo-pythia6"
diff --git a/debian/patches/71-remove-root-plugin-proof-xproof.patch b/debian/patches/71-remove-root-plugin-proof-xproof.patch
index 426d0c0..bcef395 100644
--- a/debian/patches/71-remove-root-plugin-proof-xproof.patch
+++ b/debian/patches/71-remove-root-plugin-proof-xproof.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -6155,7 +6155,6 @@
+@@ -6222,7 +6222,6 @@
          root-plugin-io-sql \
          root-plugin-io-xml \
          root-plugin-math-fumili \
diff --git a/debian/patches/73-ruby-1.9.1.patch b/debian/patches/73-ruby-1.9.1.patch
index 86c9582..bf18645 100644
--- a/debian/patches/73-ruby-1.9.1.patch
+++ b/debian/patches/73-ruby-1.9.1.patch
@@ -10,7 +10,7 @@
 +$(RUBY64O): CFLAGS += $(RUBYINCDIR:%=-I%) -I$(RUBYARCHINC)
 --- a/configure
 +++ b/configure
-@@ -4233,7 +4233,7 @@
+@@ -4300,7 +4300,7 @@
         test "x$enable_shared" = "xno" ; then
          check_library_options="libruby-static libruby1.8-static libruby1.9-static"
      else

-- 
root-system: CERN's ROOT Data Analysis Framework

More information about the debian-science-commits mailing list