[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.02-60-gbe66d72
Lifeng Sun
lifongsun at gmail.com
Sun Oct 28 03:11:05 UTC 2012
The following commit has been merged in the master branch:
commit be66d72c3c8c309f2aa909db7f138ed9d0aa7a35
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Sun Oct 28 08:14:56 2012 +0800
Revise patchset.
diff --git a/debian/changelog b/debian/changelog
index 2a96080..54c29cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+root-system (5.34.03-1~exp1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Lifeng Sun <lifongsun at gmail.com> Sun, 28 Oct 2012 08:14:29 +0800
+
root-system (5.34.02-1~exp2) experimental; urgency=low
* libroot-proof-dev: breaks libroot-proof-proofplayer-dev
diff --git a/debian/control b/debian/control
index 3af6b97..070b437 100644
--- a/debian/control
+++ b/debian/control
@@ -1422,7 +1422,7 @@ Architecture: any
Section: libdevel
Depends: libroot-proof5.34 (= ${binary:Version}), libroot-math-mathcore-dev, libroot-tree-dev, ${misc:Depends}
Replaces: root-plugin-proof
-Breaks: root-plugin-proof (<< 5.19.01-1), libroot-proof-proofplayer-dev (<= 5.34.00-1)
+Breaks: root-plugin-proof (<< 5.19.01-1), libroot-proof-proofplayer-dev (<= 5.34.01-1~exp1)
Description: PROOF library for ROOT - development files
The ROOT system provides a set of OO frameworks with all the
functionality needed to handle and analyze large amounts of data
diff --git a/debian/patches/19-remove-embedded-library-gl2ps.patch b/debian/patches/19-remove-embedded-library-gl2ps.patch
index eeddc89..83f9b3c 100644
--- a/debian/patches/19-remove-embedded-library-gl2ps.patch
+++ b/debian/patches/19-remove-embedded-library-gl2ps.patch
@@ -1,6 +1,6 @@
--- a/graf3d/gl/Module.mk
+++ b/graf3d/gl/Module.mk
-@@ -28,7 +28,7 @@
+@@ -33,7 +33,7 @@
endif
# Excluded from rootcint
@@ -9,7 +9,7 @@
$(MODDIRI)/TGLIncludes.h $(MODDIRI)/TGLWSIncludes.h \
$(MODDIRI)/TGLContextPrivate.h $(MODDIRI)/TGLMarchingCubes.h \
$(MODDIRI)/TKDEAdapter.h $(MODDIRI)/TGL5DPainter.h \
-@@ -70,7 +70,7 @@
+@@ -78,7 +78,7 @@
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
"$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) \
diff --git a/debian/patches/22-fix-typo-succes-success.patch b/debian/patches/22-fix-typo-succes-success.patch
index ada0ae0..b510bfc 100644
--- a/debian/patches/22-fix-typo-succes-success.patch
+++ b/debian/patches/22-fix-typo-succes-success.patch
@@ -11,7 +11,7 @@
const TObjArray *sharedLibL = sharedLibLStr.Tokenize(" ");
--- a/core/unix/src/TUnixSystem.cxx
+++ b/core/unix/src/TUnixSystem.cxx
-@@ -1613,7 +1613,7 @@
+@@ -1615,7 +1615,7 @@
//______________________________________________________________________________
int TUnixSystem::Symlink(const char *from, const char *to)
{
@@ -20,7 +20,7 @@
// -1 in case of failure.
#if defined(R__AIX)
-@@ -1626,7 +1626,7 @@
+@@ -1628,7 +1628,7 @@
//______________________________________________________________________________
int TUnixSystem::Unlink(const char *name)
{
@@ -31,7 +31,7 @@
TSystem *helper = FindHelper(name);
--- a/core/winnt/src/TWinNTSystem.cxx
+++ b/core/winnt/src/TWinNTSystem.cxx
-@@ -2724,7 +2724,7 @@
+@@ -2723,7 +2723,7 @@
//______________________________________________________________________________
int TWinNTSystem::Symlink(const char *from, const char *to)
{
diff --git a/debian/patches/23-fix-typo-preceed-preced.patch b/debian/patches/23-fix-typo-preceed-preced.patch
index 33f96b0..7697c44 100644
--- a/debian/patches/23-fix-typo-preceed-preced.patch
+++ b/debian/patches/23-fix-typo-preceed-preced.patch
@@ -210,7 +210,7 @@
RooAbsPdf* newOne = proto->pdf(lastPdf.c_str());
--- a/roofit/histfactory/src/HistoToWorkspaceFactoryFast.cxx
+++ b/roofit/histfactory/src/HistoToWorkspaceFactoryFast.cxx
-@@ -739,11 +739,11 @@
+@@ -827,11 +827,11 @@
string pdfName(pdfNameChar);
map<string,string>::iterator it;
string edit="EDIT::customized("+pdfName+",";
@@ -225,7 +225,7 @@
}
edit+=")";
cout << edit<< endl;
-@@ -768,7 +768,7 @@
+@@ -856,7 +856,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;
-@@ -823,10 +823,10 @@
+@@ -911,10 +911,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()) )
-@@ -840,7 +840,7 @@
+@@ -928,7 +928,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());
-@@ -875,10 +875,10 @@
+@@ -963,10 +963,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;
-@@ -890,7 +890,7 @@
+@@ -978,7 +978,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());
-@@ -942,10 +942,10 @@
+@@ -1030,10 +1030,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;
-@@ -957,7 +957,7 @@
+@@ -1045,7 +1045,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());
-@@ -986,15 +986,15 @@
+@@ -1074,15 +1074,15 @@
// replace constraints
cout << "alpha_"+it->first+"Constraint=one" << endl;
@@ -324,15 +324,15 @@
RooAbsPdf* newOne = proto->pdf(lastPdf.c_str());
--- a/roofit/roofitcore/src/RooStreamParser.cxx
+++ b/roofit/roofitcore/src/RooStreamParser.cxx
-@@ -206,7 +206,7 @@
+@@ -222,7 +222,7 @@
}
if (!quotedString) {
- // Decide if next char is punctuation (exempt - and . that are part of floating point numbers, or +/- preceeding INF)
+ // Decide if next char is punctuation (exempt - and . that are part of floating point numbers, or +/- preceding INF)
if (isPunctChar(c) && !(c=='.' && (isdigit(cnext)||isdigit(cprev)))
- && !((c=='-'||c=='+') && (isdigit(cnext)||cnext=='.'||cnext=='i'||cnext=='I'))) {
- if (first) {
+ && (!first || !((c=='-'||c=='+') && (isdigit(cnext)||cnext=='.'||haveINF)))) {
+
--- a/tutorials/graphs/timeonaxis.C
+++ b/tutorials/graphs/timeonaxis.C
@@ -12,7 +12,7 @@
diff --git a/debian/patches/24-fix-typo-informations-information.patch b/debian/patches/24-fix-typo-informations-information.patch
index 45c79b2..f80aa51 100644
--- a/debian/patches/24-fix-typo-informations-information.patch
+++ b/debian/patches/24-fix-typo-informations-information.patch
@@ -33,7 +33,7 @@
return fMangledName;
--- a/core/winnt/src/TWinNTSystem.cxx
+++ b/core/winnt/src/TWinNTSystem.cxx
-@@ -3046,7 +3046,7 @@
+@@ -3045,7 +3045,7 @@
//______________________________________________________________________________
Bool_t TWinNTSystem::InitUsersGroups()
{
diff --git a/debian/patches/25-fix-typo-childs-children.patch b/debian/patches/25-fix-typo-childs-children.patch
index f54f64a..54ac2fe 100644
--- a/debian/patches/25-fix-typo-childs-children.patch
+++ b/debian/patches/25-fix-typo-childs-children.patch
@@ -161,7 +161,7 @@
def start_element(name, attrs):
--- a/core/unix/src/TUnixSystem.cxx
+++ b/core/unix/src/TUnixSystem.cxx
-@@ -1266,7 +1266,7 @@
+@@ -1267,7 +1267,7 @@
//______________________________________________________________________________
void TUnixSystem::CheckChilds()
{
@@ -189,7 +189,7 @@
--- a/gui/gui/src/TGMenu.cxx
+++ b/gui/gui/src/TGMenu.cxx
-@@ -1273,7 +1273,7 @@
+@@ -1279,7 +1279,7 @@
if (fDelay) fDelay->Remove();
diff --git a/debian/patches/40-fix-typo-lenght-length.patch b/debian/patches/40-fix-typo-lenght-length.patch
index 91c3795..319bc8f 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
-@@ -1623,7 +1623,7 @@
+@@ -1631,7 +1631,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
-@@ -3291,7 +3291,7 @@
+@@ -3293,7 +3293,7 @@
//______________________________________________________________________________
int TUnixSystem::RecvBuf(int sock, void *buf, int length)
{
@@ -22,7 +22,7 @@
--- a/core/winnt/src/TWinNTSystem.cxx
+++ b/core/winnt/src/TWinNTSystem.cxx
-@@ -4721,7 +4721,7 @@
+@@ -4720,7 +4720,7 @@
//______________________________________________________________________________
int TWinNTSystem::RecvBuf(int sock, void *buf, int length)
{
@@ -31,7 +31,7 @@
// the buffer. Returns the number of bytes received in buf or -1 in
// case of error.
-@@ -4770,7 +4770,7 @@
+@@ -4769,7 +4769,7 @@
{
// Receive exactly length bytes into buffer. Use opt to receive out-of-band
// data or to have a peek at what is in the buffer (see TSocket). Buffer
diff --git a/debian/patches/46-fix-typo-explicitely-explicitly.patch b/debian/patches/46-fix-typo-explicitely-explicitly.patch
index a5b92bd..5d94b8b 100644
--- a/debian/patches/46-fix-typo-explicitely-explicitly.patch
+++ b/debian/patches/46-fix-typo-explicitely-explicitly.patch
@@ -429,7 +429,7 @@
this, fXrdProofdVersion);
--- a/roofit/roostats/src/ToyMCImportanceSampler.cxx
+++ b/roofit/roostats/src/ToyMCImportanceSampler.cxx
-@@ -248,7 +248,7 @@
+@@ -244,7 +244,7 @@
}
if( fNullDensities.size() == 0 ) {
diff --git a/debian/patches/51-fix-typo-commited-committed.patch b/debian/patches/51-fix-typo-commited-committed.patch
index 502f162..ec9528e 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
-@@ -1005,7 +1005,7 @@
+@@ -1006,7 +1006,7 @@
}
delete iter ;
diff --git a/debian/patches/56-fix-typo-appropiate-appropriate.patch b/debian/patches/56-fix-typo-appropiate-appropriate.patch
index 4304888..9f60210 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
-@@ -1709,7 +1709,7 @@
+@@ -1710,7 +1710,7 @@
}
@@ -111,7 +111,7 @@
RooDataSet* data ;
if (protoData) {
data = generate(whatVars,*protoData,nEvents,verbose,randProto,resampleProto) ;
-@@ -2130,7 +2130,7 @@
+@@ -2131,7 +2131,7 @@
<< GetName() << "::expectedEvents() = " << expectedEvents(&whatVars)<< endl ;
}
diff --git a/debian/patches/61-fix-typo-paramater-parameter.patch b/debian/patches/61-fix-typo-paramater-parameter.patch
index 7608124..be77a21 100644
--- a/debian/patches/61-fix-typo-paramater-parameter.patch
+++ b/debian/patches/61-fix-typo-paramater-parameter.patch
@@ -178,7 +178,7 @@
}
--- a/roofit/roofitcore/src/RooAbsData.cxx
+++ b/roofit/roofitcore/src/RooAbsData.cxx
-@@ -140,7 +140,7 @@
+@@ -141,7 +141,7 @@
}
delete iter ;
@@ -187,7 +187,7 @@
iter = _vars.createIterator() ;
while((0 != (var= (RooAbsArg*)iter->Next()))) {
var->attachDataSet(*this) ;
-@@ -165,7 +165,7 @@
+@@ -166,7 +166,7 @@
claimVars(this) ;
_vars.addClone(other._vars) ;
diff --git a/debian/patches/74-kfreebsd.patch b/debian/patches/74-kfreebsd.patch
index 507e534..e2e1884 100644
--- a/debian/patches/74-kfreebsd.patch
+++ b/debian/patches/74-kfreebsd.patch
@@ -316,7 +316,7 @@
typedef GLvoid (CALLBACK *tess_t)( );
--- a/graf3d/gl/src/TGLUtil.cxx
+++ b/graf3d/gl/src/TGLUtil.cxx
-@@ -1396,7 +1396,7 @@
+@@ -1418,7 +1418,7 @@
{
#if defined(__APPLE_CC__) && __APPLE_CC__ > 4000 && __APPLE_CC__ < 5450 && !defined(__INTEL_COMPILER)
typedef GLvoid (*tessfuncptr_t)(...);
diff --git a/debian/patches/76-hurd-i386.patch b/debian/patches/76-hurd-i386.patch
index c79a333..dca7729 100644
--- a/debian/patches/76-hurd-i386.patch
+++ b/debian/patches/76-hurd-i386.patch
@@ -80,7 +80,7 @@
typedef GLvoid (CALLBACK *tess_t)( );
--- a/graf3d/gl/src/TGLUtil.cxx
+++ b/graf3d/gl/src/TGLUtil.cxx
-@@ -1396,7 +1396,7 @@
+@@ -1418,7 +1418,7 @@
{
#if defined(__APPLE_CC__) && __APPLE_CC__ > 4000 && __APPLE_CC__ < 5450 && !defined(__INTEL_COMPILER)
typedef GLvoid (*tessfuncptr_t)(...);
diff --git a/debian/skel/libroot-proof.control b/debian/skel/libroot-proof.control
index 5546a28..bea36d5 100644
--- a/debian/skel/libroot-proof.control
+++ b/debian/skel/libroot-proof.control
@@ -17,7 +17,7 @@ Architecture: any
Section: libdevel
Depends: libroot-proof at libvers@ (= ${binary:Version}), libroot-math-mathcore-dev, libroot-tree-dev, ${misc:Depends}
Replaces: root-plugin-proof
-Breaks: root-plugin-proof (<< 5.19.01-1), libroot-proof-proofplayer-dev (<= 5.34.00-1)
+Breaks: root-plugin-proof (<< 5.19.01-1), libroot-proof-proofplayer-dev (<= 5.34.01-1~exp1)
Description: PROOF library for ROOT - development files
The ROOT system provides a set of OO frameworks with all the
functionality needed to handle and analyze large amounts of data
--
root-system: CERN's ROOT Data Analysis Framework
More information about the debian-science-commits
mailing list