[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.07-86-g9804b92
Lifeng Sun
lifongsun at gmail.com
Wed Jul 3 12:30:52 UTC 2013
The following commit has been merged in the master branch:
commit 70c5b824433fb999b8197ec5aa1431162bd7e9c6
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Mon Jun 3 20:33:26 2013 +0800
Revise patchset.
diff --git a/debian/changelog b/debian/changelog
index 8c7fd72..4e8df78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+root-system (5.34.08-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Lifeng Sun <lifongsun at gmail.com> Mon, 03 Jun 2013 20:28:56 +0800
+
root-system (5.34.07-1) unstable; 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 52bce33..fcd7e02 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
-@@ -6161,6 +6161,7 @@
+@@ -6175,6 +6175,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 55d799c..89f67f1 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
-@@ -6163,6 +6163,7 @@
+@@ -6177,6 +6177,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"
-@@ -6180,7 +6181,6 @@
+@@ -6194,7 +6195,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 72036a6..620cb23 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
-@@ -6203,6 +6203,7 @@
+@@ -6217,6 +6217,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 8c3bafb..ff99b70 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
-@@ -6221,6 +6221,7 @@
+@@ -6235,6 +6235,7 @@
libroot-net \
libroot-net-auth \
libroot-proof \
@@ -8,7 +8,7 @@
libroot-tmva \
libroot-tree \
libroot-tree-treeplayer \
-@@ -6237,7 +6238,6 @@
+@@ -6251,7 +6252,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 9544400..ea74dd6 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
-@@ -6529,7 +6529,7 @@
+@@ -6543,7 +6543,7 @@
sed -e "s|@useconfig@|FALSE|" \
-e "s|@cflags@||" \
@@ -9,7 +9,7 @@
< Makefile.tmp > Makefile.tmpp
mv Makefile.tmpp Makefile.tmp
fi
-@@ -6662,7 +6662,7 @@
+@@ -6677,7 +6677,7 @@
-e "s|@ldapincdir@|$ldapincdir|" \
-e "s|@ldaplib@|$ldaplib|" \
-e "s|@ldaplibdir@|$ldaplibdir|" \
diff --git a/debian/patches/19-remove-embedded-library-gl2ps.patch b/debian/patches/19-remove-embedded-library-gl2ps.patch
index 83f9b3c..7d2125f 100644
--- a/debian/patches/19-remove-embedded-library-gl2ps.patch
+++ b/debian/patches/19-remove-embedded-library-gl2ps.patch
@@ -18,184 +18,6 @@
$(GLDS): $(GLH2) $(GLL) $(ROOTCINTTMPDEP)
$(MAKEDIR)
---- a/graf3d/gl/inc/gl2ps.h
-+++ /dev/null
-@@ -1,175 +0,0 @@
--// @(#)root/gl:$Id: gl2ps.h 33578 2010-05-19 12:35:58Z rdm $
--/*
-- * GL2PS, an OpenGL to PostScript Printing Library
-- * Copyright (C) 1999-2009 C. Geuzaine
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of either:
-- *
-- * a) the GNU Library General Public License as published by the Free
-- * Software Foundation, either version 2 of the License, or (at your
-- * option) any later version; or
-- *
-- * b) the GL2PS License as published by Christophe Geuzaine, either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See either
-- * the GNU Library General Public License or the GL2PS License for
-- * more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library in the file named "COPYING.LGPL";
-- * if not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-- * Cambridge, MA 02139, USA.
-- *
-- * You should have received a copy of the GL2PS License with this
-- * library in the file named "COPYING.GL2PS"; if not, I will be glad
-- * to provide one.
-- *
-- * For the latest info about gl2ps, see http://www.geuz.org/gl2ps/.
-- * Please report all bugs and problems to <gl2ps at geuz.org>.
-- */
--
--#ifndef __GL2PS_H__
--#define __GL2PS_H__
--
--#include <stdio.h>
--#include <stdlib.h>
--
--#include <TGLIncludes.h>
--
--#define GL2PSDLL_API
--
--/* Support for compressed PostScript/PDF/SVG and for embedded PNG
-- images in SVG */
--
--#if defined(HAVE_ZLIB) || defined(HAVE_LIBZ)
--# define GL2PS_HAVE_ZLIB
--# if defined(HAVE_LIBPNG) || defined(HAVE_PNG)
--# define GL2PS_HAVE_LIBPNG
--# endif
--#endif
--
--/* Version number */
--
--#define GL2PS_MAJOR_VERSION 1
--#define GL2PS_MINOR_VERSION 3
--#define GL2PS_PATCH_VERSION 3
--#define GL2PS_EXTRA_VERSION ""
--
--#define GL2PS_VERSION (GL2PS_MAJOR_VERSION + \
-- 0.01 * GL2PS_MINOR_VERSION + \
-- 0.0001 * GL2PS_PATCH_VERSION)
--
--#define GL2PS_COPYRIGHT "(C) 1999-2009 C. Geuzaine"
--
--/* Output file formats (the values and the ordering are important!) */
--
--#define GL2PS_PS 0
--#define GL2PS_EPS 1
--#define GL2PS_TEX 2
--#define GL2PS_PDF 3
--#define GL2PS_SVG 4
--#define GL2PS_PGF 5
--
--/* Sorting algorithms */
--
--#define GL2PS_NO_SORT 1
--#define GL2PS_SIMPLE_SORT 2
--#define GL2PS_BSP_SORT 3
--
--/* Message levels and error codes */
--
--#define GL2PS_SUCCESS 0
--#define GL2PS_INFO 1
--#define GL2PS_WARNING 2
--#define GL2PS_ERROR 3
--#define GL2PS_NO_FEEDBACK 4
--#define GL2PS_OVERFLOW 5
--#define GL2PS_UNINITIALIZED 6
--
--/* Options for gl2psBeginPage */
--
--#define GL2PS_NONE 0
--#define GL2PS_DRAW_BACKGROUND (1<<0)
--#define GL2PS_SIMPLE_LINE_OFFSET (1<<1)
--#define GL2PS_SILENT (1<<2)
--#define GL2PS_BEST_ROOT (1<<3)
--#define GL2PS_OCCLUSION_CULL (1<<4)
--#define GL2PS_NO_TEXT (1<<5)
--#define GL2PS_LANDSCAPE (1<<6)
--#define GL2PS_NO_PS3_SHADING (1<<7)
--#define GL2PS_NO_PIXMAP (1<<8)
--#define GL2PS_USE_CURRENT_VIEWPORT (1<<9)
--#define GL2PS_COMPRESS (1<<10)
--#define GL2PS_NO_BLENDING (1<<11)
--#define GL2PS_TIGHT_BOUNDING_BOX (1<<12)
--
--/* Arguments for gl2psEnable/gl2psDisable */
--
--#define GL2PS_POLYGON_OFFSET_FILL 1
--#define GL2PS_POLYGON_BOUNDARY 2
--#define GL2PS_LINE_STIPPLE 3
--#define GL2PS_BLEND 4
--
--/* Text alignment (o=raster position; default mode is BL):
-- +---+ +---+ +---+ +---+ +---+ +---+ +-o-+ o---+ +---o
-- | o | o | | o | | | | | | | | | | | |
-- +---+ +---+ +---+ +-o-+ o---+ +---o +---+ +---+ +---+
-- C CL CR B BL BR T TL TR */
--
--#define GL2PS_TEXT_C 1
--#define GL2PS_TEXT_CL 2
--#define GL2PS_TEXT_CR 3
--#define GL2PS_TEXT_B 4
--#define GL2PS_TEXT_BL 5
--#define GL2PS_TEXT_BR 6
--#define GL2PS_TEXT_T 7
--#define GL2PS_TEXT_TL 8
--#define GL2PS_TEXT_TR 9
--
--typedef GLfloat GL2PSrgba[4];
--
--#if defined(__cplusplus)
--extern "C" {
--#endif
--
--GL2PSDLL_API GLint gl2psBeginPage(const char *title, const char *producer,
-- GLint viewport[4], GLint format, GLint sort,
-- GLint options, GLint colormode,
-- GLint colorsize, GL2PSrgba *colormap,
-- GLint nr, GLint ng, GLint nb, GLint buffersize,
-- FILE *stream, const char *filename);
--GL2PSDLL_API GLint gl2psEndPage(void);
--GL2PSDLL_API GLint gl2psSetOptions(GLint options);
--GL2PSDLL_API GLint gl2psGetOptions(GLint *options);
--GL2PSDLL_API GLint gl2psBeginViewport(GLint viewport[4]);
--GL2PSDLL_API GLint gl2psEndViewport(void);
--GL2PSDLL_API GLint gl2psText(const char *str, const char *fontname,
-- GLshort fontsize);
--GL2PSDLL_API GLint gl2psTextOpt(const char *str, const char *fontname,
-- GLshort fontsize, GLint align, GLfloat angle);
--GL2PSDLL_API GLint gl2psSpecial(GLint format, const char *str);
--GL2PSDLL_API GLint gl2psDrawPixels(GLsizei width, GLsizei height,
-- GLint xorig, GLint yorig,
-- GLenum format, GLenum type, const void *pixels);
--GL2PSDLL_API GLint gl2psEnable(GLint mode);
--GL2PSDLL_API GLint gl2psDisable(GLint mode);
--GL2PSDLL_API GLint gl2psPointSize(GLfloat value);
--GL2PSDLL_API GLint gl2psLineWidth(GLfloat value);
--GL2PSDLL_API GLint gl2psBlendFunc(GLenum sfactor, GLenum dfactor);
--
--/* undocumented */
--GL2PSDLL_API GLint gl2psDrawImageMap(GLsizei width, GLsizei height,
-- const GLfloat position[3],
-- const unsigned char *imagemap);
--GL2PSDLL_API const char *gl2psGetFileExtension(GLint format);
--GL2PSDLL_API const char *gl2psGetFormatDescription(GLint format);
--
--#if defined(__cplusplus)
--}
--#endif
--
--#endif /* __GL2PS_H__ */
--- a/graf3d/gl/src/gl2ps.cxx
+++ /dev/null
@@ -1,6033 +0,0 @@
@@ -6232,3 +6054,181 @@
- else
- return "Unknown format";
-}
+--- a/graf3d/gl/inc/gl2ps.h
++++ /dev/null
+@@ -1,175 +0,0 @@
+-// @(#)root/gl:$Id$
+-/*
+- * GL2PS, an OpenGL to PostScript Printing Library
+- * Copyright (C) 1999-2009 C. Geuzaine
+- *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of either:
+- *
+- * a) the GNU Library General Public License as published by the Free
+- * Software Foundation, either version 2 of the License, or (at your
+- * option) any later version; or
+- *
+- * b) the GL2PS License as published by Christophe Geuzaine, either
+- * version 2 of the License, or (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful, but
+- * WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See either
+- * the GNU Library General Public License or the GL2PS License for
+- * more details.
+- *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library in the file named "COPYING.LGPL";
+- * if not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+- * Cambridge, MA 02139, USA.
+- *
+- * You should have received a copy of the GL2PS License with this
+- * library in the file named "COPYING.GL2PS"; if not, I will be glad
+- * to provide one.
+- *
+- * For the latest info about gl2ps, see http://www.geuz.org/gl2ps/.
+- * Please report all bugs and problems to <gl2ps at geuz.org>.
+- */
+-
+-#ifndef __GL2PS_H__
+-#define __GL2PS_H__
+-
+-#include <stdio.h>
+-#include <stdlib.h>
+-
+-#include <TGLIncludes.h>
+-
+-#define GL2PSDLL_API
+-
+-/* Support for compressed PostScript/PDF/SVG and for embedded PNG
+- images in SVG */
+-
+-#if defined(HAVE_ZLIB) || defined(HAVE_LIBZ)
+-# define GL2PS_HAVE_ZLIB
+-# if defined(HAVE_LIBPNG) || defined(HAVE_PNG)
+-# define GL2PS_HAVE_LIBPNG
+-# endif
+-#endif
+-
+-/* Version number */
+-
+-#define GL2PS_MAJOR_VERSION 1
+-#define GL2PS_MINOR_VERSION 3
+-#define GL2PS_PATCH_VERSION 3
+-#define GL2PS_EXTRA_VERSION ""
+-
+-#define GL2PS_VERSION (GL2PS_MAJOR_VERSION + \
+- 0.01 * GL2PS_MINOR_VERSION + \
+- 0.0001 * GL2PS_PATCH_VERSION)
+-
+-#define GL2PS_COPYRIGHT "(C) 1999-2009 C. Geuzaine"
+-
+-/* Output file formats (the values and the ordering are important!) */
+-
+-#define GL2PS_PS 0
+-#define GL2PS_EPS 1
+-#define GL2PS_TEX 2
+-#define GL2PS_PDF 3
+-#define GL2PS_SVG 4
+-#define GL2PS_PGF 5
+-
+-/* Sorting algorithms */
+-
+-#define GL2PS_NO_SORT 1
+-#define GL2PS_SIMPLE_SORT 2
+-#define GL2PS_BSP_SORT 3
+-
+-/* Message levels and error codes */
+-
+-#define GL2PS_SUCCESS 0
+-#define GL2PS_INFO 1
+-#define GL2PS_WARNING 2
+-#define GL2PS_ERROR 3
+-#define GL2PS_NO_FEEDBACK 4
+-#define GL2PS_OVERFLOW 5
+-#define GL2PS_UNINITIALIZED 6
+-
+-/* Options for gl2psBeginPage */
+-
+-#define GL2PS_NONE 0
+-#define GL2PS_DRAW_BACKGROUND (1<<0)
+-#define GL2PS_SIMPLE_LINE_OFFSET (1<<1)
+-#define GL2PS_SILENT (1<<2)
+-#define GL2PS_BEST_ROOT (1<<3)
+-#define GL2PS_OCCLUSION_CULL (1<<4)
+-#define GL2PS_NO_TEXT (1<<5)
+-#define GL2PS_LANDSCAPE (1<<6)
+-#define GL2PS_NO_PS3_SHADING (1<<7)
+-#define GL2PS_NO_PIXMAP (1<<8)
+-#define GL2PS_USE_CURRENT_VIEWPORT (1<<9)
+-#define GL2PS_COMPRESS (1<<10)
+-#define GL2PS_NO_BLENDING (1<<11)
+-#define GL2PS_TIGHT_BOUNDING_BOX (1<<12)
+-
+-/* Arguments for gl2psEnable/gl2psDisable */
+-
+-#define GL2PS_POLYGON_OFFSET_FILL 1
+-#define GL2PS_POLYGON_BOUNDARY 2
+-#define GL2PS_LINE_STIPPLE 3
+-#define GL2PS_BLEND 4
+-
+-/* Text alignment (o=raster position; default mode is BL):
+- +---+ +---+ +---+ +---+ +---+ +---+ +-o-+ o---+ +---o
+- | o | o | | o | | | | | | | | | | | |
+- +---+ +---+ +---+ +-o-+ o---+ +---o +---+ +---+ +---+
+- C CL CR B BL BR T TL TR */
+-
+-#define GL2PS_TEXT_C 1
+-#define GL2PS_TEXT_CL 2
+-#define GL2PS_TEXT_CR 3
+-#define GL2PS_TEXT_B 4
+-#define GL2PS_TEXT_BL 5
+-#define GL2PS_TEXT_BR 6
+-#define GL2PS_TEXT_T 7
+-#define GL2PS_TEXT_TL 8
+-#define GL2PS_TEXT_TR 9
+-
+-typedef GLfloat GL2PSrgba[4];
+-
+-#if defined(__cplusplus)
+-extern "C" {
+-#endif
+-
+-GL2PSDLL_API GLint gl2psBeginPage(const char *title, const char *producer,
+- GLint viewport[4], GLint format, GLint sort,
+- GLint options, GLint colormode,
+- GLint colorsize, GL2PSrgba *colormap,
+- GLint nr, GLint ng, GLint nb, GLint buffersize,
+- FILE *stream, const char *filename);
+-GL2PSDLL_API GLint gl2psEndPage(void);
+-GL2PSDLL_API GLint gl2psSetOptions(GLint options);
+-GL2PSDLL_API GLint gl2psGetOptions(GLint *options);
+-GL2PSDLL_API GLint gl2psBeginViewport(GLint viewport[4]);
+-GL2PSDLL_API GLint gl2psEndViewport(void);
+-GL2PSDLL_API GLint gl2psText(const char *str, const char *fontname,
+- GLshort fontsize);
+-GL2PSDLL_API GLint gl2psTextOpt(const char *str, const char *fontname,
+- GLshort fontsize, GLint align, GLfloat angle);
+-GL2PSDLL_API GLint gl2psSpecial(GLint format, const char *str);
+-GL2PSDLL_API GLint gl2psDrawPixels(GLsizei width, GLsizei height,
+- GLint xorig, GLint yorig,
+- GLenum format, GLenum type, const void *pixels);
+-GL2PSDLL_API GLint gl2psEnable(GLint mode);
+-GL2PSDLL_API GLint gl2psDisable(GLint mode);
+-GL2PSDLL_API GLint gl2psPointSize(GLfloat value);
+-GL2PSDLL_API GLint gl2psLineWidth(GLfloat value);
+-GL2PSDLL_API GLint gl2psBlendFunc(GLenum sfactor, GLenum dfactor);
+-
+-/* undocumented */
+-GL2PSDLL_API GLint gl2psDrawImageMap(GLsizei width, GLsizei height,
+- const GLfloat position[3],
+- const unsigned char *imagemap);
+-GL2PSDLL_API const char *gl2psGetFileExtension(GLint format);
+-GL2PSDLL_API const char *gl2psGetFormatDescription(GLint format);
+-
+-#if defined(__cplusplus)
+-}
+-#endif
+-
+-#endif /* __GL2PS_H__ */
diff --git a/debian/patches/31-fix-typo-wheter-whether.patch b/debian/patches/31-fix-typo-wheter-whether.patch
index b664b39..7ce55c1 100644
--- a/debian/patches/31-fix-typo-wheter-whether.patch
+++ b/debian/patches/31-fix-typo-wheter-whether.patch
@@ -1,8 +1,6 @@
-diff --git a/gui/gui/src/TGMenu.cxx b/gui/gui/src/TGMenu.cxx
-index 957d4d1..b764482 100644
--- a/gui/gui/src/TGMenu.cxx
+++ b/gui/gui/src/TGMenu.cxx
-@@ -299,7 +299,7 @@ void TGMenuBar::PopupConnection()
+@@ -299,7 +299,7 @@
}
fMenuMore->fMsgWindow = 0;
@@ -11,11 +9,9 @@ index 957d4d1..b764482 100644
TGMenuEntry* currentEntry = fMenuMore->GetCurrent();
if (currentEntry->GetType() != kMenuPopup) return;
-diff --git a/proof/proof/inc/TProof.h b/proof/proof/inc/TProof.h
-index 6700fcf..0145474 100644
--- a/proof/proof/inc/TProof.h
+++ b/proof/proof/inc/TProof.h
-@@ -449,7 +449,7 @@ private:
+@@ -451,7 +451,7 @@
};
enum EProofDataSetCommands {
kUploadDataSet = 1, //Upload a dataset
@@ -24,11 +20,9 @@ index 6700fcf..0145474 100644
kGetDataSets = 3, //List datasets saved on the master node
kRegisterDataSet = 4, //Save a TList object as a dataset
kGetDataSet = 5, //Get a TFileCollection of TFileInfo objects
-diff --git a/tmva/src/PDEFoamCell.cxx b/tmva/src/PDEFoamCell.cxx
-index 680e1d1..6eddee9 100644
--- a/tmva/src/PDEFoamCell.cxx
+++ b/tmva/src/PDEFoamCell.cxx
-@@ -195,7 +195,7 @@ UInt_t TMVA::PDEFoamCell::GetDepth()
+@@ -195,7 +195,7 @@
// Get depth of cell in binary tree, where the root cell has depth
// 1
diff --git a/debian/patches/54-fix-typo-auxilliary-auxiliary.patch b/debian/patches/54-fix-typo-auxilliary-auxiliary.patch
index 8acfdf3..82078bd 100644
--- a/debian/patches/54-fix-typo-auxilliary-auxiliary.patch
+++ b/debian/patches/54-fix-typo-auxilliary-auxiliary.patch
@@ -1,8 +1,6 @@
-diff --git a/test/stressProof.cxx b/test/stressProof.cxx
-index be6432f..c09b238 100644
--- a/test/stressProof.cxx
+++ b/test/stressProof.cxx
-@@ -3708,7 +3708,7 @@ Int_t PT_EventRange(void *arg, RunTimes &tt)
+@@ -3733,7 +3733,7 @@
// Load special class for event ranges checks
if (gProof->Load(TString::Format("%s,%s", gProcFileElem.Data(), gEmptyInclude.Data())) != 0) {
gProof->SetPrintProgress(0);
diff --git a/debian/patches/69-support-pythia8.patch b/debian/patches/69-support-pythia8.patch
index e6f6541..8f1bee5 100644
--- a/debian/patches/69-support-pythia8.patch
+++ b/debian/patches/69-support-pythia8.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -6180,6 +6180,7 @@
+@@ -6194,6 +6194,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 c06c0da..f337f6b 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
-@@ -6239,7 +6239,6 @@
+@@ -6253,7 +6253,6 @@
root-plugin-io-sql \
root-plugin-io-xml \
root-plugin-math-fumili \
diff --git a/debian/patches/74-kfreebsd.patch b/debian/patches/74-kfreebsd.patch
index 58901d2..54a7de4 100644
--- a/debian/patches/74-kfreebsd.patch
+++ b/debian/patches/74-kfreebsd.patch
@@ -229,7 +229,7 @@
hp-ux:ia64:*) arch=hpuxia64acc ;;
hp-ux:*:*) arch=hpuxacc ;;
hurd*:*:*) arch=hurddeb ;;
-@@ -1827,7 +1829,7 @@
+@@ -1828,7 +1830,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
-@@ -3955,7 +3957,7 @@
+@@ -3969,7 +3971,7 @@
#
bonjourcppflags=
case $platform in
@@ -247,7 +247,7 @@
;;
*)
if test "x$enable_bonjour" = "xyes" ; then
-@@ -6024,7 +6026,7 @@
+@@ -6038,7 +6040,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 e02b3ca..5e0768d 100644
--- a/debian/patches/75-hardening-flag.patch
+++ b/debian/patches/75-hardening-flag.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -6478,7 +6478,7 @@
+@@ -6492,7 +6492,7 @@
fi
sed -e "s|@useconfig@|TRUE|" \
diff --git a/debian/patches/76-hurd-i386.patch b/debian/patches/76-hurd-i386.patch
index 966f032..fb1a178 100644
--- a/debian/patches/76-hurd-i386.patch
+++ b/debian/patches/76-hurd-i386.patch
@@ -8,7 +8,7 @@
linux:ia64:*) arch=linuxia64gcc ;;
linux:x86_64:*) arch=linuxx8664gcc ;;
linux:alpha:*) arch=linuxalphagcc ;;
-@@ -1829,7 +1830,7 @@
+@@ -1830,7 +1831,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
-@@ -3957,7 +3958,7 @@
+@@ -3971,7 +3972,7 @@
#
bonjourcppflags=
case $platform in
@@ -26,7 +26,7 @@
;;
*)
if test "x$enable_bonjour" = "xyes" ; then
-@@ -6026,7 +6027,7 @@
+@@ -6040,7 +6041,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