[root-system] 02/21: Refresh patchset.
Lifeng Sun
lifengsun-guest at moszumanska.debian.org
Sat Aug 2 08:35:04 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 b34cd468c364830fbafe257b9e2ca4851e8e007c
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Tue Dec 3 11:32:40 2013 +0800
Refresh patchset.
---
debian/changelog | 6 ++++++
debian/patches/01-link-roota-against-sqlite.patch | 4 +---
debian/patches/02-build-libroot-misc-memstat-package.patch | 2 +-
debian/patches/03-build-libroot-bonjour-package.patch | 4 ++--
debian/patches/04-build-libroot-html-package.patch | 2 +-
debian/patches/05-rename-package-libroot-proof-proofplayer.patch | 4 ++--
debian/patches/15-enable-extra-ldflags.patch | 6 +++---
debian/patches/38-fix-typo-ouput-output.patch | 8 ++------
debian/patches/40-fix-typo-lenght-length.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 | 8 ++++----
debian/patches/75-hardening-flag.patch | 2 +-
debian/patches/76-hurd-i386.patch | 8 ++++----
15 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1cd01d6..4a4a16f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+root-system (5.34.13-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Lifeng Sun <lifongsun at gmail.com> Tue, 03 Dec 2013 11:30:01 +0800
+
root-system (5.34.10-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/patches/01-link-roota-against-sqlite.patch b/debian/patches/01-link-roota-against-sqlite.patch
index a85d61e..973c092 100644
--- a/debian/patches/01-link-roota-against-sqlite.patch
+++ b/debian/patches/01-link-roota-against-sqlite.patch
@@ -1,8 +1,6 @@
-diff --git a/Makefile b/Makefile
-index fc3bd18..3adf40e 100644
--- a/Makefile
+++ b/Makefile
-@@ -539,6 +539,10 @@ CORELIBEXTRA += $(LZMALIB)
+@@ -541,6 +541,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 aefa83f..54c4ab1 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
-@@ -6220,6 +6220,7 @@
+@@ -6375,6 +6375,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 236c917..025e5bf 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
-@@ -6222,6 +6222,7 @@
+@@ -6377,6 +6377,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"
-@@ -6239,7 +6240,6 @@
+@@ -6394,7 +6395,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 cccf920..f473c56 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
-@@ -6263,6 +6263,7 @@
+@@ -6418,6 +6418,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 f43abba..746826a 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
-@@ -6281,6 +6281,7 @@
+@@ -6436,6 +6436,7 @@
libroot-net \
libroot-net-auth \
libroot-proof \
@@ -8,7 +8,7 @@
libroot-tmva \
libroot-tree \
libroot-tree-treeplayer \
-@@ -6297,7 +6298,6 @@
+@@ -6452,7 +6453,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 c573111..1ae41dc 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
-@@ -6589,7 +6589,7 @@
+@@ -6744,7 +6744,7 @@
sed -e "s|@useconfig@|FALSE|" \
-e "s|@cflags@||" \
@@ -9,7 +9,7 @@
< Makefile.tmp > Makefile.tmpp
mv Makefile.tmpp Makefile.tmp
fi
-@@ -6723,7 +6723,7 @@
+@@ -6880,7 +6880,7 @@
-e "s|@ldapincdir@|$ldapincdir|" \
-e "s|@ldaplib@|$ldaplib|" \
-e "s|@ldaplibdir@|$ldaplibdir|" \
@@ -17,4 +17,4 @@
+ -e "s|@ldflags@|$EXTRA_LDFLAGS|" \
-e "s|@libdir@|$libdir|" \
-e "s|@llvmconfig@|$llvmconfig|" \
- -e "s|@macrodir@|$macrodir|" \
+ -e "s|@macosxvers@|$macosxvers|" \
diff --git a/debian/patches/38-fix-typo-ouput-output.patch b/debian/patches/38-fix-typo-ouput-output.patch
index 1839969..f8f1551 100644
--- a/debian/patches/38-fix-typo-ouput-output.patch
+++ b/debian/patches/38-fix-typo-ouput-output.patch
@@ -1,8 +1,6 @@
-diff --git a/docbook/primer/your_first_ROOT_macro.xml b/docbook/primer/your_first_ROOT_macro.xml
-index a3cc0c6..60c62d6 100644
--- a/docbook/primer/your_first_ROOT_macro.xml
+++ b/docbook/primer/your_first_ROOT_macro.xml
-@@ -53,7 +53,7 @@ A small set of options can help making your plot nicer.
+@@ -53,7 +53,7 @@
gStyle->SetOptStat(111111); // draw statistics on plots,
// (0) for no output
gStyle->SetOptFit(1111); // draw fit results on plot,
@@ -11,11 +9,9 @@ index a3cc0c6..60c62d6 100644
gStyle->SetPalette(53); // set color map
gStyle->SetOptTitle(0); // suppress title box
...</programlisting>
-diff --git a/tmva/test/PlotDecisionBoundary.C b/tmva/test/PlotDecisionBoundary.C
-index 16f90c2..c163887 100755
--- a/tmva/test/PlotDecisionBoundary.C
+++ b/tmva/test/PlotDecisionBoundary.C
-@@ -158,10 +158,10 @@ void PlotDecisionBoundary( TString weightFile = "weights/TMVAClassification_BDT.
+@@ -157,10 +157,10 @@
// (Use the smallest number of misclassifications as criterion)
const Int_t nValBins=100;
Double_t sum = 0.;
diff --git a/debian/patches/40-fix-typo-lenght-length.patch b/debian/patches/40-fix-typo-lenght-length.patch
index f8a4d59..35129c6 100644
--- a/debian/patches/40-fix-typo-lenght-length.patch
+++ b/debian/patches/40-fix-typo-lenght-length.patch
@@ -22,7 +22,7 @@
graph_expected.DrawClone("E3AL"); // E3 draws the band
--- a/graf2d/cocoa/src/TGCocoa.mm
+++ b/graf2d/cocoa/src/TGCocoa.mm
-@@ -2686,7 +2686,7 @@
+@@ -2745,7 +2745,7 @@
//______________________________________________________________________________
Int_t TGCocoa::TextWidth(FontStruct_t font, const char *s, Int_t len)
{
diff --git a/debian/patches/64-support-mipsel.patch b/debian/patches/64-support-mipsel.patch
index d818009..c6efab7 100644
--- a/debian/patches/64-support-mipsel.patch
+++ b/debian/patches/64-support-mipsel.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -1230,7 +1230,7 @@
+@@ -1310,7 +1310,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 5928ac4..2388084 100644
--- a/debian/patches/69-support-pythia8.patch
+++ b/debian/patches/69-support-pythia8.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -6239,6 +6239,7 @@
+@@ -6394,6 +6394,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 0771410..4429401 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
-@@ -6299,7 +6299,6 @@
+@@ -6454,7 +6454,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 dca8ecd..96ad752 100644
--- a/debian/patches/74-kfreebsd.patch
+++ b/debian/patches/74-kfreebsd.patch
@@ -220,7 +220,7 @@
auxcflags=
--- a/configure
+++ b/configure
-@@ -1222,6 +1222,8 @@
+@@ -1302,6 +1302,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 ;;
-@@ -1833,7 +1835,7 @@
+@@ -1945,7 +1947,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
-@@ -4014,7 +4016,7 @@
+@@ -4169,7 +4171,7 @@
#
bonjourcppflags=
case $platform in
@@ -247,7 +247,7 @@
;;
*)
if test "x$enable_bonjour" = "xyes" ; then
-@@ -6083,7 +6085,7 @@
+@@ -6238,7 +6240,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 9043313..7f623aa 100644
--- a/debian/patches/75-hardening-flag.patch
+++ b/debian/patches/75-hardening-flag.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -6538,7 +6538,7 @@
+@@ -6693,7 +6693,7 @@
fi
sed -e "s|@useconfig@|TRUE|" \
diff --git a/debian/patches/76-hurd-i386.patch b/debian/patches/76-hurd-i386.patch
index 021e65f..9e5f458 100644
--- a/debian/patches/76-hurd-i386.patch
+++ b/debian/patches/76-hurd-i386.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -1227,6 +1227,7 @@
+@@ -1307,6 +1307,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 ;;
-@@ -1835,7 +1836,7 @@
+@@ -1947,7 +1948,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
-@@ -4016,7 +4017,7 @@
+@@ -4171,7 +4172,7 @@
#
bonjourcppflags=
case $platform in
@@ -26,7 +26,7 @@
;;
*)
if test "x$enable_bonjour" = "xyes" ; then
-@@ -6085,7 +6086,7 @@
+@@ -6240,7 +6241,7 @@
message "Checking whether to build libMemStat"
if test "x$enable_memstat" = "xyes" || test ! "x$MEMSTAT" = "x"; then
case $arch in
--
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