[root-system] 05/21: fix globus header path.

[Lifeng Sun]

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 5bcbdb7ac7f34e2206471a0db4d751e15b8d61f7
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Mon Dec 16 16:58:08 2013 +0800

    fix globus header path.
---
 debian/changelog                        |  3 ++-
 debian/patches/06-globus-header.patch   | 21 +++++++++++++++++++++
 debian/patches/06-inline-function.patch | 32 --------------------------------
 debian/patches/series                   |  1 +
 4 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e7ea59..871f672 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ root-system (5.34.13-1) unstable; urgency=low
   * New upstream release.
   * libglew1.9 transition: build-depend on libglew-dev instead of
     libglew1.5-dev.
+  * Fix globus header path. (Closes: #730942)
 
- -- Lifeng Sun <lifongsun at gmail.com>  Sat, 14 Dec 2013 17:04:56 +0800
+ -- Lifeng Sun <lifongsun at gmail.com>  Mon, 16 Dec 2013 16:57:46 +0800
 
 root-system (5.34.10-1) unstable; urgency=low
 
diff --git a/debian/patches/06-globus-header.patch b/debian/patches/06-globus-header.patch
new file mode 100644
index 0000000..6c40eee
--- /dev/null
+++ b/debian/patches/06-globus-header.patch
@@ -0,0 +1,21 @@
+--- a/net/globusauth/Module.mk
++++ b/net/globusauth/Module.mk
+@@ -64,5 +64,5 @@
+ distclean::     distclean-$(MODNAME)
+ 
+ ##### extra rules ######
+-$(GLBSAUTHO): CXXFLAGS += $(GLOBUSINCDIR:%=-I%)
+-$(GLBPATCHO): CFLAGS += $(GLBPATCHFLAGS) $(GLOBUSINCDIR:%=-I%)
++$(GLBSAUTHO): CXXFLAGS += $(shell pkg-config --cflags globus-core)
++$(GLBPATCHO): CFLAGS += $(GLBPATCHFLAGS) $(shell pkg-config --cflags globus-core)
+--- a/net/rpdutils/Module.mk
++++ b/net/rpdutils/Module.mk
+@@ -64,7 +64,7 @@
+ 
+ # use Globus for authentication
+ ifneq ($(GLOBUSLIB),)
+-GLBSFLAGS     := $(GLOBUSINCDIR:%=-I%)
++GLBSFLAGS     := $(shell pkg-config --cflags globus-core)
+ GLBSLIBS      := $(GLOBUSLIBDIR) $(GLOBUSLIB)
+ SRVAUTHS      += $(MODDIRS)/globus.cxx
+ SRVAUTHO      += $(call stripsrc,$(MODDIRS)/globus.o)
diff --git a/debian/patches/06-inline-function.patch b/debian/patches/06-inline-function.patch
deleted file mode 100644
index b33e625..0000000
--- a/debian/patches/06-inline-function.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/math/mathcore/inc/Math/ChebyshevPol.h b/math/mathcore/inc/Math/ChebyshevPol.h
-index 13a4fac..6d993f4 100644
---- a/math/mathcore/inc/Math/ChebyshevPol.h
-+++ b/math/mathcore/inc/Math/ChebyshevPol.h
-@@ -37,19 +37,19 @@ namespace ROOT {
-             return  (2.0 * x * T<N-1>(x)) - T<N-2>(x);
-          }
- 
--         template<> double T<0> (double );
--         template<> double T<1> (double x);
--         template<> double T<2> (double x);
--         template<> double T<3> (double x);
-+         template<> inline double T<0> (double );
-+         template<> inline double T<1> (double x);
-+         template<> inline double T<2> (double x);
-+         template<> inline double T<3> (double x);
- 
-          template<int N> double Eval(double x, const double * c) { 
-             return c[N]*T<N>(x) + Eval<N-1>(x,c);
-          }
-       
--         template<> double Eval<0> (double , const double *c);
--         template<> double Eval<1> (double x, const double *c);
--         template<> double Eval<2> (double x, const double *c);
--         template<> double Eval<3> (double x, const double *c);
-+         template<> inline double Eval<0> (double , const double *c);
-+         template<> inline double Eval<1> (double x, const double *c);
-+         template<> inline double Eval<2> (double x, const double *c);
-+         template<> inline double Eval<3> (double x, const double *c);
- 
-       } // end namespace Chebyshev
- 
diff --git a/debian/patches/series b/debian/patches/series
index bcc415c..7adbed5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@
 03-build-libroot-bonjour-package.patch
 04-build-libroot-html-package.patch
 05-rename-package-libroot-proof-proofplayer.patch
+06-globus-header.patch
 15-enable-extra-ldflags.patch
 19-remove-embedded-library-gl2ps.patch
 21-fix-manpage-hyphen.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/root-system.git