tags 653625 + pending thanks Dear maintainer,
I've prepared an NMU for avogadro (versioned as 1.0.3-3.1) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Regards. -Steve
diff -Nru avogadro-1.0.3/debian/changelog avogadro-1.0.3/debian/changelog --- avogadro-1.0.3/debian/changelog 2011-12-05 15:20:34.000000000 -0600 +++ avogadro-1.0.3/debian/changelog 2012-01-28 05:36:13.000000000 -0600 @@ -1,3 +1,12 @@ +avogadro (1.0.3-3.1) unstable; urgency=low + + * Non-Maintainer Upload. + + * patches/boost148.patch: New. Work around moc limitation. Closes: + #653625. + + -- Steve M. Robbins <s...@debian.org> Sat, 28 Jan 2012 05:36:13 -0600 + avogadro (1.0.3-3) unstable; urgency=low * debian/control (Build-Depends): Added libgl2ps-dev. diff -Nru avogadro-1.0.3/debian/patches/boost148.patch avogadro-1.0.3/debian/patches/boost148.patch --- avogadro-1.0.3/debian/patches/boost148.patch 1969-12-31 18:00:00.000000000 -0600 +++ avogadro-1.0.3/debian/patches/boost148.patch 2012-01-28 05:33:12.000000000 -0600 @@ -0,0 +1,61 @@ +Description: Work around moc limitations + Some parts of Boost, introduced in Boost 1.48 are not + understood by the limited C++ parser of moc. This + patch defines header guards that prevent the troublesome boost + headers from being processed. +Bug-Debian: #653625 +Author: Tobias Frost <t...@coldtobi.de> +Reviewed-By: Steve Robbins <s...@debian.org> + +--- a/libavogadro/src/pythonengine_p.h ++++ b/libavogadro/src/pythonengine_p.h +@@ -25,6 +25,10 @@ + #ifndef PYTHONENGINE_H + #define PYTHONENGINE_H + ++#ifdef Q_MOC_RUN ++#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED ++#endif ++ + #include <avogadro/global.h> + #include <avogadro/engine.h> + #include <boost/python.hpp> +--- a/libavogadro/src/pythonextension_p.h ++++ b/libavogadro/src/pythonextension_p.h +@@ -26,6 +26,10 @@ + #ifndef PYTHONEXTENSION_H + #define PYTHONEXTENSION_H + ++#ifdef Q_MOC_RUN ++#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED ++#endif ++ + #include <avogadro/extension.h> + #include <avogadro/primitive.h> + #include <avogadro/glwidget.h> +--- a/libavogadro/src/pythontool_p.h ++++ b/libavogadro/src/pythontool_p.h +@@ -25,6 +25,10 @@ + #ifndef PYTHONTOOL_H + #define PYTHONTOOL_H + ++#ifdef Q_MOC_RUN ++#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED ++#endif ++ + #include <avogadro/global.h> + #include <avogadro/tool.h> + #include <boost/python.hpp> +--- a/libavogadro/src/extensions/pythonterminal.h ++++ b/libavogadro/src/extensions/pythonterminal.h +@@ -23,6 +23,10 @@ + #ifndef PYTHONTERMINAL_H + #define PYTHONTERMINAL_H + ++#ifdef Q_MOC_RUN ++#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED ++#endif ++ + #include <avogadro/extension.h> + #include <avogadro/primitive.h> + #include <avogadro/glwidget.h> diff -Nru avogadro-1.0.3/debian/patches/series avogadro-1.0.3/debian/patches/series --- avogadro-1.0.3/debian/patches/series 2011-12-05 15:20:26.000000000 -0600 +++ avogadro-1.0.3/debian/patches/series 2012-01-22 14:54:40.000000000 -0600 @@ -1,2 +1,3 @@ link_to_libgl2ps.patch nwchem_input_ccsd.patch +boost148.patch
signature.asc
Description: Digital signature
