[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00-50-g3b30c12
Lifeng Sun
lifongsun at gmail.com
Sat Jul 14 15:00:24 UTC 2012
The following commit has been merged in the master branch:
commit 3c8baa4d593f5fb76f6becb429e9105e0a0eac40
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Fri Jun 29 19:08:09 2012 +0800
Revise patchset.
diff --git a/debian/patches/46-fix-typo-explicitely-explicitly.patch b/debian/patches/46-fix-typo-explicitely-explicitly.patch
index ac28477..fae692a 100644
--- a/debian/patches/46-fix-typo-explicitely-explicitly.patch
+++ b/debian/patches/46-fix-typo-explicitely-explicitly.patch
@@ -383,3 +383,58 @@
instaciate this class. It is internally used by the TGeoManager.
Each element process has a 'Binding' to ROOT. The 'binding' is specific
+--- a/build/win/w32pragma.h
++++ b/build/win/w32pragma.h
+@@ -65,7 +65,7 @@
+ #define CRTAPI1 _cdecl
+ #define CRTAPI2 _cdecl
+ #define _X86_ 1
+-// #define _DLL - used to be explicitely defined,
++// #define _DLL - used to be explicitly defined,
+ // but it's implicitely defined via /MD(d)
+ #define G__REDIRECTIO 1
+ #define G__SHAREDLIB 1
+--- a/geom/gdml/src/TGDMLWrite.cxx
++++ b/geom/gdml/src/TGDMLWrite.cxx
+@@ -99,7 +99,7 @@
+ // USAGE: //
+ // gGeoManager->Export("output.gdml"); //
+ // gGeoManager->Export("output.gdml","","vg"); //the same as previous just //
+-// //options are set explicitely //
++// //options are set explicitly //
+ // gGeoManager->Export("output.gdml","","vgf"); //
+ // gGeoManager->Export("output.gdml","","gn"); //
+ // gGeoManager->Export("output.gdml","","f"); //
+--- a/net/net/src/TUDPSocket.cxx
++++ b/net/net/src/TUDPSocket.cxx
+@@ -356,7 +356,7 @@
+ // Close the socket. If option is "force", calls shutdown(id,2) to
+ // shut down the connection. This will close the connection also
+ // for the parent of this process. Also called via the dtor (without
+- // option "force", call explicitely Close("force") if this is desired).
++ // option "force", call explicitly Close("force") if this is desired).
+
+ Bool_t force = option ? (!strcmp(option, "force") ? kTRUE : kFALSE) : kFALSE;
+
+--- a/proof/proofx/src/TXUnixSocket.cxx
++++ b/proof/proofx/src/TXUnixSocket.cxx
+@@ -72,7 +72,7 @@
+ Int_t tryreconnect = gEnv->GetValue("TXSocket.Reconnect", 1);
+ if (tryreconnect == 0 || fXrdProofdVersion < 1005) {
+ if (tryreconnect == 0)
+- Info("Reconnect","%p: reconnection attempts explicitely disabled!", this);
++ Info("Reconnect","%p: reconnection attempts explicitly disabled!", this);
+ else
+ Info("Reconnect","%p: server does not support reconnections (protocol: %d < 1005)",
+ this, fXrdProofdVersion);
+--- a/roofit/roostats/src/ToyMCImportanceSampler.cxx
++++ b/roofit/roostats/src/ToyMCImportanceSampler.cxx
+@@ -248,7 +248,7 @@
+ }
+
+ if( fNullDensities.size() == 0 ) {
+- oocoutE((TObject*)NULL,InputArguments) << "ToyMCImportanceSampler: Need to specify the null density explicitely." << endl;
++ oocoutE((TObject*)NULL,InputArguments) << "ToyMCImportanceSampler: Need to specify the null density explicitly." << endl;
+ return NULL;
+ }
+
diff --git a/debian/patches/59-fix-typo-targetting-targeting.patch b/debian/patches/59-fix-typo-targetting-targeting.patch
new file mode 100644
index 0000000..5dedf48
--- /dev/null
+++ b/debian/patches/59-fix-typo-targetting-targeting.patch
@@ -0,0 +1,11 @@
+--- a/io/io/src/TFileMerger.cxx
++++ b/io/io/src/TFileMerger.cxx
+@@ -905,7 +905,7 @@
+ // Intercept the case where the output TFile is deleted!
+
+ if (obj == fOutputFile) {
+- Fatal("RecursiveRemove","Output file of the TFile Merger (targetting %s) has been deleted (likely due to a TTree larger than 100Gb)", fOutputFilename.Data());
++ Fatal("RecursiveRemove","Output file of the TFile Merger (targeting %s) has been deleted (likely due to a TTree larger than 100Gb)", fOutputFilename.Data());
+ }
+
+ }
diff --git a/debian/patches/60-fix-typo-Suppported-Supported.patch b/debian/patches/60-fix-typo-Suppported-Supported.patch
new file mode 100644
index 0000000..2fb2ce6
--- /dev/null
+++ b/debian/patches/60-fix-typo-Suppported-Supported.patch
@@ -0,0 +1,47 @@
+--- a/core/base/src/TString.cxx
++++ b/core/base/src/TString.cxx
+@@ -1939,7 +1939,7 @@
+ // string contains other characters.
+
+ if (base < 2 || base > 36) {
+- Error("TString::IsInBaseN", "base %d is not supported. Suppported bases are {2,3,...,36}.", base);
++ Error("TString::IsInBaseN", "base %d is not supported. Supported bases are {2,3,...,36}.", base);
+ return kFALSE;
+ }
+ if (Length() == 0) {
+@@ -2072,7 +2072,7 @@
+ std::string buf;
+ // check that the base if valid
+ if (base < 2 || base > 36) {
+- Error("TString::Itoa", "base %d is not supported. Suppported bases are {2,3,...,36}.",base) ;
++ Error("TString::Itoa", "base %d is not supported. Supported bases are {2,3,...,36}.",base) ;
+ return (TString("!"));
+ }
+ buf.reserve(35); // Pre-allocate enough space (35=kMaxDigits)
+@@ -2099,7 +2099,7 @@
+ std::string buf;
+ // check that the base if valid
+ if (base < 2 || base > 36) {
+- Error("TString::UItoa", "base %d is not supported. Suppported bases are {2,3,...,36}.",base);
++ Error("TString::UItoa", "base %d is not supported. Supported bases are {2,3,...,36}.",base);
+ return (TString("!"));
+ }
+ buf.reserve(35); // Pre-allocate enough space (35=kMaxDigits)
+@@ -2124,7 +2124,7 @@
+ std::string buf;
+ // check that the base if valid
+ if (base < 2 || base > 36) {
+- Error("TString::LLtoa", "base %d is not supported. Suppported bases are {2,3,...,36}.",base);
++ Error("TString::LLtoa", "base %d is not supported. Supported bases are {2,3,...,36}.",base);
+ return (TString("!"));
+ }
+ buf.reserve(35); // Pre-allocate enough space (35=kMaxDigits)
+@@ -2151,7 +2151,7 @@
+ std::string buf;
+ // check that the base if valid
+ if (base < 2 || base > 36) {
+- Error("TString::ULLtoa", "base %d is not supported. Suppported bases are {2,3,...,36}.",base);
++ Error("TString::ULLtoa", "base %d is not supported. Supported bases are {2,3,...,36}.",base);
+ return (TString("!"));
+ }
+ buf.reserve(35); // Pre-allocate enough space (35=kMaxDigits)
diff --git a/debian/patches/61-fix-typo-paramater-parameter.patch b/debian/patches/61-fix-typo-paramater-parameter.patch
new file mode 100644
index 0000000..e372194
--- /dev/null
+++ b/debian/patches/61-fix-typo-paramater-parameter.patch
@@ -0,0 +1,569 @@
+--- a/cint/cint/src/ifunc.cxx
++++ b/cint/cint/src/ifunc.cxx
+@@ -1041,7 +1041,7 @@
+ * If ANSI style header, rewind file position to
+ * func(int a ,double b ) ANSI
+ * ^
+- * and check type of paramaters and store it into G__ifunc
++ * and check type of parameters and store it into G__ifunc
+ ****************************************************************/
+ if (G__p_ifunc->ansi[func_now]) {
+ // -- ANSI style function header
+@@ -6562,7 +6562,7 @@
+ }
+ }
+ else {
+- // -- We do not have an argument for the paramater.
++ // -- We do not have an argument for the parameter.
+ if ((ipara < p_ifunc->para_nu[ifn]) && p_ifunc->param[ifn][ipara]->pdefault) {
+ // -- We have a default value for the parameter, use it.
+ if (p_ifunc->param[ifn][ipara]->pdefault->type == G__DEFAULT_FUNCCALL) {
+--- a/cint/cint/src/newlink.cxx
++++ b/cint/cint/src/newlink.cxx
+@@ -2063,7 +2063,7 @@
+
+ // 27-04-07
+ // The actual version of Cint has a limitation with
+- // the array constructor: it cant receive paramaters (or at least,
++ // the array constructor: it cant receive parameters (or at least,
+ // it ignores them). Here I will try to pass the parameters of
+ // the constructors for every object (to handle something like
+ // string *str = new string[10]("strriiiinnnggg") ).
+--- a/core/zip/inc/zlib.h
++++ b/core/zip/inc/zlib.h
+@@ -962,7 +962,7 @@
+ See inflateBack() for the usage of these routines.
+
+ inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
+- the paramaters are invalid, Z_MEM_ERROR if the internal state could not be
++ the parameters are invalid, Z_MEM_ERROR if the internal state could not be
+ allocated, or Z_VERSION_ERROR if the version of the library does not match
+ the version of the header file.
+ */
+--- a/graf2d/asimage/src/libAfterImage/zlib/zlib.h
++++ b/graf2d/asimage/src/libAfterImage/zlib/zlib.h
+@@ -869,7 +869,7 @@
+ See inflateBack() for the usage of these routines.
+
+ inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
+- the paramaters are invalid, Z_MEM_ERROR if the internal state could not
++ the parameters are invalid, Z_MEM_ERROR if the internal state could not
+ be allocated, or Z_VERSION_ERROR if the version of the library does not
+ match the version of the header file.
+ */
+--- a/graf2d/qt/src/TQtApplication.cxx
++++ b/graf2d/qt/src/TQtApplication.cxx
+@@ -83,7 +83,7 @@
+ << "ATTENTION !!! "
+ << "The env variable \"QT_FATAL_WARNIGNS\" was defined. The special debug option has been turned on."
+ << " argc = " << argc << " argv = " << argv[0] << argv[1];
+- qDebug() << " You may want to restart ROOT with " << argC << " paramaters :"
++ qDebug() << " You may want to restart ROOT with " << argC << " parameters :"
+ << " like this: \"" << argV[0] << " " << argV[1];
+ // new QApplication(argC,argV,GUIenabled);
+ new QApplication(argc,argv,GUIenabled);
+--- a/math/minuit2/src/MnMinos.cxx
++++ b/math/minuit2/src/MnMinos.cxx
+@@ -142,7 +142,7 @@
+ unsigned int ind = upar.IntOfExt(par);
+ // get error matrix (methods return a copy)
+ MnAlgebraicSymMatrix m = fMinimum.Error().Matrix();
+- // get internal paramaters
++ // get internal parameters
+ const MnAlgebraicVector & xt = fMinimum.Parameters().Vec();
+ //LM: change to use err**2 (m(i,i) instead of err as in F77 version
+ double xunit = sqrt(up/m(ind,ind));
+@@ -236,7 +236,7 @@
+ // unsigned int ind = upar.IntOfExt(par);
+ // MnAlgebraicSymMatrix m = fMinimum.Error().Matrix();
+ // double xunit = sqrt(up/m(ind,ind));
+-// // get internal paramaters
++// // get internal parameters
+ // const MnAlgebraicVector & xt = fMinimum.Parameters().Vec();
+
+ // for(unsigned int i = 0; i < m.Nrow(); i++) {
+--- a/roofit/doc/v520/index.html
++++ b/roofit/doc/v520/index.html
+@@ -198,7 +198,7 @@
+ p.d.f fbar(x) is then calculated as fbar(alpha*x1+(1-alpha)*x2) = f1(x1)*f2(x2) / ( alpha*f2(x2) +
+ (1-alpha)*f1(x1) ). Given that it is not easily possible to calculate the value of RooLinearMorph
+ at a given value of x, the value for all values of x are calculated in one by (through a scan over y)
+- and stored in a cache. NB: The range of the interpolation paramater does not need to be [0,1], it can
++ and stored in a cache. NB: The range of the interpolation parameter does not need to be [0,1], it can
+ be anything.
+
+
+--- a/roofit/doc/v532/index.html
++++ b/roofit/doc/v532/index.html
+@@ -26,7 +26,7 @@
+ </p></li>
+ <li><p>New algorithmic optimization in the caching of pdfs. So far - in the likelihood - two classes of
+ objects are identified: those that change with every event (i.e. the pdf) and those that change
+- only with the paramaters (typically pdf normalization integrals). Pdfs are always recalculated
++ only with the parameters (typically pdf normalization integrals). Pdfs are always recalculated
+ for every event, whereas integrals are only evaluated when needed. The exception to the first type are pdfs
+ that only depend on constant parameters (or no parameters) - these are identified at the beginning, and precalculated once
+ to avoid recalculating an expression with the same outcome for every iteration of the likelihood calculation
+@@ -38,7 +38,7 @@
+ likelihood evaluation if selected columns need to be updated because parameters have changed. The speed gain
+ of this optimization depends much on the structure of the pdf: in models with many free parameters most of the
+ likelihood evaluations are executed when MINUIT calculates numerical likelihood derivatives which vary
+- one paramater at a time and the speedup is potentially larger. In models with few free parameters the
++ one parameter at a time and the speedup is potentially larger. In models with few free parameters the
+ effect will be smaller.
+ </p><p>
+ The new per-component caching strategy is enabled by default for all pdfs that are a component of
+--- a/roofit/histfactory/src/ParamHistFunc.cxx
++++ b/roofit/histfactory/src/ParamHistFunc.cxx
+@@ -55,7 +55,7 @@
+ const RooArgList& vars, const RooArgList& paramSet) :
+ RooAbsReal(name, title),
+ _dataVars("!dataVars","data Vars", this),
+- _paramSet("!paramSet","bin paramaters", this),
++ _paramSet("!paramSet","bin parameters", this),
+ _numBins(0),
+ _dataSet( (string(name)+"_dataSet").c_str(), "", vars)
+ {
+@@ -79,13 +79,13 @@
+ // Set the binning
+ // //_binning = var.getBinning().clone() ;
+
+- // Create the set of paramaters
++ // Create the set of parameters
+ // controlling the height of each bin
+
+ // Get the number of bins
+ _numBins = GetNumBins( vars );
+
+- // Add the paramaters (with checking)
++ // Add the parameters (with checking)
+ addVarSet( vars );
+ addParamSet( paramSet );
+
+@@ -100,7 +100,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)
+ {
+@@ -120,7 +120,7 @@
+ // Get the number of bins
+ _numBins = GetNumBins( vars );
+
+- // Add the paramaters (with checking)
++ // Add the parameters (with checking)
+ addVarSet( vars );
+ addParamSet( paramSet );
+
+@@ -654,7 +654,7 @@
+
+ if( numVarBins != numElements ) {
+ std::cout << "ParamHistFunc::addParamSet - ERROR - "
+- << "Supplied list of paramaters " << params.GetName()
++ << "Supplied list of parameters " << params.GetName()
+ << " has " << numElements << " elements but the ParamHistFunc"
+ << GetName() << " has " << numVarBins << " bins."
+ << std::endl;
+@@ -672,7 +672,7 @@
+ while((comp = (RooAbsArg*) paramIter.next())) {
+ if (!dynamic_cast<RooRealVar*>(comp)) {
+ coutE(InputArguments) << "ParamHistFunc::(" << GetName() << ") ERROR: component " << comp->GetName()
+- << " in paramater list is not of type RooRealVar" << std::endl ;
++ << " in parameter list is not of type RooRealVar" << std::endl ;
+ RooErrorHandler::softAbort() ;
+ return 1;
+ }
+--- a/roofit/roofitcore/src/RooAbsData.cxx
++++ b/roofit/roofitcore/src/RooAbsData.cxx
+@@ -138,7 +138,7 @@
+ }
+ delete iter ;
+
+- // reconnect any paramaterized ranges to internal dataset observables
++ // reconnect any parameterized ranges to internal dataset observables
+ iter = _vars.createIterator() ;
+ while((0 != (var= (RooAbsArg*)iter->Next()))) {
+ var->attachDataSet(*this) ;
+@@ -163,7 +163,7 @@
+ claimVars(this) ;
+ _vars.addClone(other._vars) ;
+
+- // reconnect any paramaterized ranges to internal dataset observables
++ // reconnect any parameterized ranges to internal dataset observables
+ TIterator* iter = _vars.createIterator() ;
+ RooAbsArg* var ;
+ while((0 != (var= (RooAbsArg*)iter->Next()))) {
+--- a/roofit/roofitcore/src/RooFitResult.cxx
++++ b/roofit/roofitcore/src/RooFitResult.cxx
+@@ -806,7 +806,7 @@
+ }
+ }
+
+- // Only examine correlations for cases with >1 floating paramater
++ // Only examine correlations for cases with >1 floating parameter
+ if (_finalPars->getSize()>1) {
+
+ fillLegacyCorrMatrix() ;
+--- a/roofit/roofitcore/src/RooMCStudy.cxx
++++ b/roofit/roofitcore/src/RooMCStudy.cxx
+@@ -202,7 +202,7 @@
+
+ _perExptGenParams = kTRUE ;
+
+- coutI(Generation) << "RooMCStudy::RooMCStudy: INFO have pdf with constraints, will generate paramaters from constraint pdf for each experiment" << endl ;
++ coutI(Generation) << "RooMCStudy::RooMCStudy: INFO have pdf with constraints, will generate parameters from constraint pdf for each experiment" << endl ;
+
+
+ } else {
+--- a/roofit/roofitcore/src/RooMinimizer.cxx
++++ b/roofit/roofitcore/src/RooMinimizer.cxx
+@@ -587,7 +587,7 @@
+ title = userTitle ? userTitle : Form("%s", _func->GetTitle()) ;
+ RooFitResult* fitRes = new RooFitResult(name,title) ;
+
+- // Move eventual fixed paramaters in floatList to constList
++ // Move eventual fixed parameters in floatList to constList
+ Int_t i ;
+ RooArgList saveConstList(*(_fcn->GetConstParamList())) ;
+ RooArgList saveFloatInitList(*(_fcn->GetInitFloatParamList())) ;
+--- a/roofit/roofitcore/src/RooMinuit.cxx
++++ b/roofit/roofitcore/src/RooMinuit.cxx
+@@ -872,7 +872,7 @@
+
+ RooFitResult* fitRes = new RooFitResult(name,title) ;
+
+- // Move eventual fixed paramaters in floatList to constList
++ // Move eventual fixed parameters in floatList to constList
+ Int_t i ;
+ RooArgList saveConstList(*_constParamList) ;
+ RooArgList saveFloatInitList(*_initFloatParamList) ;
+--- a/roofit/roofitcore/test/rf201_composite.cxx
++++ b/roofit/roofitcore/test/rf201_composite.cxx
+@@ -36,7 +36,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+--- a/roofit/roofitcore/test/rf202_extendedmlfit.cxx
++++ b/roofit/roofitcore/test/rf202_extendedmlfit.cxx
+@@ -36,7 +36,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+--- a/roofit/roofitcore/test/rf204_extrangefit.cxx
++++ b/roofit/roofitcore/test/rf204_extrangefit.cxx
+@@ -38,7 +38,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+--- a/roofit/roofitcore/test/rf205_compplot.cxx
++++ b/roofit/roofitcore/test/rf205_compplot.cxx
+@@ -36,7 +36,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+--- a/roofit/roofitcore/test/rf602_chi2fit.cxx
++++ b/roofit/roofitcore/test/rf602_chi2fit.cxx
+@@ -37,7 +37,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+--- a/roofit/roofitcore/test/rf607_fitresult.cxx
++++ b/roofit/roofitcore/test/rf607_fitresult.cxx
+@@ -40,7 +40,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5,-10,10) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5,0.1,10) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1,0.1,10) ;
+--- a/roofit/roofitcore/test/rf801_mcstudy.cxx
++++ b/roofit/roofitcore/test/rf801_mcstudy.cxx
+@@ -41,7 +41,7 @@
+ RooRealVar x("x","x",0,10) ;
+ x.setBins(40) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5,0,10) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+--- a/test/histviewer/histaction.cxx
++++ b/test/histviewer/histaction.cxx
+@@ -1007,7 +1007,7 @@
+ // Does not redraw the button.
+ // So to visually change the color needs to be followed by
+ // the function NeedRedraw(TGWindow *).
+- // Input paramater - ID of the button to which the action must be applied.
++ // Input parameter - ID of the button to which the action must be applied.
+ //
+ //------------------------------------------------------------------
+
+--- a/test/stressRooFit_tests.cxx
++++ b/test/stressRooFit_tests.cxx
+@@ -928,7 +928,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+@@ -1055,7 +1055,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+@@ -1263,7 +1263,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+@@ -1356,7 +1356,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+@@ -4404,7 +4404,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+@@ -4809,7 +4809,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5,-10,10) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5,0.1,10) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1,0.1,10) ;
+@@ -6027,7 +6027,7 @@
+ RooRealVar x("x","x",0,10) ;
+ x.setBins(40) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5,0,10) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+--- a/tmva/src/MethodFDA.cxx
++++ b/tmva/src/MethodFDA.cxx
+@@ -327,7 +327,7 @@
+ {
+ // delete and clear all class members
+
+- // if there is more than one output dimension, the paramater ranges are the same again (object has been copied).
++ // if there is more than one output dimension, the parameter ranges are the same again (object has been copied).
+ // hence, ... erase the copied pointers to assure, that they are deleted only once.
+ // fParRange.erase( fParRange.begin()+(fNPars), fParRange.end() );
+ for (UInt_t ipar=0; ipar<fParRange.size() && ipar<fNPars; ipar++) {
+--- a/tutorials/roofit/rf201_composite.C
++++ b/tutorials/roofit/rf201_composite.C
+@@ -33,7 +33,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+--- a/tutorials/roofit/rf202_extendedmlfit.C
++++ b/tutorials/roofit/rf202_extendedmlfit.C
+@@ -34,7 +34,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+--- a/tutorials/roofit/rf204_extrangefit.C
++++ b/tutorials/roofit/rf204_extrangefit.C
+@@ -37,7 +37,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+--- a/tutorials/roofit/rf205_compplot.C
++++ b/tutorials/roofit/rf205_compplot.C
+@@ -33,7 +33,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+--- a/tutorials/roofit/rf206_treevistools.C
++++ b/tutorials/roofit/rf206_treevistools.C
+@@ -33,7 +33,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+--- a/tutorials/roofit/rf207_comptools.C
++++ b/tutorials/roofit/rf207_comptools.C
+@@ -36,7 +36,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5) ;
+ RooRealVar sigma("sigma","width of gaussians",0.5) ;
+ RooGaussian sig("sig","Signal component 1",x,mean,sigma) ;
+--- a/tutorials/roofit/rf407_latextables.C
++++ b/tutorials/roofit/rf407_latextables.C
+@@ -34,7 +34,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+--- a/tutorials/roofit/rf502_wspacewrite.C
++++ b/tutorials/roofit/rf502_wspacewrite.C
+@@ -36,7 +36,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5,0,10) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+--- a/tutorials/roofit/rf509_wsinteractive.C
++++ b/tutorials/roofit/rf509_wsinteractive.C
+@@ -84,7 +84,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5,0,10) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+--- a/tutorials/roofit/rf510_wsnamedsets.C
++++ b/tutorials/roofit/rf510_wsnamedsets.C
+@@ -83,7 +83,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5,0,10) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+--- a/tutorials/roofit/rf601_intminuit.C
++++ b/tutorials/roofit/rf601_intminuit.C
+@@ -64,7 +64,7 @@
+ // Call MIGRAD to minimize the likelihood
+ m.migrad() ;
+
+- // Print values of all paramaters, that reflect values (and error estimates)
++ // Print values of all parameters, that reflect values (and error estimates)
+ // that are back propagated from MINUIT
+ model.getParameters(x)->Print("s") ;
+
+--- a/tutorials/roofit/rf602_chi2fit.C
++++ b/tutorials/roofit/rf602_chi2fit.C
+@@ -36,7 +36,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
+--- a/tutorials/roofit/rf607_fitresult.C
++++ b/tutorials/roofit/rf607_fitresult.C
+@@ -39,7 +39,7 @@
+ // Declare observable x
+ RooRealVar x("x","x",0,10) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5,-10,10) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5,0.1,10) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1,0.1,10) ;
+@@ -79,7 +79,7 @@
+ // Summary printing: Basic info plus final values of floating fit parameters
+ r->Print() ;
+
+- // Verbose printing: Basic info, values of constant paramaters, initial and
++ // Verbose printing: Basic info, values of constant parameters, initial and
+ // final values of floating parameters, global correlations
+ r->Print("v") ;
+
+--- a/tutorials/roofit/rf801_mcstudy.C
++++ b/tutorials/roofit/rf801_mcstudy.C
+@@ -38,7 +38,7 @@
+ RooRealVar x("x","x",0,10) ;
+ x.setBins(40) ;
+
+- // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their paramaters
++ // Create two Gaussian PDFs g1(x,mean1,sigma) anf g2(x,mean2,sigma) and their parameters
+ RooRealVar mean("mean","mean of gaussians",5,0,10) ;
+ RooRealVar sigma1("sigma1","width of gaussians",0.5) ;
+ RooRealVar sigma2("sigma2","width of gaussians",1) ;
diff --git a/debian/patches/74-kfreebsd.patch b/debian/patches/74-kfreebsd.patch
index 9981e7a..57fbccd 100644
--- a/debian/patches/74-kfreebsd.patch
+++ b/debian/patches/74-kfreebsd.patch
@@ -247,7 +247,7 @@
;;
*)
if test "x$enable_bonjour" = "xyes" ; then
-@@ -5930,7 +5932,7 @@
+@@ -5934,7 +5936,7 @@
message "Checking whether to build libMemStat"
if test "x$enable_memstat" = "xyes" || test ! "x$MEMSTAT" = "x"; then
case $arch in
@@ -258,11 +258,12 @@
enable_memstat="no" ;;
--- a/core/base/inc/RConfig.h
+++ b/core/base/inc/RConfig.h
-@@ -350,6 +350,21 @@
+@@ -350,6 +350,22 @@
# define HAS_STRLCPY
#endif
+#if defined(__FreeBSD_kernel__)
++# define R__kFBSD
+# define R__UNIX
+# define R__BYTESWAP
+# if defined(__i386__)
@@ -287,7 +288,7 @@
defined(R__SGI) || defined(R__HIUX) || defined(R__FBSD) || \
defined(R__OBSD) || defined(R__LYNXOS) || defined(R__MACOSX) || \
- defined(R__HURD)
-+ defined(R__HURD) || defined(__FreeBSD_kernel__)
++ defined(R__HURD) || defined(R__kFBSD)
# include <sys/ioctl.h>
#endif
#if defined(R__AIX) || defined(R__SOLARIS)
diff --git a/debian/patches/75-hardening-flag.patch b/debian/patches/75-hardening-flag.patch
index f8bd72d..2bd1dd5 100644
--- a/debian/patches/75-hardening-flag.patch
+++ b/debian/patches/75-hardening-flag.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -6460,7 +6460,7 @@
+@@ -6464,7 +6464,7 @@
fi
sed -e "s|@useconfig@|TRUE|" \
diff --git a/debian/patches/76-hurd-i386.patch b/debian/patches/76-hurd-i386.patch
index 1f55e38..7720b6b 100644
--- a/debian/patches/76-hurd-i386.patch
+++ b/debian/patches/76-hurd-i386.patch
@@ -26,7 +26,7 @@
;;
*)
if test "x$enable_bonjour" = "xyes" ; then
-@@ -5932,7 +5933,7 @@
+@@ -5936,7 +5937,7 @@
message "Checking whether to build libMemStat"
if test "x$enable_memstat" = "xyes" || test ! "x$MEMSTAT" = "x"; then
case $arch in
diff --git a/debian/patches/series b/debian/patches/series
index cb0e8be..ea9e0a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -41,6 +41,9 @@
56-fix-typo-appropiate-appropriate.patch
57-fix-typo-another.patch
58-fix-typo-environement-environment.patch
+59-fix-typo-targetting-targeting.patch
+60-fix-typo-Suppported-Supported.patch
+61-fix-typo-paramater-parameter.patch
64-support-mipsel.patch
67-generate-iosenum.h.patch
69-support-pythia8.patch
--
root-system: CERN's ROOT Data Analysis Framework
More information about the debian-science-commits
mailing list