[root-system] 13/21: refresh patchset.
Lifeng Sun
lifengsun-guest at moszumanska.debian.org
Sat Aug 2 08:35:06 UTC 2014
This is an automated email from the git hooks/post-receive script.
lifengsun-guest pushed a commit to branch master
in repository root-system.
commit 19c74baeb0038de07efa0e2d000661e1f7fb165b
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Sun Jul 13 10:01:57 2014 +0800
refresh patchset.
---
debian/patches/01-link-roota-against-sqlite.patch | 2 +-
debian/patches/02-build-libroot-misc-memstat-package.patch | 6 +++---
debian/patches/03-build-libroot-bonjour-package.patch | 8 ++++----
debian/patches/04-build-libroot-html-package.patch | 2 +-
.../05-rename-package-libroot-proof-proofplayer.patch | 4 ++--
debian/patches/15-enable-extra-ldflags.patch | 4 ++--
debian/patches/38-fix-typo-ouput-output.patch | 11 -----------
debian/patches/40-fix-typo-lenght-length.patch | 10 +++++-----
debian/patches/54-fix-typo-auxilliary-auxiliary.patch | 2 +-
debian/patches/64-support-mipsel.patch | 2 +-
debian/patches/69-support-pythia8.patch | 2 +-
debian/patches/71-remove-root-plugin-proof-xproof.patch | 2 +-
debian/patches/74-kfreebsd.patch | 12 ++++++------
debian/patches/75-hardening-flag.patch | 2 +-
debian/patches/76-hurd-i386.patch | 12 ++++++------
15 files changed, 35 insertions(+), 46 deletions(-)
diff --git a/debian/patches/01-link-roota-against-sqlite.patch b/debian/patches/01-link-roota-against-sqlite.patch
index a4a000a..66e7590 100644
--- a/debian/patches/01-link-roota-against-sqlite.patch
+++ b/debian/patches/01-link-roota-against-sqlite.patch
@@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
-@@ -554,6 +554,10 @@
+@@ -573,6 +573,10 @@
STATICEXTRALIBS += $(LZMALIB)
endif
diff --git a/debian/patches/02-build-libroot-misc-memstat-package.patch b/debian/patches/02-build-libroot-misc-memstat-package.patch
index f77eb45..3e9b80d 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
-@@ -6431,6 +6431,7 @@
+@@ -6733,6 +6733,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_vc" = "xyes" && pl="$pl libroot-math-vc"
+ test "x$enable_vdt" = "xyes" && pl="$pl libroot-math-vdt"
test "x$enable_table" = "xyes" && pl="$pl libroot-misc-table"
- test "x$enable_ldap" = "xyes" && pl="$pl libroot-net-ldap"
- 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 eb3f76e..b559e90 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
-@@ -6433,6 +6433,7 @@
- test "x$enable_unuran" = "xyes" && pl="$pl libroot-math-unuran"
- test "x$enable_memstat" = "xyes" && pl="$pl libroot-misc-memstat"
+@@ -6737,6 +6737,7 @@
+ test "x$enable_vc" = "xyes" && pl="$pl libroot-math-vc"
+ test "x$enable_vdt" = "xyes" && pl="$pl libroot-math-vdt"
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_roofit" = "xyes" && pl="$pl libroot-roofit"
test "x$enable_asimage" = "xyes" && pl="$pl root-plugin-graf2d-asimage"
-@@ -6451,7 +6452,6 @@
+@@ -6755,7 +6756,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 b79cb3a..2109bc8 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
-@@ -6475,6 +6475,7 @@
+@@ -6779,6 +6779,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 305130b..d18e1fe 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
-@@ -6493,6 +6493,7 @@
+@@ -6797,6 +6797,7 @@
libroot-net \
libroot-net-auth \
libroot-proof \
@@ -8,7 +8,7 @@
libroot-tmva \
libroot-tree \
libroot-tree-treeplayer \
-@@ -6509,7 +6510,6 @@
+@@ -6813,7 +6814,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 74d17fb..9b8ab05 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
-@@ -6801,7 +6801,7 @@
+@@ -7105,7 +7105,7 @@
sed -e "s|@useconfig@|FALSE|" \
-e "s|@cflags@||" \
@@ -9,7 +9,7 @@
< Makefile.tmp > Makefile.tmpp
mv Makefile.tmpp Makefile.tmp
fi
-@@ -6940,7 +6940,7 @@
+@@ -7246,7 +7246,7 @@
-e "s|@ldapincdir@|$ldapincdir|" \
-e "s|@ldaplib@|$ldaplib|" \
-e "s|@ldaplibdir@|$ldaplibdir|" \
diff --git a/debian/patches/38-fix-typo-ouput-output.patch b/debian/patches/38-fix-typo-ouput-output.patch
index f8f1551..1a797c2 100644
--- a/debian/patches/38-fix-typo-ouput-output.patch
+++ b/debian/patches/38-fix-typo-ouput-output.patch
@@ -1,14 +1,3 @@
---- a/docbook/primer/your_first_ROOT_macro.xml
-+++ b/docbook/primer/your_first_ROOT_macro.xml
-@@ -53,7 +53,7 @@
- gStyle->SetOptStat(111111); // draw statistics on plots,
- // (0) for no output
- gStyle->SetOptFit(1111); // draw fit results on plot,
-- // (0) for no ouput
-+ // (0) for no output
- gStyle->SetPalette(53); // set color map
- gStyle->SetOptTitle(0); // suppress title box
- ...</programlisting>
--- a/tmva/test/PlotDecisionBoundary.C
+++ b/tmva/test/PlotDecisionBoundary.C
@@ -157,10 +157,10 @@
diff --git a/debian/patches/40-fix-typo-lenght-length.patch b/debian/patches/40-fix-typo-lenght-length.patch
index 35129c6..37d22c7 100644
--- a/debian/patches/40-fix-typo-lenght-length.patch
+++ b/debian/patches/40-fix-typo-lenght-length.patch
@@ -1,5 +1,5 @@
---- a/docbook/primer/macros/macro1.C
-+++ b/docbook/primer/macros/macro1.C
+--- a/documentation/primer/macros/macro1.C
++++ b/documentation/primer/macros/macro1.C
@@ -22,7 +22,7 @@
// Instance of the graph
@@ -9,8 +9,8 @@
// Make the plot estetically better
graph.SetMarkerStyle(kOpenCircle);
---- a/docbook/primer/macros/macro2.C
-+++ b/docbook/primer/macros/macro2.C
+--- a/documentation/primer/macros/macro2.C
++++ b/documentation/primer/macros/macro2.C
@@ -8,7 +8,7 @@
"%lg %lg %lg");
graph_expected.SetTitle(
@@ -22,7 +22,7 @@
graph_expected.DrawClone("E3AL"); // E3 draws the band
--- a/graf2d/cocoa/src/TGCocoa.mm
+++ b/graf2d/cocoa/src/TGCocoa.mm
-@@ -2745,7 +2745,7 @@
+@@ -2836,7 +2836,7 @@
//______________________________________________________________________________
Int_t TGCocoa::TextWidth(FontStruct_t font, const char *s, Int_t len)
{
diff --git a/debian/patches/54-fix-typo-auxilliary-auxiliary.patch b/debian/patches/54-fix-typo-auxilliary-auxiliary.patch
index 48c714f..71ebb8a 100644
--- a/debian/patches/54-fix-typo-auxilliary-auxiliary.patch
+++ b/debian/patches/54-fix-typo-auxilliary-auxiliary.patch
@@ -1,6 +1,6 @@
--- a/test/stressProof.cxx
+++ b/test/stressProof.cxx
-@@ -3748,7 +3748,7 @@
+@@ -3803,7 +3803,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/64-support-mipsel.patch b/debian/patches/64-support-mipsel.patch
index aed8d2e..fd00975 100644
--- a/debian/patches/64-support-mipsel.patch
+++ b/debian/patches/64-support-mipsel.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -1312,7 +1312,7 @@
+@@ -1356,7 +1356,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 4c40ad6..cdc32d4 100644
--- a/debian/patches/69-support-pythia8.patch
+++ b/debian/patches/69-support-pythia8.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -6451,6 +6451,7 @@
+@@ -6755,6 +6755,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 2a40d64..f863dea 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
-@@ -6511,7 +6511,6 @@
+@@ -6815,7 +6815,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 997b343..aa640f5 100644
--- a/debian/patches/74-kfreebsd.patch
+++ b/debian/patches/74-kfreebsd.patch
@@ -220,7 +220,7 @@
auxcflags=
--- a/configure
+++ b/configure
-@@ -1304,6 +1304,8 @@
+@@ -1348,6 +1348,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 ;;
-@@ -1950,7 +1952,7 @@
+@@ -2001,7 +2003,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
-@@ -4213,7 +4215,7 @@
+@@ -4296,7 +4298,7 @@
#
bonjourcppflags=
case $platform in
@@ -247,7 +247,7 @@
;;
*)
if test "x$enable_bonjour" = "xyes" ; then
-@@ -6294,7 +6296,7 @@
+@@ -6596,7 +6598,7 @@
message "Checking whether to build libMemStat"
if test "x$enable_memstat" = "xyes" || test ! "x$MEMSTAT" = "x"; then
case $arch in
@@ -305,7 +305,7 @@
typedef GLvoid (CALLBACK *tessfuncptr_t)();
--- a/graf3d/gl/src/TGLPadUtils.cxx
+++ b/graf3d/gl/src/TGLPadUtils.cxx
-@@ -556,7 +556,7 @@
+@@ -560,7 +560,7 @@
extern "C" {
#if defined(__APPLE_CC__) && __APPLE_CC__ > 4000 && __APPLE_CC__ < 5450 && !defined(__INTEL_COMPILER)
typedef GLvoid (*tess_t)(...);
@@ -316,7 +316,7 @@
typedef GLvoid (CALLBACK *tess_t)( );
--- a/graf3d/gl/src/TGLUtil.cxx
+++ b/graf3d/gl/src/TGLUtil.cxx
-@@ -1423,7 +1423,7 @@
+@@ -1424,7 +1424,7 @@
{
#if defined(__APPLE_CC__) && __APPLE_CC__ > 4000 && __APPLE_CC__ < 5450 && !defined(__INTEL_COMPILER)
typedef GLvoid (*tessfuncptr_t)(...);
diff --git a/debian/patches/75-hardening-flag.patch b/debian/patches/75-hardening-flag.patch
index 9f2a640..4d892c0 100644
--- a/debian/patches/75-hardening-flag.patch
+++ b/debian/patches/75-hardening-flag.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -6750,7 +6750,7 @@
+@@ -7054,7 +7054,7 @@
fi
sed -e "s|@useconfig@|TRUE|" \
diff --git a/debian/patches/76-hurd-i386.patch b/debian/patches/76-hurd-i386.patch
index 5f3b442..565095b 100644
--- a/debian/patches/76-hurd-i386.patch
+++ b/debian/patches/76-hurd-i386.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -1309,6 +1309,7 @@
+@@ -1353,6 +1353,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 ;;
-@@ -1952,7 +1953,7 @@
+@@ -2003,7 +2004,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
-@@ -4215,7 +4216,7 @@
+@@ -4298,7 +4299,7 @@
#
bonjourcppflags=
case $platform in
@@ -26,7 +26,7 @@
;;
*)
if test "x$enable_bonjour" = "xyes" ; then
-@@ -6296,7 +6297,7 @@
+@@ -6598,7 +6599,7 @@
message "Checking whether to build libMemStat"
if test "x$enable_memstat" = "xyes" || test ! "x$MEMSTAT" = "x"; then
case $arch in
@@ -69,7 +69,7 @@
typedef GLvoid (CALLBACK *tessfuncptr_t)();
--- a/graf3d/gl/src/TGLPadUtils.cxx
+++ b/graf3d/gl/src/TGLPadUtils.cxx
-@@ -556,7 +556,7 @@
+@@ -560,7 +560,7 @@
extern "C" {
#if defined(__APPLE_CC__) && __APPLE_CC__ > 4000 && __APPLE_CC__ < 5450 && !defined(__INTEL_COMPILER)
typedef GLvoid (*tess_t)(...);
@@ -80,7 +80,7 @@
typedef GLvoid (CALLBACK *tess_t)( );
--- a/graf3d/gl/src/TGLUtil.cxx
+++ b/graf3d/gl/src/TGLUtil.cxx
-@@ -1423,7 +1423,7 @@
+@@ -1424,7 +1424,7 @@
{
#if defined(__APPLE_CC__) && __APPLE_CC__ > 4000 && __APPLE_CC__ < 5450 && !defined(__INTEL_COMPILER)
typedef GLvoid (*tessfuncptr_t)(...);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/root-system.git
More information about the debian-science-commits
mailing list