[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.03-68-g662b6df

Lifeng Sun lifongsun at gmail.com
Tue Mar 5 15:02:34 UTC 2013 

The following commit has been merged in the master branch:
commit 5025ee2bac2d85f3033e7035ee3be9cfd68308d6
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Mar 5 18:41:10 2013 +0800

    Revise patchset.

diff --git a/debian/patches/02-build-libroot-misc-memstat-package.patch b/debian/patches/02-build-libroot-misc-memstat-package.patch
index 320cf2f..285c12e 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
-@@ -6101,6 +6101,7 @@
+@@ -6115,6 +6115,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 785c702..2a9b0c4 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
-@@ -6103,6 +6103,7 @@
+@@ -6117,6 +6117,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_roofit"   = "xyes" && pl="$pl libroot-roofit"
      test "x$enable_asimage"  = "xyes" && pl="$pl root-plugin-graf2d-asimage"
-@@ -6120,7 +6121,6 @@
+@@ -6134,7 +6135,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 241b777..ad12b8f 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
-@@ -6143,6 +6143,7 @@
+@@ -6157,6 +6157,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 c95f37e..4074d59 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
-@@ -6161,6 +6161,7 @@
+@@ -6175,6 +6175,7 @@
          libroot-net \
          libroot-net-auth \
          libroot-proof \
@@ -8,7 +8,7 @@
          libroot-tmva \
          libroot-tree \
          libroot-tree-treeplayer \
-@@ -6177,7 +6178,6 @@
+@@ -6191,7 +6192,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 fd94342..c072b52 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
-@@ -6468,7 +6468,7 @@
+@@ -6482,7 +6482,7 @@
  
      sed -e "s|@useconfig@|FALSE|" \
          -e "s|@cflags@||"         \
@@ -9,7 +9,7 @@
              < Makefile.tmp > Makefile.tmpp
      mv Makefile.tmpp Makefile.tmp
  fi
-@@ -6600,7 +6600,7 @@
+@@ -6615,7 +6615,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 b510bfc..6dde3a1 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
-@@ -1350,7 +1350,7 @@
+@@ -1358,7 +1358,7 @@
  //______________________________________________________________________________
  Int_t TWebSystem::Unlink(const char *)
  {
@@ -381,7 +381,7 @@
     double lower = 0; 
 --- a/sql/oracle/src/TOracleServer.cxx
 +++ b/sql/oracle/src/TOracleServer.cxx
-@@ -219,7 +219,7 @@
+@@ -228,7 +228,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 7697c44..17e25c2 100644
--- a/debian/patches/23-fix-typo-preceed-preced.patch
+++ b/debian/patches/23-fix-typo-preceed-preced.patch
@@ -11,7 +11,7 @@
        Printf("\"roots\" script to be found.");
 --- a/core/base/src/TVirtualPS.cxx
 +++ b/core/base/src/TVirtualPS.cxx
-@@ -106,7 +106,7 @@
+@@ -109,7 +109,7 @@
           if (fLenBuffer > 0) nWrite = fLenBuffer;
        } else {
           if ((len + fLenBuffer) > nWrite) {
@@ -210,22 +210,7 @@
  	RooAbsPdf* newOne = proto->pdf(lastPdf.c_str());
 --- a/roofit/histfactory/src/HistoToWorkspaceFactoryFast.cxx
 +++ b/roofit/histfactory/src/HistoToWorkspaceFactoryFast.cxx
-@@ -827,11 +827,11 @@
-     string pdfName(pdfNameChar);
-     map<string,string>::iterator it;
-     string edit="EDIT::customized("+pdfName+",";
--    string preceed="";
-+    string preced="";
-     for(it=renameMap.begin(); it!=renameMap.end(); ++it) {
-       cout << it->first + "=" + it->second << endl;
--      edit+=preceed + it->first + "=" + it->second;
--      preceed=",";
-+      edit+=preced + it->first + "=" + it->second;
-+      preced=",";
-     }
-     edit+=")";
-     cout << edit<< endl;
-@@ -856,7 +856,7 @@
+@@ -797,7 +797,7 @@
      string edit="EDIT::newSimPdf("+pdfName+",";
      string editList;
      string lastPdf=pdfName;
@@ -234,21 +219,20 @@
      unsigned int numReplacements = 0;
      unsigned int nskipped = 0;
      map<string,double>::iterator it;
-@@ -911,10 +911,10 @@
+@@ -853,9 +853,9 @@
+       //      proto->var(Form("alpha_%s",it->first.c_str()))->setConstant(true);
  
        // replace alphas with alphaOfBeta and replace constraints
-       //cout <<         "alpha_"+it->first+"Constraint=beta_" + it->first+ "Constraint" << endl;
 -      editList+=preceed + "alpha_"+it->first+"Constraint=beta_" + it->first+ "Constraint";
 -      preceed=",";
+-      editList+=preceed + "alpha_"+it->first+"=alphaOfBeta_"+ it->first;
 +      editList+=preced + "alpha_"+it->first+"Constraint=beta_" + it->first+ "Constraint";
 +      preced=",";
-       //      cout <<         "alpha_"+it->first+"=alphaOfBeta_"+ it->first << endl;
--      editList+=preceed + "alpha_"+it->first+"=alphaOfBeta_"+ it->first;
 +      editList+=preced + "alpha_"+it->first+"=alphaOfBeta_"+ it->first;
  
        /*
        if( proto->pdf(("alpha_"+it->first+"Constraint").c_str()) && proto->var(("alpha_"+it->first).c_str()) )
-@@ -928,7 +928,7 @@
+@@ -869,7 +869,7 @@
  	edit="EDIT::"+lastPdf+"_("+lastPdf+","+editList+")";
  	lastPdf+="_"; // append an underscore for the edit
  	editList=""; // reset edit list
@@ -257,7 +241,7 @@
  	cout << "Going to issue this edit command\n" << edit<< endl;
  	proto->factory( edit.c_str() );
  	RooAbsPdf* newOne = proto->pdf(lastPdf.c_str());
-@@ -963,10 +963,10 @@
+@@ -904,10 +904,10 @@
  
        // replace alphas with alphaOfBeta and replace constraints
        cout <<         "alpha_"+it->first+"Constraint=beta_" + it->first+ "Constraint" << endl;
@@ -271,7 +255,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;
-@@ -978,7 +978,7 @@
+@@ -919,7 +919,7 @@
  	edit="EDIT::"+lastPdf+"_("+lastPdf+","+editList+")";
  	lastPdf+="_"; // append an underscore for the edit
  	editList=""; // reset edit list
@@ -280,7 +264,7 @@
  	cout << edit<< endl;
  	proto->factory( edit.c_str() );
  	RooAbsPdf* newOne = proto->pdf(lastPdf.c_str());
-@@ -1030,10 +1030,10 @@
+@@ -971,10 +971,10 @@
  
        // replace alphas with alphaOfBeta and replace constraints
        cout <<         "alpha_"+it->first+"Constraint=beta_" + it->first+ "Constraint" << endl;
@@ -294,7 +278,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;
-@@ -1045,7 +1045,7 @@
+@@ -986,7 +986,7 @@
  	edit="EDIT::"+lastPdf+"_("+lastPdf+","+editList+")";
  	lastPdf+="_"; // append an underscore for the edit
  	editList=""; // reset edit list
@@ -303,7 +287,7 @@
  	cout << edit<< endl;
  	proto->factory( edit.c_str() );
  	RooAbsPdf* newOne = proto->pdf(lastPdf.c_str());
-@@ -1074,15 +1074,15 @@
+@@ -1015,15 +1015,15 @@
  
        // replace constraints
        cout << "alpha_"+it->first+"Constraint=one" << endl;
diff --git a/debian/patches/24-fix-typo-informations-information.patch b/debian/patches/24-fix-typo-informations-information.patch
index f80aa51..a9ef6db 100644
--- a/debian/patches/24-fix-typo-informations-information.patch
+++ b/debian/patches/24-fix-typo-informations-information.patch
@@ -287,7 +287,7 @@
  
 --- a/proof/proof/src/TProof.cxx
 +++ b/proof/proof/src/TProof.cxx
-@@ -11502,7 +11502,7 @@
+@@ -11662,7 +11662,7 @@
  //______________________________________________________________________________
  void TProof::SaveWorkerInfo()
  {
diff --git a/debian/patches/37-fix-typo-processsing-processing.patch b/debian/patches/37-fix-typo-processsing-processing.patch
index 0aba873..c8b937c 100644
--- a/debian/patches/37-fix-typo-processsing-processing.patch
+++ b/debian/patches/37-fix-typo-processsing-processing.patch
@@ -1,6 +1,6 @@
 --- a/proof/proof/src/TProofMgr.cxx
 +++ b/proof/proof/src/TProofMgr.cxx
-@@ -1021,7 +1021,7 @@
+@@ -1048,7 +1048,7 @@
  void TProofDesc::Print(Option_t *) const
  {
     // Dump the content to the screen.
diff --git a/debian/patches/38-fix-typo-ouput-output.patch b/debian/patches/38-fix-typo-ouput-output.patch
index 141b928..1d69fc0 100644
--- a/debian/patches/38-fix-typo-ouput-output.patch
+++ b/debian/patches/38-fix-typo-ouput-output.patch
@@ -53,7 +53,7 @@
     // Compute pad conversion coefficients
 --- a/proof/proof/src/TProof.cxx
 +++ b/proof/proof/src/TProof.cxx
-@@ -3071,7 +3071,7 @@
+@@ -3079,7 +3079,7 @@
                 } else {
                    PDB(kGlobal,2)
                       Info("HandleInputMessage",
@@ -64,7 +64,7 @@
                 Warning("HandleInputMessage",
 --- a/proof/proofplayer/src/TProofPlayer.cxx
 +++ b/proof/proofplayer/src/TProofPlayer.cxx
-@@ -2798,7 +2798,7 @@
+@@ -2802,7 +2802,7 @@
     TList *tmp = (TList *) qr->GetOutputList();
     if (!tmp) {
        gSystem->RedirectOutput(0);
diff --git a/debian/patches/40-fix-typo-lenght-length.patch b/debian/patches/40-fix-typo-lenght-length.patch
index 319bc8f..f10b6fb 100644
--- a/debian/patches/40-fix-typo-lenght-length.patch
+++ b/debian/patches/40-fix-typo-lenght-length.patch
@@ -1,6 +1,6 @@
 --- a/core/base/src/TVirtualX.cxx
 +++ b/core/base/src/TVirtualX.cxx
-@@ -1631,7 +1631,7 @@
+@@ -1659,7 +1659,7 @@
  Int_t TVirtualX::TextWidth(FontStruct_t /*font*/, const char * /*s*/,
                               Int_t /*len*/)
  {
@@ -11,7 +11,7 @@
  }
 --- a/core/unix/src/TUnixSystem.cxx
 +++ b/core/unix/src/TUnixSystem.cxx
-@@ -3293,7 +3293,7 @@
+@@ -3317,7 +3317,7 @@
  //______________________________________________________________________________
  int TUnixSystem::RecvBuf(int sock, void *buf, int length)
  {
@@ -53,7 +53,7 @@
     if (len >0 && s && s[0] != 0 ) {
 --- a/graf2d/win32gdk/src/TGWin32.cxx
 +++ b/graf2d/win32gdk/src/TGWin32.cxx
-@@ -6407,7 +6407,7 @@
+@@ -6422,7 +6422,7 @@
  //______________________________________________________________________________
  Int_t TGWin32::TextWidth(FontStruct_t font, const char *s, Int_t len)
  {
@@ -75,7 +75,7 @@
  }
 --- a/graf2d/x11ttf/src/TGX11TTF.cxx
 +++ b/graf2d/x11ttf/src/TGX11TTF.cxx
-@@ -591,7 +591,7 @@
+@@ -610,7 +610,7 @@
  //______________________________________________________________________________
  Int_t TGX11TTF::TextWidth(FontStruct_t font, const char *s, Int_t len)
  {
@@ -205,7 +205,7 @@
  
 --- a/proof/proof/src/TProofServ.cxx
 +++ b/proof/proof/src/TProofServ.cxx
-@@ -1332,7 +1332,7 @@
+@@ -1344,7 +1344,7 @@
     Int_t rc = 0;
     TString exmsg;
  
diff --git a/debian/patches/46-fix-typo-explicitely-explicitly.patch b/debian/patches/46-fix-typo-explicitely-explicitly.patch
index 5d94b8b..0c702a9 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
-@@ -2974,7 +2974,7 @@
+@@ -2976,7 +2976,7 @@
         mysqllib=$found_lib
         mysqllibdir=$found_dir
  
@@ -221,7 +221,7 @@
  object to be processed. The problem appeared when processing files
 --- a/proof/proof/src/TProof.cxx
 +++ b/proof/proof/src/TProof.cxx
-@@ -853,7 +853,7 @@
+@@ -858,7 +858,7 @@
     if (enableSchemaEvolution) {
        TMessage::EnableSchemaEvolutionForAll();
     } else {
@@ -230,7 +230,7 @@
     }
  
     if (IsMaster()) {
-@@ -11384,7 +11384,7 @@
+@@ -11544,7 +11544,7 @@
        if (mgr && mgr->IsValid()) {
  
           // If XProofd we always attempt an attach first (unless
@@ -241,7 +241,7 @@
              TProofDesc *d = 0;
 --- a/proof/proof/src/TProofServ.cxx
 +++ b/proof/proof/src/TProofServ.cxx
-@@ -762,7 +762,7 @@
+@@ -772,7 +772,7 @@
     if (enableSchemaEvolution) {
        TMessage::EnableSchemaEvolutionForAll();
     } else {
@@ -250,7 +250,7 @@
     }
  }
  
-@@ -2544,7 +2544,7 @@
+@@ -2556,7 +2556,7 @@
     fflush(stdout);
  
     // On workers we do not send the logs to masters (to avoid duplication of
@@ -261,7 +261,7 @@
           FlushLogFile();
 --- a/proof/proofd/src/XrdProofdClientMgr.cxx
 +++ b/proof/proofd/src/XrdProofdClientMgr.cxx
-@@ -301,7 +301,7 @@
+@@ -300,7 +300,7 @@
  
     TRACEP(p, HDBG, "enter");
  
@@ -283,7 +283,7 @@
        if (procnotass == 0) {
 --- a/proof/proofplayer/src/TProofPlayer.cxx
 +++ b/proof/proofplayer/src/TProofPlayer.cxx
-@@ -1898,7 +1898,7 @@
+@@ -1896,7 +1896,7 @@
        } else {
           listOfMissingFiles = new TList;
        }
@@ -327,7 +327,7 @@
     TThread::UnLock();
 --- a/proof/proofd/src/XrdProofdManager.cxx
 +++ b/proof/proofd/src/XrdProofdManager.cxx
-@@ -339,7 +339,7 @@
+@@ -340,7 +340,7 @@
        // Policy: check first the general directive for groups; a user of a specific group
        // (both UNIX or PROOF groups) can be rejected by prefixing a '-'.
        // The group check fails if active (the allowedgroups directive has entries) and at
@@ -336,7 +336,7 @@
        // The result of the group check is superseeded by any explicit speicification in the
        // allowedusers, either positive or negative.
        //
-@@ -353,13 +353,13 @@
+@@ -354,13 +354,13 @@
        //         User 'katy' is allowed because part of PROOF group 'student'; 
        //         users 'jack' and 'john' are denied because not part of PROOF group 'student' (no 'allowedusers' directive)
        //   3.    xpd.allowedgroups alfa,-student
@@ -354,7 +354,7 @@
        //         (the allowedgroups directive is in this case ignored for users 'katy' and 'jack').
  
        bool grpok = 1;
-@@ -429,7 +429,7 @@
+@@ -430,7 +430,7 @@
           usrok = 1;
           e = "";
        }
@@ -363,7 +363,7 @@
        // and the group is denied
        if (usrok == -1 || (!grpok && usrok != 1)) return -1;
     }
-@@ -942,7 +942,7 @@
+@@ -950,7 +950,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 cb5e22e..b34288a 100644
--- a/debian/patches/47-fix-typo-enviroment-environment.patch
+++ b/debian/patches/47-fix-typo-enviroment-environment.patch
@@ -84,7 +84,7 @@
      export LD_LIBRARY_PATH=$PWD/lib:${LD_LIBRARY_PATH}
 --- a/cmake/modules/SearchInstalledSoftware.cmake
 +++ b/cmake/modules/SearchInstalledSoftware.cmake
-@@ -535,7 +535,7 @@
+@@ -537,7 +537,7 @@
    if(NOT builtin_xrootd)
      find_package(XROOTD)
      if(NOT XROOTD_FOUND)
diff --git a/debian/patches/51-fix-typo-commited-committed.patch b/debian/patches/51-fix-typo-commited-committed.patch
index ec9528e..c5c8cf9 100644
--- a/debian/patches/51-fix-typo-commited-committed.patch
+++ b/debian/patches/51-fix-typo-commited-committed.patch
@@ -11,7 +11,7 @@
  	* TypeBuilder.cpp(.h) added EnumTypeBuilder() function
 --- a/roofit/roofitcore/src/RooWorkspace.cxx
 +++ b/roofit/roofitcore/src/RooWorkspace.cxx
-@@ -1006,7 +1006,7 @@
+@@ -1008,7 +1008,7 @@
    }
    delete iter ;
  
diff --git a/debian/patches/52-fix-typo-choosen-chosen.patch b/debian/patches/52-fix-typo-choosen-chosen.patch
index b9ef3e1..d0069f1 100644
--- a/debian/patches/52-fix-typo-choosen-chosen.patch
+++ b/debian/patches/52-fix-typo-choosen-chosen.patch
@@ -11,7 +11,7 @@
     f1->Draw();
 --- a/gui/guibuilder/src/TGuiBldDragManager.cxx
 +++ b/gui/guibuilder/src/TGuiBldDragManager.cxx
-@@ -5472,7 +5472,7 @@
+@@ -5473,7 +5473,7 @@
  //______________________________________________________________________________
  void TGuiBldDragManager::DoClassMenu(Int_t id)
  {
diff --git a/debian/patches/53-fix-typo-backgroud-Background.patch b/debian/patches/53-fix-typo-backgroud-Background.patch
index cd00c74..b7090cf 100644
--- a/debian/patches/53-fix-typo-backgroud-Background.patch
+++ b/debian/patches/53-fix-typo-backgroud-Background.patch
@@ -1,6 +1,6 @@
 --- a/tmva/src/MethodBase.cxx
 +++ b/tmva/src/MethodBase.cxx
-@@ -2080,7 +2080,7 @@
+@@ -2085,7 +2085,7 @@
     // where PDF(x) is the PDF of the classifier's signal or background distribution
  
     if ((reftype == Types::kSignal && !fMVAPdfS) || (reftype == Types::kBackground && !fMVAPdfB)) {
diff --git a/debian/patches/54-fix-typo-auxilliary-auxiliary.patch b/debian/patches/54-fix-typo-auxilliary-auxiliary.patch
index 7eafa5a..7d2ef78 100644
--- a/debian/patches/54-fix-typo-auxilliary-auxiliary.patch
+++ b/debian/patches/54-fix-typo-auxilliary-auxiliary.patch
@@ -79,7 +79,7 @@
  To "beautify" (i.e. create links to documentation for class names etc) some text
 --- a/proof/proof/inc/TProof.h
 +++ b/proof/proof/inc/TProof.h
-@@ -310,7 +310,7 @@
+@@ -312,7 +312,7 @@
     ClassDef(TMergerInfo,0)          // Basic info on merger, i.e. worker serving as merger
  };
  
diff --git a/debian/patches/56-fix-typo-appropiate-appropriate.patch b/debian/patches/56-fix-typo-appropiate-appropriate.patch
index 9f60210..1095cc5 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
-@@ -1710,7 +1710,7 @@
+@@ -1729,7 +1729,7 @@
    }
  
  
@@ -110,8 +110,8 @@
 +  // Forward to appropriate implementation
    RooDataSet* data ;
    if (protoData) {
-     data = generate(whatVars,*protoData,nEvents,verbose,randProto,resampleProto) ;
-@@ -2131,7 +2131,7 @@
+     data = generate(whatVars,*protoData,Int_t(nEvents),verbose,randProto,resampleProto) ;
+@@ -2151,7 +2151,7 @@
  			<< GetName() << "::expectedEvents() = " << expectedEvents(&whatVars)<< endl ;
    }
  
diff --git a/debian/patches/59-fix-typo-targetting-targeting.patch b/debian/patches/59-fix-typo-targetting-targeting.patch
index 62aa5d0..6d2c82d 100644
--- a/debian/patches/59-fix-typo-targetting-targeting.patch
+++ b/debian/patches/59-fix-typo-targetting-targeting.patch
@@ -1,6 +1,6 @@
 --- a/io/io/src/TFileMerger.cxx
 +++ b/io/io/src/TFileMerger.cxx
-@@ -906,7 +906,7 @@
+@@ -916,7 +916,7 @@
     // Intercept the case where the output TFile is deleted!
     
     if (obj == fOutputFile) {
diff --git a/debian/patches/61-fix-typo-paramater-parameter.patch b/debian/patches/61-fix-typo-paramater-parameter.patch
index be77a21..04ca9a7 100644
--- a/debian/patches/61-fix-typo-paramater-parameter.patch
+++ b/debian/patches/61-fix-typo-paramater-parameter.patch
@@ -122,9 +122,9 @@
 -  _paramSet("!paramSet","bin paramaters",  this),
 +  _paramSet("!paramSet","bin parameters",  this),
    _numBins(0),
-   _dataSet( (string(name)+"_dataSet").c_str(), "", vars) 
- {
-@@ -81,13 +81,13 @@
+   _dataSet( (string(name)+"_dataSet").c_str(), "", vars),
+   _Normalized( false )
+@@ -82,13 +82,13 @@
    // Set the binning
    // //_binning = var.getBinning().clone() ;
    
@@ -140,16 +140,16 @@
    addVarSet( vars );
    addParamSet( paramSet );
  
-@@ -102,7 +102,7 @@
+@@ -103,7 +103,7 @@
    RooAbsReal(name, title),
    //  _dataVar("!dataVar","data Var", this, (RooRealVar&) var),
    _dataVars("!dataVars","data Vars",       this),
 -  _paramSet("!paramSet","bin paramaters",  this),
 +  _paramSet("!paramSet","bin parameters",  this),
    _numBins(0),
-   _dataSet( (string(name)+"_dataSet").c_str(), "", vars, Hist) 
- {
-@@ -122,7 +122,7 @@
+   _dataSet( (string(name)+"_dataSet").c_str(), "", vars, Hist),
+   _Normalized( false )
+@@ -124,7 +124,7 @@
    // Get the number of bins
    _numBins = GetNumBins( vars );
  
@@ -158,7 +158,7 @@
    addVarSet( vars );
    addParamSet( paramSet );
   
-@@ -656,7 +656,7 @@
+@@ -648,7 +648,7 @@
  
    if( numVarBins != numElements ) {
      std::cout << "ParamHistFunc::addParamSet - ERROR - " 
@@ -167,7 +167,7 @@
  	      << " has " << numElements << " elements but the ParamHistFunc"
  	      << GetName() << " has " << numVarBins << " bins."
  	      << std::endl;
-@@ -674,7 +674,7 @@
+@@ -666,7 +666,7 @@
    while((comp = (RooAbsArg*) paramIter.next())) {
      if (!dynamic_cast<RooRealVar*>(comp)) {
        coutE(InputArguments) << "ParamHistFunc::(" << GetName() << ") ERROR: component " << comp->GetName() 
@@ -220,7 +220,7 @@
    } else {
 --- a/roofit/roofitcore/src/RooMinimizer.cxx
 +++ b/roofit/roofitcore/src/RooMinimizer.cxx
-@@ -589,7 +589,7 @@
+@@ -597,7 +597,7 @@
    title = userTitle ? userTitle : Form("%s", _func->GetTitle()) ;
    RooFitResult* fitRes = new RooFitResult(name,title) ;
  
@@ -231,7 +231,7 @@
    RooArgList saveFloatInitList(*(_fcn->GetInitFloatParamList())) ;
 --- a/roofit/roofitcore/src/RooMinuit.cxx
 +++ b/roofit/roofitcore/src/RooMinuit.cxx
-@@ -874,7 +874,7 @@
+@@ -880,7 +880,7 @@
  
    RooFitResult* fitRes = new RooFitResult(name,title) ;
  
diff --git a/debian/patches/69-support-pythia8.patch b/debian/patches/69-support-pythia8.patch
index 3cfcd21..da93cda 100644
--- a/debian/patches/69-support-pythia8.patch
+++ b/debian/patches/69-support-pythia8.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -6120,6 +6120,7 @@
+@@ -6134,6 +6134,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 ee80183..2169236 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
-@@ -6179,7 +6179,6 @@
+@@ -6193,7 +6193,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 2f175c7..d82175c 100644
--- a/debian/patches/73-ruby-1.9.1.patch
+++ b/debian/patches/73-ruby-1.9.1.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -4310,10 +4310,14 @@
+@@ -4318,10 +4318,14 @@
      # Check for Ruby include and library
      myruby=`$cwhich ruby 2> /dev/null`
      if test ! "x$myruby" = "x" && test -x "$myruby" ; then
@@ -16,7 +16,7 @@
      fi
      rubysysarchdir2=
      if test "x$platform" = "xmacosx" ; then
-@@ -4332,9 +4336,9 @@
+@@ -4340,9 +4344,9 @@
  
      if test "x$arch" = "xwin32" || \
         test "x$enable_shared" = "xno" ; then
diff --git a/debian/patches/74-kfreebsd.patch b/debian/patches/74-kfreebsd.patch
index e2e1884..2eb3136 100644
--- a/debian/patches/74-kfreebsd.patch
+++ b/debian/patches/74-kfreebsd.patch
@@ -229,7 +229,7 @@
          hp-ux:ia64:*)          arch=hpuxia64acc     ;;
          hp-ux:*:*)             arch=hpuxacc         ;;
          hurd*:*:*)             arch=hurddeb         ;;
-@@ -1817,7 +1819,7 @@
+@@ -1818,7 +1820,7 @@
     fi
  fi
  
@@ -238,7 +238,7 @@
      linuxdist=
      if `$cwhich lsb_release > /dev/null 2>&1` ; then
         if lsb_release -d | grep -i 'ubuntu' > /dev/null 2>& 1; then
-@@ -3938,7 +3940,7 @@
+@@ -3946,7 +3948,7 @@
  #
  bonjourcppflags=
  case $platform in
@@ -247,7 +247,7 @@
          ;;
      *)
          if test "x$enable_bonjour" = "xyes" ; then
-@@ -5968,7 +5970,7 @@
+@@ -5982,7 +5984,7 @@
  message "Checking whether to build libMemStat"
  if test "x$enable_memstat" = "xyes" || test ! "x$MEMSTAT" = "x"; then
      case $arch in
@@ -258,7 +258,7 @@
         enable_memstat="no" ;;
 --- a/core/base/inc/RConfig.h
 +++ b/core/base/inc/RConfig.h
-@@ -350,6 +350,22 @@
+@@ -355,6 +355,22 @@
  #   define HAS_STRLCPY
  #endif
  
@@ -305,7 +305,7 @@
      typedef GLvoid (CALLBACK *tessfuncptr_t)();
 --- a/graf3d/gl/src/TGLPadUtils.cxx
 +++ b/graf3d/gl/src/TGLPadUtils.cxx
-@@ -542,7 +542,7 @@
+@@ -556,7 +556,7 @@
  extern "C" {
  #if defined(__APPLE_CC__) && __APPLE_CC__ > 4000 && __APPLE_CC__ < 5450 && !defined(__INTEL_COMPILER)
      typedef GLvoid (*tess_t)(...);
@@ -316,7 +316,7 @@
      typedef GLvoid (CALLBACK *tess_t)( );
 --- a/graf3d/gl/src/TGLUtil.cxx
 +++ b/graf3d/gl/src/TGLUtil.cxx
-@@ -1418,7 +1418,7 @@
+@@ -1423,7 +1423,7 @@
  {
  #if defined(__APPLE_CC__) && __APPLE_CC__ > 4000 && __APPLE_CC__ < 5450 && !defined(__INTEL_COMPILER)
      typedef GLvoid (*tessfuncptr_t)(...);
diff --git a/debian/patches/75-hardening-flag.patch b/debian/patches/75-hardening-flag.patch
index 13700db..b62d7fe 100644
--- a/debian/patches/75-hardening-flag.patch
+++ b/debian/patches/75-hardening-flag.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -6421,7 +6421,7 @@
+@@ -6435,7 +6435,7 @@
      fi
  
      sed -e "s|@useconfig@|TRUE|"                       \
diff --git a/debian/patches/76-hurd-i386.patch b/debian/patches/76-hurd-i386.patch
index dca7729..4cd6910 100644
--- a/debian/patches/76-hurd-i386.patch
+++ b/debian/patches/76-hurd-i386.patch
@@ -8,7 +8,7 @@
          linux:ia64:*)          arch=linuxia64gcc    ;;
          linux:x86_64:*)        arch=linuxx8664gcc   ;;
          linux:alpha:*)         arch=linuxalphagcc   ;;
-@@ -1819,7 +1820,7 @@
+@@ -1820,7 +1821,7 @@
     fi
  fi
  
@@ -17,7 +17,7 @@
      linuxdist=
      if `$cwhich lsb_release > /dev/null 2>&1` ; then
         if lsb_release -d | grep -i 'ubuntu' > /dev/null 2>& 1; then
-@@ -3940,7 +3941,7 @@
+@@ -3948,7 +3949,7 @@
  #
  bonjourcppflags=
  case $platform in
@@ -26,7 +26,7 @@
          ;;
      *)
          if test "x$enable_bonjour" = "xyes" ; then
-@@ -5970,7 +5971,7 @@
+@@ -5984,7 +5985,7 @@
  message "Checking whether to build libMemStat"
  if test "x$enable_memstat" = "xyes" || test ! "x$MEMSTAT" = "x"; then
      case $arch in
@@ -48,7 +48,7 @@
  #      define G__NONSCALARFPOS2
 --- a/core/base/inc/RConfig.h
 +++ b/core/base/inc/RConfig.h
-@@ -322,6 +322,7 @@
+@@ -327,6 +327,7 @@
  #   define R__UNIX
  #   define R__BYTESWAP
  #   define R__GLIBC     /* GNU/Hurd always use GLIBC 2.x :-) */
@@ -69,7 +69,7 @@
      typedef GLvoid (CALLBACK *tessfuncptr_t)();
 --- a/graf3d/gl/src/TGLPadUtils.cxx
 +++ b/graf3d/gl/src/TGLPadUtils.cxx
-@@ -542,7 +542,7 @@
+@@ -556,7 +556,7 @@
  extern "C" {
  #if defined(__APPLE_CC__) && __APPLE_CC__ > 4000 && __APPLE_CC__ < 5450 && !defined(__INTEL_COMPILER)
      typedef GLvoid (*tess_t)(...);
@@ -80,7 +80,7 @@
      typedef GLvoid (CALLBACK *tess_t)( );
 --- a/graf3d/gl/src/TGLUtil.cxx
 +++ b/graf3d/gl/src/TGLUtil.cxx
-@@ -1418,7 +1418,7 @@
+@@ -1423,7 +1423,7 @@
  {
  #if defined(__APPLE_CC__) && __APPLE_CC__ > 4000 && __APPLE_CC__ < 5450 && !defined(__INTEL_COMPILER)
      typedef GLvoid (*tessfuncptr_t)(...);

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

More information about the debian-science-commits mailing list