[root-system] 03/06: Refresh patchset.
Lifeng Sun
lifengsun-guest at alioth.debian.org
Wed Sep 4 01:19:14 UTC 2013
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 6032462bfc9e46c65c64285be6ee6209775c0a1b
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Fri Aug 30 07:37:56 2013 +0800
Refresh patchset.
---
debian/changelog | 6 ++++++
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 +-
.../05-rename-package-libroot-proof-proofplayer.patch | 4 ++--
debian/patches/15-enable-extra-ldflags.patch | 4 ++--
debian/patches/31-fix-typo-wheter-whether.patch | 2 +-
debian/patches/34-fix-typo-registerd-registered.patch | 4 +---
debian/patches/40-fix-typo-lenght-length.patch | 12 +++---------
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 | 8 ++++----
debian/patches/75-hardening-flag.patch | 2 +-
debian/patches/76-hurd-i386.patch | 8 ++++----
16 files changed, 32 insertions(+), 34 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ee41de3..88c9fe0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+root-system (5.34.10-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Lifeng Sun <lifongsun at gmail.com> Fri, 30 Aug 2013 07:37:24 +0800
+
root-system (5.34.09-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 fcd7e02..aefa83f 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
-@@ -6175,6 +6175,7 @@
+@@ -6220,6 +6220,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 89f67f1..236c917 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
-@@ -6177,6 +6177,7 @@
+@@ -6222,6 +6222,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"
-@@ -6194,7 +6195,6 @@
+@@ -6239,7 +6240,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 620cb23..cccf920 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
-@@ -6217,6 +6217,7 @@
+@@ -6263,6 +6263,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 ff99b70..f43abba 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
-@@ -6235,6 +6235,7 @@
+@@ -6281,6 +6281,7 @@
libroot-net \
libroot-net-auth \
libroot-proof \
@@ -8,7 +8,7 @@
libroot-tmva \
libroot-tree \
libroot-tree-treeplayer \
-@@ -6251,7 +6252,6 @@
+@@ -6297,7 +6298,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 ea74dd6..c573111 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
-@@ -6543,7 +6543,7 @@
+@@ -6589,7 +6589,7 @@
sed -e "s|@useconfig@|FALSE|" \
-e "s|@cflags@||" \
@@ -9,7 +9,7 @@
< Makefile.tmp > Makefile.tmpp
mv Makefile.tmpp Makefile.tmp
fi
-@@ -6677,7 +6677,7 @@
+@@ -6723,7 +6723,7 @@
-e "s|@ldapincdir@|$ldapincdir|" \
-e "s|@ldaplib@|$ldaplib|" \
-e "s|@ldaplibdir@|$ldaplibdir|" \
diff --git a/debian/patches/31-fix-typo-wheter-whether.patch b/debian/patches/31-fix-typo-wheter-whether.patch
index 7ce55c1..e27ddca 100644
--- a/debian/patches/31-fix-typo-wheter-whether.patch
+++ b/debian/patches/31-fix-typo-wheter-whether.patch
@@ -11,7 +11,7 @@
--- a/proof/proof/inc/TProof.h
+++ b/proof/proof/inc/TProof.h
-@@ -451,7 +451,7 @@
+@@ -453,7 +453,7 @@
};
enum EProofDataSetCommands {
kUploadDataSet = 1, //Upload a dataset
diff --git a/debian/patches/34-fix-typo-registerd-registered.patch b/debian/patches/34-fix-typo-registerd-registered.patch
index caddf8b..3478ae7 100644
--- a/debian/patches/34-fix-typo-registerd-registered.patch
+++ b/debian/patches/34-fix-typo-registerd-registered.patch
@@ -1,8 +1,6 @@
-diff --git a/roofit/roofit/inc/RooCFunction3Binding.h b/roofit/roofit/inc/RooCFunction3Binding.h
-index e2de14f..485af30 100644
--- a/roofit/roofit/inc/RooCFunction3Binding.h
+++ b/roofit/roofit/inc/RooCFunction3Binding.h
-@@ -166,7 +166,7 @@ template<class VO, class VI1, class VI2, class VI3>
+@@ -162,7 +162,7 @@
void RooCFunction3Ref<VO,VI1,VI2,VI3>::Streamer(TBuffer &R__b)
{
// Custom streamer for function pointer reference object. When writing,
diff --git a/debian/patches/40-fix-typo-lenght-length.patch b/debian/patches/40-fix-typo-lenght-length.patch
index 45dfa2b..f8a4d59 100644
--- a/debian/patches/40-fix-typo-lenght-length.patch
+++ b/debian/patches/40-fix-typo-lenght-length.patch
@@ -1,8 +1,6 @@
-diff --git a/docbook/primer/macros/macro1.C b/docbook/primer/macros/macro1.C
-index 08792ab..f79bceb 100644
--- a/docbook/primer/macros/macro1.C
+++ b/docbook/primer/macros/macro1.C
-@@ -22,7 +22,7 @@ void macro1(){
+@@ -22,7 +22,7 @@
// Instance of the graph
TGraphErrors graph(n_points,x_vals,y_vals,NULL,y_errs);
@@ -11,11 +9,9 @@ index 08792ab..f79bceb 100644
// Make the plot estetically better
graph.SetMarkerStyle(kOpenCircle);
-diff --git a/docbook/primer/macros/macro2.C b/docbook/primer/macros/macro2.C
-index 677d918..70d6bb4 100644
--- a/docbook/primer/macros/macro2.C
+++ b/docbook/primer/macros/macro2.C
-@@ -8,7 +8,7 @@ int macro2(){
+@@ -8,7 +8,7 @@
"%lg %lg %lg");
graph_expected.SetTitle(
"Measurement XYZ and Expectation;
@@ -24,11 +20,9 @@ index 677d918..70d6bb4 100644
Arb.Units");
graph_expected.SetFillColor(kYellow);
graph_expected.DrawClone("E3AL"); // E3 draws the band
-diff --git a/graf2d/cocoa/src/TGCocoa.mm b/graf2d/cocoa/src/TGCocoa.mm
-index 44d9d4a..a6c6384 100644
--- a/graf2d/cocoa/src/TGCocoa.mm
+++ b/graf2d/cocoa/src/TGCocoa.mm
-@@ -2673,7 +2673,7 @@ Bool_t TGCocoa::HasTTFonts() const
+@@ -2686,7 +2686,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 82078bd..48c714f 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
-@@ -3733,7 +3733,7 @@
+@@ -3748,7 +3748,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 aa2cb2d..d818009 100644
--- a/debian/patches/64-support-mipsel.patch
+++ b/debian/patches/64-support-mipsel.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -1228,7 +1228,7 @@
+@@ -1230,7 +1230,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 8f1bee5..5928ac4 100644
--- a/debian/patches/69-support-pythia8.patch
+++ b/debian/patches/69-support-pythia8.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -6194,6 +6194,7 @@
+@@ -6239,6 +6239,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 f337f6b..0771410 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
-@@ -6253,7 +6253,6 @@
+@@ -6299,7 +6299,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 54a7de4..dca8ecd 100644
--- a/debian/patches/74-kfreebsd.patch
+++ b/debian/patches/74-kfreebsd.patch
@@ -220,7 +220,7 @@
auxcflags=
--- a/configure
+++ b/configure
-@@ -1220,6 +1220,8 @@
+@@ -1222,6 +1222,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 ;;
-@@ -1828,7 +1830,7 @@
+@@ -1833,7 +1835,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
-@@ -3969,7 +3971,7 @@
+@@ -4014,7 +4016,7 @@
#
bonjourcppflags=
case $platform in
@@ -247,7 +247,7 @@
;;
*)
if test "x$enable_bonjour" = "xyes" ; then
-@@ -6038,7 +6040,7 @@
+@@ -6083,7 +6085,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 5e0768d..9043313 100644
--- a/debian/patches/75-hardening-flag.patch
+++ b/debian/patches/75-hardening-flag.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -6492,7 +6492,7 @@
+@@ -6538,7 +6538,7 @@
fi
sed -e "s|@useconfig@|TRUE|" \
diff --git a/debian/patches/76-hurd-i386.patch b/debian/patches/76-hurd-i386.patch
index fb1a178..021e65f 100644
--- a/debian/patches/76-hurd-i386.patch
+++ b/debian/patches/76-hurd-i386.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -1225,6 +1225,7 @@
+@@ -1227,6 +1227,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 ;;
-@@ -1830,7 +1831,7 @@
+@@ -1835,7 +1836,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
-@@ -3971,7 +3972,7 @@
+@@ -4016,7 +4017,7 @@
#
bonjourcppflags=
case $platform in
@@ -26,7 +26,7 @@
;;
*)
if test "x$enable_bonjour" = "xyes" ; then
-@@ -6040,7 +6041,7 @@
+@@ -6085,7 +6086,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