[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.01-57-gae76c39
Lifeng Sun
lifongsun at gmail.com
Tue Oct 2 04:18:20 UTC 2012
The following commit has been merged in the master branch:
commit ae76c39530c71f1e43fb5bed89fbded0bb9931f7
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Tue Oct 2 11:48:42 2012 +0800
Revise patchset.
diff --git a/debian/changelog b/debian/changelog
index df24863..2ad51e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+root-system (5.34.02-1~exp1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Lifeng Sun <lifongsun at gmail.com> Tue, 02 Oct 2012 11:48:19 +0800
+
root-system (5.34.01-1~exp1) experimental; urgency=low
* New upstream release.
diff --git a/debian/patches/02-build-libroot-misc-memstat-package.patch b/debian/patches/02-build-libroot-misc-memstat-package.patch
index 5239c62..320cf2f 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
-@@ -6068,6 +6068,7 @@
+@@ -6101,6 +6101,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 db3506e..785c702 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
-@@ -6070,6 +6070,7 @@
+@@ -6103,6 +6103,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"
-@@ -6087,7 +6088,6 @@
+@@ -6120,7 +6121,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 a10bbf5..241b777 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
-@@ -6110,6 +6110,7 @@
+@@ -6143,6 +6143,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 682562d..c95f37e 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
-@@ -6128,6 +6128,7 @@
+@@ -6161,6 +6161,7 @@
libroot-net \
libroot-net-auth \
libroot-proof \
@@ -8,7 +8,7 @@
libroot-tmva \
libroot-tree \
libroot-tree-treeplayer \
-@@ -6144,7 +6145,6 @@
+@@ -6177,7 +6178,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 ddb2fc5..fd94342 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
-@@ -6435,7 +6435,7 @@
+@@ -6468,7 +6468,7 @@
sed -e "s|@useconfig@|FALSE|" \
-e "s|@cflags@||" \
@@ -9,7 +9,7 @@
< Makefile.tmp > Makefile.tmpp
mv Makefile.tmpp Makefile.tmp
fi
-@@ -6567,7 +6567,7 @@
+@@ -6600,7 +6600,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 293af40..ada0ae0 100644
--- a/debian/patches/22-fix-typo-succes-success.patch
+++ b/debian/patches/22-fix-typo-succes-success.patch
@@ -1,6 +1,6 @@
--- a/core/meta/src/TCint.cxx
+++ b/core/meta/src/TCint.cxx
-@@ -1776,7 +1776,7 @@
+@@ -1790,7 +1790,7 @@
Int_t TCint::UnloadAllSharedLibraryMaps()
{
// Unload the library map entries coming from all the loaded shared libraries.
@@ -11,7 +11,7 @@
const TObjArray *sharedLibL = sharedLibLStr.Tokenize(" ");
--- a/core/unix/src/TUnixSystem.cxx
+++ b/core/unix/src/TUnixSystem.cxx
-@@ -1612,7 +1612,7 @@
+@@ -1613,7 +1613,7 @@
//______________________________________________________________________________
int TUnixSystem::Symlink(const char *from, const char *to)
{
@@ -20,7 +20,7 @@
// -1 in case of failure.
#if defined(R__AIX)
-@@ -1625,7 +1625,7 @@
+@@ -1626,7 +1626,7 @@
//______________________________________________________________________________
int TUnixSystem::Unlink(const char *name)
{
@@ -175,7 +175,7 @@
if (fFH == 0) {
--- a/io/rfio/src/TRFIOFile.cxx
+++ b/io/rfio/src/TRFIOFile.cxx
-@@ -543,7 +543,7 @@
+@@ -544,7 +544,7 @@
//______________________________________________________________________________
Int_t TRFIOSystem::Unlink(const char *path)
{
@@ -361,7 +361,7 @@
--- a/roofit/roostats/src/LikelihoodInterval.cxx
+++ b/roofit/roostats/src/LikelihoodInterval.cxx
-@@ -192,7 +192,7 @@
+@@ -195,7 +195,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;
-@@ -206,7 +206,7 @@
+@@ -209,7 +209,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
diff --git a/debian/patches/23-fix-typo-preceed-preced.patch b/debian/patches/23-fix-typo-preceed-preced.patch
index 43e7a16..33f96b0 100644
--- a/debian/patches/23-fix-typo-preceed-preced.patch
+++ b/debian/patches/23-fix-typo-preceed-preced.patch
@@ -33,7 +33,7 @@
anyway. Eg if we already have 12 types is T12Pc "(..., type1,
--- a/graf2d/graf/src/TGaxis.cxx
+++ b/graf2d/graf/src/TGaxis.cxx
-@@ -1494,7 +1494,7 @@
+@@ -1491,7 +1491,7 @@
LabelsLimits(label,first,last); //Eliminate blanks
@@ -210,7 +210,7 @@
RooAbsPdf* newOne = proto->pdf(lastPdf.c_str());
--- a/roofit/histfactory/src/HistoToWorkspaceFactoryFast.cxx
+++ b/roofit/histfactory/src/HistoToWorkspaceFactoryFast.cxx
-@@ -737,11 +737,11 @@
+@@ -739,11 +739,11 @@
string pdfName(pdfNameChar);
map<string,string>::iterator it;
string edit="EDIT::customized("+pdfName+",";
@@ -225,7 +225,7 @@
}
edit+=")";
cout << edit<< endl;
-@@ -766,7 +766,7 @@
+@@ -768,7 +768,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;
-@@ -821,10 +821,10 @@
+@@ -823,10 +823,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()) )
-@@ -838,7 +838,7 @@
+@@ -840,7 +840,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());
-@@ -873,10 +873,10 @@
+@@ -875,10 +875,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;
-@@ -888,7 +888,7 @@
+@@ -890,7 +890,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());
-@@ -940,10 +940,10 @@
+@@ -942,10 +942,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;
-@@ -955,7 +955,7 @@
+@@ -957,7 +957,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());
-@@ -984,15 +984,15 @@
+@@ -986,15 +986,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 4bbc4e7..45c79b2 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
-@@ -10902,7 +10902,7 @@
+@@ -11502,7 +11502,7 @@
//______________________________________________________________________________
void TProof::SaveWorkerInfo()
{
@@ -298,7 +298,7 @@
--- a/proof/proofplayer/src/TPacketizerUnit.cxx
+++ b/proof/proofplayer/src/TPacketizerUnit.cxx
-@@ -491,7 +491,7 @@
+@@ -492,7 +492,7 @@
fProcessing = (num < (fTotalEntries - fAssigned)) ? num
: (fTotalEntries - fAssigned);
diff --git a/debian/patches/25-fix-typo-childs-children.patch b/debian/patches/25-fix-typo-childs-children.patch
index dd05ea3..f54f64a 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
-@@ -1265,7 +1265,7 @@
+@@ -1266,7 +1266,7 @@
//______________________________________________________________________________
void TUnixSystem::CheckChilds()
{
diff --git a/debian/patches/26-fix-typo-avaliable-available.patch b/debian/patches/26-fix-typo-avaliable-available.patch
index 528174b..798343a 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
-@@ -1243,7 +1243,7 @@
+@@ -1252,7 +1252,7 @@
echo "Attempts at guessing your architecture failed."
echo "(triplet is $arch:$chip:$rele)"
echo "Please specify the architecture as the first argument."
@@ -53,7 +53,7 @@
--- a/html/src/THtml.cxx
+++ b/html/src/THtml.cxx
-@@ -2396,7 +2396,7 @@
+@@ -2398,7 +2398,7 @@
//______________________________________________________________________________
void THtml::SetFoundDot(Bool_t found) {
diff --git a/debian/patches/30-fix-typo-wierd-weird.patch b/debian/patches/30-fix-typo-wierd-weird.patch
index d3cb66c..6e16ef1 100644
--- a/debian/patches/30-fix-typo-wierd-weird.patch
+++ b/debian/patches/30-fix-typo-wierd-weird.patch
@@ -1,6 +1,6 @@
--- a/graf2d/asimage/src/TASImage.cxx
+++ b/graf2d/asimage/src/TASImage.cxx
-@@ -2619,9 +2619,9 @@
+@@ -2630,9 +2630,9 @@
// dissipate - randomly alpha-blend images
// hue - hue bottom image same as top image
// lighten - use highest color value from both images
diff --git a/debian/patches/33-fix-typo-splitted-split.patch b/debian/patches/33-fix-typo-splitted-split.patch
index cdaf6f9..29e11d0 100644
--- a/debian/patches/33-fix-typo-splitted-split.patch
+++ b/debian/patches/33-fix-typo-splitted-split.patch
@@ -190,7 +190,7 @@
if (desc) {
--- a/test/stressProof.cxx
+++ b/test/stressProof.cxx
-@@ -952,7 +952,7 @@
+@@ -995,7 +995,7 @@
&PT_H1FileCollection, (void *)&gStd_Old, "1", "h1analysis", kTRUE));
// H1 analysis over HTTP by dataset name
testList->Add(new ProofTest("H1: by-name processing", 8, &PT_H1DataSet, 0, "1,4", "h1analysis", kTRUE));
diff --git a/debian/patches/34-fix-typo-registerd-registered.patch b/debian/patches/34-fix-typo-registerd-registered.patch
index 81b991a..e342c7f 100644
--- a/debian/patches/34-fix-typo-registerd-registered.patch
+++ b/debian/patches/34-fix-typo-registerd-registered.patch
@@ -11,7 +11,7 @@
SetPointIntIds(fLastPoint, ids);
--- a/graf3d/eve/src/TEveTrack.cxx
+++ b/graf3d/eve/src/TEveTrack.cxx
-@@ -528,7 +528,7 @@
+@@ -527,7 +527,7 @@
//______________________________________________________________________________
void TEveTrack::SortPathMarksByTime()
{
@@ -44,7 +44,7 @@
haveit = 1;
--- a/roofit/roofit/inc/RooCFunction1Binding.h
+++ b/roofit/roofit/inc/RooCFunction1Binding.h
-@@ -153,7 +153,7 @@
+@@ -147,7 +147,7 @@
void RooCFunction1Ref<VO,VI>::Streamer(TBuffer &R__b)
{
// Custom streamer for function pointer reference object. When writing,
diff --git a/debian/patches/37-fix-typo-processsing-processing.patch b/debian/patches/37-fix-typo-processsing-processing.patch
index 0b9e7a7..0aba873 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
-@@ -1031,7 +1031,7 @@
+@@ -1021,7 +1021,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 c275566..141b928 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
-@@ -3050,7 +3050,7 @@
+@@ -3071,7 +3071,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
-@@ -2474,7 +2474,7 @@
+@@ -2798,7 +2798,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 5212403..91c3795 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
-@@ -1589,7 +1589,7 @@
+@@ -1623,7 +1623,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
-@@ -3289,7 +3289,7 @@
+@@ -3291,7 +3291,7 @@
//______________________________________________________________________________
int TUnixSystem::RecvBuf(int sock, void *buf, int length)
{
@@ -205,7 +205,7 @@
--- a/proof/proof/src/TProofServ.cxx
+++ b/proof/proof/src/TProofServ.cxx
-@@ -1321,7 +1321,7 @@
+@@ -1332,7 +1332,7 @@
Int_t rc = 0;
TString exmsg;
diff --git a/debian/patches/45-fix-typo-expresion-expression.patch b/debian/patches/45-fix-typo-expresion-expression.patch
index 0884661..57e9464 100644
--- a/debian/patches/45-fix-typo-expresion-expression.patch
+++ b/debian/patches/45-fix-typo-expresion-expression.patch
@@ -33,7 +33,7 @@
--- a/tree/tree/src/TTreeCache.cxx
+++ b/tree/tree/src/TTreeCache.cxx
-@@ -357,7 +357,7 @@
+@@ -367,7 +367,7 @@
// this is to be used by user (thats why we pass the name of the branch).
// It works in exactly the same way as TTree::SetBranchStatus so you
// probably want to look over ther for details about the use of bname
diff --git a/debian/patches/46-fix-typo-explicitely-explicitly.patch b/debian/patches/46-fix-typo-explicitely-explicitly.patch
index 48afff9..a5b92bd 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
-@@ -2942,7 +2942,7 @@
+@@ -2974,7 +2974,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
-@@ -832,7 +832,7 @@
+@@ -853,7 +853,7 @@
if (enableSchemaEvolution) {
TMessage::EnableSchemaEvolutionForAll();
} else {
@@ -230,7 +230,7 @@
}
if (IsMaster()) {
-@@ -10784,7 +10784,7 @@
+@@ -11384,7 +11384,7 @@
if (mgr && mgr->IsValid()) {
// If XProofd we always attempt an attach first (unless
@@ -250,7 +250,7 @@
}
}
-@@ -2533,7 +2533,7 @@
+@@ -2544,7 +2544,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
-@@ -300,7 +300,7 @@
+@@ -301,7 +301,7 @@
TRACEP(p, HDBG, "enter");
@@ -283,7 +283,7 @@
if (procnotass == 0) {
--- a/proof/proofplayer/src/TProofPlayer.cxx
+++ b/proof/proofplayer/src/TProofPlayer.cxx
-@@ -1636,7 +1636,7 @@
+@@ -1898,7 +1898,7 @@
} else {
listOfMissingFiles = new TList;
}
@@ -327,7 +327,7 @@
TThread::UnLock();
--- a/proof/proofd/src/XrdProofdManager.cxx
+++ b/proof/proofd/src/XrdProofdManager.cxx
-@@ -338,7 +338,7 @@
+@@ -339,7 +339,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.
//
-@@ -352,13 +352,13 @@
+@@ -353,13 +353,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;
-@@ -428,7 +428,7 @@
+@@ -429,7 +429,7 @@
usrok = 1;
e = "";
}
@@ -363,7 +363,7 @@
// and the group is denied
if (usrok == -1 || (!grpok && usrok != 1)) return -1;
}
-@@ -938,7 +938,7 @@
+@@ -942,7 +942,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 78c6208..cb5e22e 100644
--- a/debian/patches/47-fix-typo-enviroment-environment.patch
+++ b/debian/patches/47-fix-typo-enviroment-environment.patch
@@ -20,7 +20,7 @@
to long or double type object by G__double() or G__int() API.
--- a/core/meta/src/TCint.cxx
+++ b/core/meta/src/TCint.cxx
-@@ -1291,7 +1291,7 @@
+@@ -1305,7 +1305,7 @@
// The 'name' is known to the interpreter, this function returns
// the internal version of this name (usually just resolving typedefs)
// This is used in particular to synchronize between the name used
@@ -84,7 +84,7 @@
export LD_LIBRARY_PATH=$PWD/lib:${LD_LIBRARY_PATH}
--- a/cmake/modules/SearchInstalledSoftware.cmake
+++ b/cmake/modules/SearchInstalledSoftware.cmake
-@@ -531,7 +531,7 @@
+@@ -535,7 +535,7 @@
if(NOT builtin_xrootd)
find_package(XROOTD)
if(NOT XROOTD_FOUND)
diff --git a/debian/patches/54-fix-typo-auxilliary-auxiliary.patch b/debian/patches/54-fix-typo-auxilliary-auxiliary.patch
index 97f4887..7eafa5a 100644
--- a/debian/patches/54-fix-typo-auxilliary-auxiliary.patch
+++ b/debian/patches/54-fix-typo-auxilliary-auxiliary.patch
@@ -68,7 +68,7 @@
*
--- a/html/src/THtml.cxx
+++ b/html/src/THtml.cxx
-@@ -785,7 +785,7 @@
+@@ -787,7 +787,7 @@
or to run on just a few classes:
<pre>
root[] <a href="http://root.cern.ch/root/html/THtml.html">THtml</a> html; // create a <a href="http://root.cern.ch/root/html/THtml.html">THtml</a> object
@@ -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
-@@ -307,7 +307,7 @@
+@@ -310,7 +310,7 @@
ClassDef(TMergerInfo,0) // Basic info on merger, i.e. worker serving as merger
};
diff --git a/debian/patches/59-fix-typo-targetting-targeting.patch b/debian/patches/59-fix-typo-targetting-targeting.patch
index 5dedf48..62aa5d0 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
-@@ -905,7 +905,7 @@
+@@ -906,7 +906,7 @@
// Intercept the case where the output TFile is deleted!
if (obj == fOutputFile) {
diff --git a/debian/patches/64-support-mipsel.patch b/debian/patches/64-support-mipsel.patch
index 329c7d6..aa2cb2d 100644
--- a/debian/patches/64-support-mipsel.patch
+++ b/debian/patches/64-support-mipsel.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -1219,7 +1219,7 @@
+@@ -1228,7 +1228,7 @@
linux:alpha:*) arch=linuxalphagcc ;;
linux:arm*:*) arch=linuxarm ;;
linux:hppa*:*) arch=linux ;;
diff --git a/debian/patches/67-generate-iosenum.h.patch b/debian/patches/67-generate-iosenum.h.patch
index a74ad01..f3fe2db 100644
--- a/debian/patches/67-generate-iosenum.h.patch
+++ b/debian/patches/67-generate-iosenum.h.patch
@@ -2,7 +2,7 @@ Generate iosenum.h if not officially provided for the arch.
--- a/cint/cint/Module.mk
+++ b/cint/cint/Module.mk
-@@ -301,15 +301,17 @@
+@@ -285,15 +285,17 @@
$(IOSENUM):
$(MAKEDIR)
@(if [ ! -r $(IOSENUMA) ]; then \
diff --git a/debian/patches/69-support-pythia8.patch b/debian/patches/69-support-pythia8.patch
index 95f46df..3cfcd21 100644
--- a/debian/patches/69-support-pythia8.patch
+++ b/debian/patches/69-support-pythia8.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -6087,6 +6087,7 @@
+@@ -6120,6 +6120,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 ebc0f16..ee80183 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
-@@ -6146,7 +6146,6 @@
+@@ -6179,7 +6179,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 291e1d7..2f175c7 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
-@@ -4277,10 +4277,14 @@
+@@ -4310,10 +4310,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
-@@ -4299,9 +4303,9 @@
+@@ -4332,9 +4336,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 608d4ae..507e534 100644
--- a/debian/patches/74-kfreebsd.patch
+++ b/debian/patches/74-kfreebsd.patch
@@ -220,7 +220,7 @@
auxcflags=
--- a/configure
+++ b/configure
-@@ -1211,6 +1211,8 @@
+@@ -1220,6 +1220,8 @@
freebsd*:*:5*) arch=freebsd5 ;;
freebsd*:*:4*) arch=freebsd4 ;;
freebsd*:*:*) arch=freebsd ;;
@@ -229,7 +229,7 @@
hp-ux:ia64:*) arch=hpuxia64acc ;;
hp-ux:*:*) arch=hpuxacc ;;
hurd*:*:*) arch=hurddeb ;;
-@@ -1805,7 +1807,7 @@
+@@ -1817,7 +1819,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
-@@ -3906,7 +3908,7 @@
+@@ -3938,7 +3940,7 @@
#
bonjourcppflags=
case $platform in
@@ -247,7 +247,7 @@
;;
*)
if test "x$enable_bonjour" = "xyes" ; then
-@@ -5935,7 +5937,7 @@
+@@ -5968,7 +5970,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/75-hardening-flag.patch b/debian/patches/75-hardening-flag.patch
index 55d855e..13700db 100644
--- a/debian/patches/75-hardening-flag.patch
+++ b/debian/patches/75-hardening-flag.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -6388,7 +6388,7 @@
+@@ -6421,7 +6421,7 @@
fi
sed -e "s|@useconfig@|TRUE|" \
diff --git a/debian/patches/76-hurd-i386.patch b/debian/patches/76-hurd-i386.patch
index 8720d98..c79a333 100644
--- a/debian/patches/76-hurd-i386.patch
+++ b/debian/patches/76-hurd-i386.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -1216,6 +1216,7 @@
+@@ -1225,6 +1225,7 @@
hp-ux:ia64:*) arch=hpuxia64acc ;;
hp-ux:*:*) arch=hpuxacc ;;
hurd*:*:*) arch=hurddeb ;;
@@ -8,7 +8,7 @@
linux:ia64:*) arch=linuxia64gcc ;;
linux:x86_64:*) arch=linuxx8664gcc ;;
linux:alpha:*) arch=linuxalphagcc ;;
-@@ -1807,7 +1808,7 @@
+@@ -1819,7 +1820,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
-@@ -3908,7 +3909,7 @@
+@@ -3940,7 +3941,7 @@
#
bonjourcppflags=
case $platform in
@@ -26,7 +26,7 @@
;;
*)
if test "x$enable_bonjour" = "xyes" ; then
-@@ -5937,7 +5938,7 @@
+@@ -5970,7 +5971,7 @@
message "Checking whether to build libMemStat"
if test "x$enable_memstat" = "xyes" || test ! "x$MEMSTAT" = "x"; then
case $arch in
--
root-system: CERN's ROOT Data Analysis Framework
More information about the debian-science-commits
mailing list