tags 724125 + patch
thanks
Dear maintainer,
I've prepared an NMU for xylib (versioned as 0.8-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
David
diff -Nru xylib-0.8/debian/changelog xylib-0.8/debian/changelog
--- xylib-0.8/debian/changelog 2011-03-24 11:05:11.0 -0400
+++ xylib-0.8/debian/changelog 2013-12-26 15:18:49.0 -0400
@@ -1,3 +1,11 @@
+xylib (0.8-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Change Spirit #includes to a new scheme, cherry-pick two upstream commits.
+Closes: #724125
+
+ -- David Prévot taf...@debian.org Thu, 26 Dec 2013 15:18:39 -0400
+
xylib (0.8-1) unstable; urgency=low
* New upstream release
diff -Nru xylib-0.8/debian/patches/change_Spirit_includes.patch xylib-0.8/debian/patches/change_Spirit_includes.patch
--- xylib-0.8/debian/patches/change_Spirit_includes.patch 1969-12-31 20:00:00.0 -0400
+++ xylib-0.8/debian/patches/change_Spirit_includes.patch 2013-12-26 14:59:08.0 -0400
@@ -0,0 +1,45 @@
+commit 49f76477de8cf455ee6f9486669e5b7e28ffd334
+Author: Marcin Wojdyr woj...@gmail.com
+Date: Thu Mar 24 21:55:14 2011 +
+
+to avoid warnings when compiling pdcif.cpp,
+change Spirit #includes to a new scheme (which is used since Boost 1.36)
+
+diff --git a/xylib/pdcif.cpp b/xylib/pdcif.cpp
+index 6818564..0e13655 100644
+--- a/xylib/pdcif.cpp
b/xylib/pdcif.cpp
+@@ -6,11 +6,24 @@
+ #include pdcif.h
+
+ #include map
+-
+ //#define BOOST_SPIRIT_DEBUG
++#include boost/version.hpp
++
++#if BOOST_VERSION = 103800
++
++#include boost/spirit/include/classic_core.hpp
++#include boost/spirit/include/classic_chset.hpp
++#include boost/spirit/include/classic_increment_actor.hpp
++using namespace boost::spirit::classic;
++
++#else
++
+ #include boost/spirit/core.hpp
+ #include boost/spirit/utility/chset.hpp
+ #include boost/spirit/actor/increment_actor.hpp
++using namespace boost::spirit;
++
++#endif
+
+ #include util.h
+
+@@ -19,7 +32,6 @@
+ #endif
+
+ using namespace std;
+-using namespace boost::spirit;
+ using namespace xylib::util;
+
+ namespace xylib {
diff -Nru xylib-0.8/debian/patches/check_for_boost_spirit_version.hpp.patch xylib-0.8/debian/patches/check_for_boost_spirit_version.hpp.patch
--- xylib-0.8/debian/patches/check_for_boost_spirit_version.hpp.patch 1969-12-31 20:00:00.0 -0400
+++ xylib-0.8/debian/patches/check_for_boost_spirit_version.hpp.patch 2013-12-26 15:00:00.0 -0400
@@ -0,0 +1,19 @@
+commit 9d21feedd55bd007eadb6633dd14ea3389b2c036
+Author: Marcin Wojdyr woj...@gmail.com
+Date: Tue Jul 24 19:16:45 2012 +
+
+configure.ac: check for boost/spirit/version.hpp instead of core.hpp
+
+because boost/spirit/core.hpp disappeared in Boost 1.50
+
+--- a/configure.ac
b/configure.ac
+@@ -65,7 +65,7 @@
+ [AC_MSG_ERROR([Could not find necessary C++ libs headers])])
+ AC_CHECK_HEADERS([boost/cstdint.hpp boost/detail/endian.hpp], [],
+ [AC_MSG_ERROR([Could not find necessary Boost headers])])
+-AC_CHECK_HEADERS([boost/spirit/core.hpp], [],
++AC_CHECK_HEADERS([boost/spirit/version.hpp], [],
+ [AC_MSG_ERROR([Boost::Spirit headers were not found.])])
+ AC_CHECK_HEADERS([sys/types.h sys/stat.h], [],
+ [AC_MSG_ERROR([Headers containg POSIX stat() are not found
diff -Nru xylib-0.8/debian/patches/series xylib-0.8/debian/patches/series
--- xylib-0.8/debian/patches/series 1969-12-31 20:00:00.0 -0400
+++ xylib-0.8/debian/patches/series 2013-12-26 15:13:30.0 -0400
@@ -0,0 +1,3 @@
+change_Spirit_includes.patch
+check_for_boost_spirit_version.hpp.patch
+update_configure.patch
diff -Nru xylib-0.8/debian/patches/update_configure.patch xylib-0.8/debian/patches/update_configure.patch
--- xylib-0.8/debian/patches/update_configure.patch 1969-12-31 20:00:00.0 -0400
+++ xylib-0.8/debian/patches/update_configure.patch 2013-12-26 15:18:33.0 -0400
@@ -0,0 +1,37 @@
+Description: Update configure
+ Manual update to match the previous commit
+Author: David Prévot taf...@debian.org
+Bug-Debian: http://bugs.debian.org/724125
+Last-Update: 2013-12-26
+--- a/config.h.in
b/config.h.in
+@@ -6,8 +6,8 @@
+ /* Define to 1 if you have the boost/detail/endian.hpp header file. */
+ #undef HAVE_BOOST_DETAIL_ENDIAN_HPP
+
+-/* Define to 1 if you have the boost/spirit/core.hpp header file. */
+-#undef HAVE_BOOST_SPIRIT_CORE_HPP
++/* Define to 1 if you have the boost/spirit/version.hpp header file. */
++#undef HAVE_BOOST_SPIRIT_VERSION_HPP
+
+ /* Define if bzlib is available */
+ #undef HAVE_BZLIB
+--- a/configure
b/configure
+@@ -14945,12 +14945,12 @@
+
+ done
+
+-for ac_header in boost/spirit/core.hpp
++for ac_header in boost/spirit/version.hpp
+ do :
+- ac_fn_cxx_check_header_mongrel $LINENO boost/spirit/core.hpp ac_cv_header_boost_spirit_core_hpp $ac_includes_default
+-if test x$ac_cv_header_boost_spirit_core_hpp = xyes; then :
++
