[root-system] 08/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 e8316e50e9655918f7b966d139d1b22894f10a8d
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Tue Dec 17 12:04:01 2013 +0800
Refresh patchset.
---
debian/changelog | 4 ++--
debian/patches/01-link-roota-against-sqlite.patch | 2 +-
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 | 4 ++--
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 ++++----
13 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fbe47ac..2f3dcf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-root-system (5.34.13-1) unstable; urgency=low
+root-system (5.34.14-1) unstable; urgency=low
* New upstream release.
* libglew1.9 transition: build-depend on libglew-dev instead of
@@ -8,7 +8,7 @@ root-system (5.34.13-1) unstable; urgency=low
<pascal.devuyst at gmail.com>. (Closes: #726104, #726106, #726108,
#726109)
- -- Lifeng Sun <lifongsun at gmail.com> Mon, 16 Dec 2013 16:57:46 +0800
+ -- Lifeng Sun <lifongsun at gmail.com> Tue, 17 Dec 2013 12:02:30 +0800
root-system (5.34.10-1) unstable; urgency=low
diff --git a/debian/patches/01-link-roota-against-sqlite.patch b/debian/patches/01-link-roota-against-sqlite.patch
index 973c092..a4a000a 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
-@@ -541,6 +541,10 @@
+@@ -554,6 +554,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 54c4ab1..f77eb45 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
-@@ -6375,6 +6375,7 @@
+@@ -6431,6 +6431,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 025e5bf..eb3f76e 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
-@@ -6377,6 +6377,7 @@
+@@ -6433,6 +6433,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"
-@@ -6394,7 +6395,6 @@
+@@ -6451,7 +6452,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 f473c56..b79cb3a 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
-@@ -6418,6 +6418,7 @@
+@@ -6475,6 +6475,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 746826a..305130b 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
-@@ -6436,6 +6436,7 @@
+@@ -6493,6 +6493,7 @@
libroot-net \
libroot-net-auth \
libroot-proof \
@@ -8,7 +8,7 @@
libroot-tmva \
libroot-tree \
libroot-tree-treeplayer \
-@@ -6452,7 +6453,6 @@
+@@ -6509,7 +6510,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 1ae41dc..74d17fb 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
-@@ -6744,7 +6744,7 @@
+@@ -6801,7 +6801,7 @@
sed -e "s|@useconfig@|FALSE|" \
-e "s|@cflags@||" \
@@ -9,7 +9,7 @@
< Makefile.tmp > Makefile.tmpp
mv Makefile.tmpp Makefile.tmp
fi
-@@ -6880,7 +6880,7 @@
+@@ -6940,7 +6940,7 @@
-e "s|@ldapincdir@|$ldapincdir|" \
-e "s|@ldaplib@|$ldaplib|" \
-e "s|@ldaplibdir@|$ldaplibdir|" \
diff --git a/debian/patches/64-support-mipsel.patch b/debian/patches/64-support-mipsel.patch
index c6efab7..aed8d2e 100644
--- a/debian/patches/64-support-mipsel.patch
+++ b/debian/patches/64-support-mipsel.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -1310,7 +1310,7 @@
+@@ -1312,7 +1312,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 2388084..4c40ad6 100644
--- a/debian/patches/69-support-pythia8.patch
+++ b/debian/patches/69-support-pythia8.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -6394,6 +6394,7 @@
+@@ -6451,6 +6451,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 4429401..2a40d64 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
-@@ -6454,7 +6454,6 @@
+@@ -6511,7 +6511,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 96ad752..997b343 100644
--- a/debian/patches/74-kfreebsd.patch
+++ b/debian/patches/74-kfreebsd.patch
@@ -220,7 +220,7 @@
auxcflags=
--- a/configure
+++ b/configure
-@@ -1302,6 +1302,8 @@
+@@ -1304,6 +1304,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 ;;
-@@ -1945,7 +1947,7 @@
+@@ -1950,7 +1952,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
-@@ -4169,7 +4171,7 @@
+@@ -4213,7 +4215,7 @@
#
bonjourcppflags=
case $platform in
@@ -247,7 +247,7 @@
;;
*)
if test "x$enable_bonjour" = "xyes" ; then
-@@ -6238,7 +6240,7 @@
+@@ -6294,7 +6296,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 7f623aa..9f2a640 100644
--- a/debian/patches/75-hardening-flag.patch
+++ b/debian/patches/75-hardening-flag.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -6693,7 +6693,7 @@
+@@ -6750,7 +6750,7 @@
fi
sed -e "s|@useconfig@|TRUE|" \
diff --git a/debian/patches/76-hurd-i386.patch b/debian/patches/76-hurd-i386.patch
index 9e5f458..5f3b442 100644
--- a/debian/patches/76-hurd-i386.patch
+++ b/debian/patches/76-hurd-i386.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -1307,6 +1307,7 @@
+@@ -1309,6 +1309,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 ;;
-@@ -1947,7 +1948,7 @@
+@@ -1952,7 +1953,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
-@@ -4171,7 +4172,7 @@
+@@ -4215,7 +4216,7 @@
#
bonjourcppflags=
case $platform in
@@ -26,7 +26,7 @@
;;
*)
if test "x$enable_bonjour" = "xyes" ; then
-@@ -6240,7 +6241,7 @@
+@@ -6296,7 +6297,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