[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:29 UTC 2012
The following commit has been merged in the master branch:
commit 2ede2cdc979fdc3f443613637dd6206f63eda83c
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Sat Jul 14 20:57:47 2012 +0800
Revise patchset for new upstream.
diff --git a/debian/changelog b/debian/changelog
index eb60c17..1bbe7f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-root-system (5.34.00-2) UNRELEASED; urgency=low
+root-system (5.34.01-1) UNRELEASED; urgency=low
+ * New upstream release.
* Disable builtin lzma and libAfterImage.
* TODO: error-handling in postinst script of ttf-root-installer.
- -- Lifeng Sun <lifongsun at gmail.com> Wed, 27 Jun 2012 09:45:01 +0800
+ -- Lifeng Sun <lifongsun at gmail.com> Sat, 14 Jul 2012 20:56:35 +0800
root-system (5.34.00-1) unstable; urgency=low
diff --git a/debian/patches/02-build-libroot-misc-memstat-package.patch b/debian/patches/02-build-libroot-misc-memstat-package.patch
index f60be31..5239c62 100644
--- a/debian/patches/02-build-libroot-misc-memstat-package.patch
+++ b/debian/patches/02-build-libroot-misc-memstat-package.patch
@@ -1,10 +1,10 @@
--- a/configure
+++ b/configure
-@@ -6142,6 +6142,7 @@
+@@ -6068,6 +6068,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"
+ test "x$enable_memstat" = "xyes" && pl="$pl libroot-misc-memstat"
test "x$enable_table" = "xyes" && pl="$pl libroot-misc-table"
test "x$enable_ldap" = "xyes" && pl="$pl libroot-net-ldap"
- test "x$enable_clarens" = "xyes" && pl="$pl libroot-proof-clarens"
+ test "x$enable_roofit" = "xyes" && pl="$pl libroot-roofit"
diff --git a/debian/patches/03-build-libroot-bonjour-package.patch b/debian/patches/03-build-libroot-bonjour-package.patch
index b2b906d..db3506e 100644
--- a/debian/patches/03-build-libroot-bonjour-package.patch
+++ b/debian/patches/03-build-libroot-bonjour-package.patch
@@ -1,14 +1,14 @@
--- a/configure
+++ b/configure
-@@ -6144,6 +6144,7 @@
+@@ -6070,6 +6070,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"
+ test "x$enable_bonjour" = "xyes" && pl="$pl libroot-net-bonjour"
test "x$enable_ldap" = "xyes" && pl="$pl libroot-net-ldap"
- test "x$enable_clarens" = "xyes" && pl="$pl libroot-proof-clarens"
test "x$enable_roofit" = "xyes" && pl="$pl libroot-roofit"
-@@ -6162,7 +6163,6 @@
+ test "x$enable_asimage" = "xyes" && pl="$pl root-plugin-graf2d-asimage"
+@@ -6087,7 +6088,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 696eb56..a10bbf5 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
-@@ -6186,6 +6186,7 @@
+@@ -6110,6 +6110,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 194ea8a..682562d 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
-@@ -6204,6 +6204,7 @@
+@@ -6128,6 +6128,7 @@
libroot-net \
libroot-net-auth \
libroot-proof \
@@ -8,7 +8,7 @@
libroot-tmva \
libroot-tree \
libroot-tree-treeplayer \
-@@ -6220,7 +6221,6 @@
+@@ -6144,7 +6145,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 57e090f..ddb2fc5 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
-@@ -6511,7 +6511,7 @@
+@@ -6435,7 +6435,7 @@
sed -e "s|@useconfig@|FALSE|" \
-e "s|@cflags@||" \
@@ -9,7 +9,7 @@
< Makefile.tmp > Makefile.tmpp
mv Makefile.tmpp Makefile.tmp
fi
-@@ -6645,7 +6645,7 @@
+@@ -6567,7 +6567,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 a8c6e79..293af40 100644
--- a/debian/patches/22-fix-typo-succes-success.patch
+++ b/debian/patches/22-fix-typo-succes-success.patch
@@ -330,7 +330,7 @@
return -1;
--- a/roofit/roofitcore/src/RooAbsAnaConvPdf.cxx
+++ b/roofit/roofitcore/src/RooAbsAnaConvPdf.cxx
-@@ -231,7 +231,7 @@
+@@ -233,7 +233,7 @@
}
delete cIter ;
@@ -341,7 +341,7 @@
TIterator* iter = newConvSet.createIterator() ;
--- a/roofit/roofitcore/src/RooCmdConfig.cxx
+++ b/roofit/roofitcore/src/RooCmdConfig.cxx
-@@ -240,7 +240,7 @@
+@@ -242,7 +242,7 @@
void RooCmdConfig::defineDependency(const char* refArgName, const char* neededArgName)
{
// Define that processing argument name refArgName requires processing
@@ -350,7 +350,7 @@
TNamed* dep = new TNamed(refArgName,neededArgName) ;
_yList.Add(dep) ;
-@@ -753,7 +753,7 @@
+@@ -755,7 +755,7 @@
//_____________________________________________________________________________
Bool_t RooCmdConfig::ok(Bool_t verbose) const
{
diff --git a/debian/patches/23-fix-typo-preceed-preced.patch b/debian/patches/23-fix-typo-preceed-preced.patch
index bbc1c77..43e7a16 100644
--- a/debian/patches/23-fix-typo-preceed-preced.patch
+++ b/debian/patches/23-fix-typo-preceed-preced.patch
@@ -324,7 +324,7 @@
RooAbsPdf* newOne = proto->pdf(lastPdf.c_str());
--- a/roofit/roofitcore/src/RooStreamParser.cxx
+++ b/roofit/roofitcore/src/RooStreamParser.cxx
-@@ -204,7 +204,7 @@
+@@ -206,7 +206,7 @@
}
if (!quotedString) {
diff --git a/debian/patches/24-fix-typo-informations-information.patch b/debian/patches/24-fix-typo-informations-information.patch
index 278bbff..4bbc4e7 100644
--- a/debian/patches/24-fix-typo-informations-information.patch
+++ b/debian/patches/24-fix-typo-informations-information.patch
@@ -309,7 +309,7 @@
slstat->fTimeInstant = cTime;
--- a/roofit/roostats/src/HybridCalculatorOriginal.cxx
+++ b/roofit/roostats/src/HybridCalculatorOriginal.cxx
-@@ -122,7 +122,7 @@
+@@ -124,7 +124,7 @@
// observables are managed by the class (they are copied in)
fObservables = new RooArgList(observables);
diff --git a/debian/patches/26-fix-typo-avaliable-available.patch b/debian/patches/26-fix-typo-avaliable-available.patch
index 1896858..528174b 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
-@@ -1245,7 +1245,7 @@
+@@ -1243,7 +1243,7 @@
echo "Attempts at guessing your architecture failed."
echo "(triplet is $arch:$chip:$rele)"
echo "Please specify the architecture as the first argument."
@@ -174,7 +174,7 @@
.PP
--- a/roofit/roofitcore/src/RooRealConstant.cxx
+++ b/roofit/roofitcore/src/RooRealConstant.cxx
-@@ -65,7 +65,7 @@
+@@ -67,7 +67,7 @@
RooConstVar& RooRealConstant::value(Double_t value)
{
// Return a constant value object with given value.
diff --git a/debian/patches/34-fix-typo-registerd-registered.patch b/debian/patches/34-fix-typo-registerd-registered.patch
index 3a0ccf5..81b991a 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
-@@ -486,7 +486,7 @@
+@@ -528,7 +528,7 @@
//______________________________________________________________________________
void TEveTrack::SortPathMarksByTime()
{
diff --git a/debian/patches/46-fix-typo-explicitely-explicitly.patch b/debian/patches/46-fix-typo-explicitely-explicitly.patch
index fae692a..48afff9 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
-@@ -2941,7 +2941,7 @@
+@@ -2942,7 +2942,7 @@
mysqllib=$found_lib
mysqllibdir=$found_dir
@@ -117,7 +117,7 @@
<p>
--- a/io/io/src/TBufferFile.cxx
+++ b/io/io/src/TBufferFile.cxx
-@@ -2981,7 +2981,7 @@
+@@ -2985,7 +2985,7 @@
if (readClass) {
if ((cli = fMap->GetValue(offset)) == 0) {
// No class found at this location in map. It might have been skipped
@@ -126,7 +126,7 @@
// save fBufCur and set to place specified by offset (-kMapOffset-sizeof(bytecount))
char *bufsav = fBufCur;
-@@ -3013,7 +3013,7 @@
+@@ -3017,7 +3017,7 @@
if ((cli = fMap->GetValue(offset)) == 0) {
// No object found at this location in map. It might have been skipped
@@ -261,7 +261,7 @@
FlushLogFile();
--- a/proof/proofd/src/XrdProofdClientMgr.cxx
+++ b/proof/proofd/src/XrdProofdClientMgr.cxx
-@@ -335,7 +335,7 @@
+@@ -300,7 +300,7 @@
TRACEP(p, HDBG, "enter");
diff --git a/debian/patches/47-fix-typo-enviroment-environment.patch b/debian/patches/47-fix-typo-enviroment-environment.patch
index 3353a83..78c6208 100644
--- a/debian/patches/47-fix-typo-enviroment-environment.patch
+++ b/debian/patches/47-fix-typo-enviroment-environment.patch
@@ -42,7 +42,7 @@
// At the moment supported only classes, which are not inherited from TObject
--- a/net/alien/src/TAlienFile.cxx
+++ b/net/alien/src/TAlienFile.cxx
-@@ -64,7 +64,7 @@
+@@ -65,7 +65,7 @@
// "alien:///alice/test.root"
// If you want to write a file on specific storage element use the syntax
// "alien:///alice/test.root?&se=Alice::CERN::Storage"
@@ -51,17 +51,6 @@
//
// If you read a file, the closest file image to alien_CLOSE_SE is taken.
// If the file cannot opened from the closest image, the next image is tried,
---- a/proof/clarens/inc/TXmlRpc.h
-+++ b/proof/clarens/inc/TXmlRpc.h
-@@ -39,7 +39,7 @@
- class TXmlRpc : public TObject {
- private:
- TClSession *fSession; //Clarens session info
-- xmlrpc_env *fEnv; //call enviroment
-+ xmlrpc_env *fEnv; //call environment
- TString fService; //our service
-
- public:
--- a/sql/odbc/src/TODBCServer.cxx
+++ b/sql/odbc/src/TODBCServer.cxx
@@ -53,7 +53,7 @@
@@ -115,3 +104,14 @@
oracle::occi::Connection *fConn; // connection to Oracle
oracle::occi::Statement *fStmt; // executed statement
oracle::occi::ResultSet *fResult; // query result (rows)
+--- a/core/meta/src/TCintWithCling.cxx
++++ b/core/meta/src/TCintWithCling.cxx
+@@ -4502,7 +4502,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
+- // by rootcint and by the run-time enviroment (TClass)
++ // by rootcint and by the run-time environment (TClass)
+ // Return 0 if the name is not known.
+ R__LOCKGUARD(gCINTMutex);
+ if (!gInterpreter->CheckClassInfo(name)) {
diff --git a/debian/patches/48-fix-typo-deafult-default.patch b/debian/patches/48-fix-typo-deafult-default.patch
index 7d4c14c..e015c54 100644
--- a/debian/patches/48-fix-typo-deafult-default.patch
+++ b/debian/patches/48-fix-typo-deafult-default.patch
@@ -31,9 +31,9 @@
QString fileNameExtension = QFileInfo(fileName).suffix().toUpper();
--- a/graf3d/gl/inc/TGLCamera.h
+++ b/graf3d/gl/inc/TGLCamera.h
-@@ -77,8 +77,8 @@
- Bool_t fExternalCenter; //! use external center insead of scene center
+@@ -78,8 +78,8 @@
Bool_t fFixDefCenter; //! use fixed default center
+ Bool_t fWasArcBalled; //! set when arc-ball rotation is used
TGLVector3 fExtCenter; //! external camera center
- TGLVector3 fDefCenter; //! deafult camera center
- TGLVector3 fFDCenter; //! fixed deafult camera center
diff --git a/debian/patches/56-fix-typo-appropiate-appropriate.patch b/debian/patches/56-fix-typo-appropiate-appropriate.patch
index 20f5616..4304888 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
-@@ -1707,7 +1707,7 @@
+@@ -1709,7 +1709,7 @@
}
@@ -111,7 +111,7 @@
RooDataSet* data ;
if (protoData) {
data = generate(whatVars,*protoData,nEvents,verbose,randProto,resampleProto) ;
-@@ -2127,7 +2127,7 @@
+@@ -2130,7 +2130,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 e372194..7608124 100644
--- a/debian/patches/61-fix-typo-paramater-parameter.patch
+++ b/debian/patches/61-fix-typo-paramater-parameter.patch
@@ -115,7 +115,7 @@
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 @@
+@@ -57,7 +57,7 @@
const RooArgList& vars, const RooArgList& paramSet) :
RooAbsReal(name, title),
_dataVars("!dataVars","data Vars", this),
@@ -124,7 +124,7 @@
_numBins(0),
_dataSet( (string(name)+"_dataSet").c_str(), "", vars)
{
-@@ -79,13 +79,13 @@
+@@ -81,13 +81,13 @@
// Set the binning
// //_binning = var.getBinning().clone() ;
@@ -140,7 +140,7 @@
addVarSet( vars );
addParamSet( paramSet );
-@@ -100,7 +100,7 @@
+@@ -102,7 +102,7 @@
RooAbsReal(name, title),
// _dataVar("!dataVar","data Var", this, (RooRealVar&) var),
_dataVars("!dataVars","data Vars", this),
@@ -149,7 +149,7 @@
_numBins(0),
_dataSet( (string(name)+"_dataSet").c_str(), "", vars, Hist)
{
-@@ -120,7 +120,7 @@
+@@ -122,7 +122,7 @@
// Get the number of bins
_numBins = GetNumBins( vars );
@@ -158,7 +158,7 @@
addVarSet( vars );
addParamSet( paramSet );
-@@ -654,7 +654,7 @@
+@@ -656,7 +656,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;
-@@ -672,7 +672,7 @@
+@@ -674,7 +674,7 @@
while((comp = (RooAbsArg*) paramIter.next())) {
if (!dynamic_cast<RooRealVar*>(comp)) {
coutE(InputArguments) << "ParamHistFunc::(" << GetName() << ") ERROR: component " << comp->GetName()
@@ -178,7 +178,7 @@
}
--- a/roofit/roofitcore/src/RooAbsData.cxx
+++ b/roofit/roofitcore/src/RooAbsData.cxx
-@@ -138,7 +138,7 @@
+@@ -140,7 +140,7 @@
}
delete iter ;
@@ -187,7 +187,7 @@
iter = _vars.createIterator() ;
while((0 != (var= (RooAbsArg*)iter->Next()))) {
var->attachDataSet(*this) ;
-@@ -163,7 +163,7 @@
+@@ -165,7 +165,7 @@
claimVars(this) ;
_vars.addClone(other._vars) ;
@@ -198,7 +198,7 @@
while((0 != (var= (RooAbsArg*)iter->Next()))) {
--- a/roofit/roofitcore/src/RooFitResult.cxx
+++ b/roofit/roofitcore/src/RooFitResult.cxx
-@@ -806,7 +806,7 @@
+@@ -808,7 +808,7 @@
}
}
@@ -220,7 +220,7 @@
} else {
--- a/roofit/roofitcore/src/RooMinimizer.cxx
+++ b/roofit/roofitcore/src/RooMinimizer.cxx
-@@ -587,7 +587,7 @@
+@@ -589,7 +589,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
-@@ -872,7 +872,7 @@
+@@ -874,7 +874,7 @@
RooFitResult* fitRes = new RooFitResult(name,title) ;
diff --git a/debian/patches/64-support-mipsel.patch b/debian/patches/64-support-mipsel.patch
index 456c90a..329c7d6 100644
--- a/debian/patches/64-support-mipsel.patch
+++ b/debian/patches/64-support-mipsel.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -1221,7 +1221,7 @@
+@@ -1219,7 +1219,7 @@
linux:alpha:*) arch=linuxalphagcc ;;
linux:arm*:*) arch=linuxarm ;;
linux:hppa*:*) arch=linux ;;
diff --git a/debian/patches/69-support-pythia8.patch b/debian/patches/69-support-pythia8.patch
index e0a6c0a..95f46df 100644
--- a/debian/patches/69-support-pythia8.patch
+++ b/debian/patches/69-support-pythia8.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -6162,6 +6162,7 @@
+@@ -6087,6 +6087,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 bcef395..ebc0f16 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
-@@ -6222,7 +6222,6 @@
+@@ -6146,7 +6146,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 1ef550d..291e1d7 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
-@@ -4276,10 +4276,14 @@
+@@ -4277,10 +4277,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
-@@ -4298,9 +4302,9 @@
+@@ -4299,9 +4303,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 57fbccd..608d4ae 100644
--- a/debian/patches/74-kfreebsd.patch
+++ b/debian/patches/74-kfreebsd.patch
@@ -220,7 +220,7 @@
auxcflags=
--- a/configure
+++ b/configure
-@@ -1213,6 +1213,8 @@
+@@ -1211,6 +1211,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 ;;
-@@ -1809,7 +1811,7 @@
+@@ -1805,7 +1807,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
-@@ -3905,7 +3907,7 @@
+@@ -3906,7 +3908,7 @@
#
bonjourcppflags=
case $platform in
@@ -247,7 +247,7 @@
;;
*)
if test "x$enable_bonjour" = "xyes" ; then
-@@ -5934,7 +5936,7 @@
+@@ -5935,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/75-hardening-flag.patch b/debian/patches/75-hardening-flag.patch
index 2bd1dd5..55d855e 100644
--- a/debian/patches/75-hardening-flag.patch
+++ b/debian/patches/75-hardening-flag.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -6464,7 +6464,7 @@
+@@ -6388,7 +6388,7 @@
fi
sed -e "s|@useconfig@|TRUE|" \
diff --git a/debian/patches/76-hurd-i386.patch b/debian/patches/76-hurd-i386.patch
index 7720b6b..8720d98 100644
--- a/debian/patches/76-hurd-i386.patch
+++ b/debian/patches/76-hurd-i386.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -1218,6 +1218,7 @@
+@@ -1216,6 +1216,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 ;;
-@@ -1811,7 +1812,7 @@
+@@ -1807,7 +1808,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
-@@ -3907,7 +3908,7 @@
+@@ -3908,7 +3909,7 @@
#
bonjourcppflags=
case $platform in
@@ -26,7 +26,7 @@
;;
*)
if test "x$enable_bonjour" = "xyes" ; then
-@@ -5936,7 +5937,7 @@
+@@ -5937,7 +5938,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