Control: tags 798079 + patch Control: tags 798079 + pending Dear maintainer,
I've prepared an NMU for utopia-documents (versioned as 2.4.4-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Cheers -- Sebastian Ramacher
diff -Nru utopia-documents-2.4.4/debian/changelog utopia-documents-2.4.4/debian/changelog
--- utopia-documents-2.4.4/debian/changelog 2014-10-24 14:39:17.000000000 +0200
+++ utopia-documents-2.4.4/debian/changelog 2015-10-12 20:45:41.000000000 +0200
@@ -1,3 +1,14 @@
+utopia-documents (2.4.4-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Steve Langasek ]
+ * debian/patches/boost1.58-qt4moc-compatibility.patch: compatibility
+ with boost 1.58.
+ * Add missing build-dependency on libqt4-opengl-dev. (Closes: #798079)
+
+ -- Sebastian Ramacher <sramac...@debian.org> Mon, 12 Oct 2015 20:45:40 +0200
+
utopia-documents (2.4.4-2) unstable; urgency=medium
* Updated copyright file to include additional licenses.
diff -Nru utopia-documents-2.4.4/debian/control utopia-documents-2.4.4/debian/control
--- utopia-documents-2.4.4/debian/control 2014-10-23 12:34:54.000000000 +0200
+++ utopia-documents-2.4.4/debian/control 2015-10-12 21:08:51.000000000 +0200
@@ -18,6 +18,7 @@
libqglviewer-dev | libqglviewer-qt4-dev,
libqjson-dev,
libqt4-dev,
+ libqt4-opengl-dev,
libqtwebkit-dev | libqt4-dev (<< 4:4.7),
libraptor-dev,
libssl-dev,
diff -Nru utopia-documents-2.4.4/debian/patches/boost1.58-qt4moc-compatibility.patch utopia-documents-2.4.4/debian/patches/boost1.58-qt4moc-compatibility.patch
--- utopia-documents-2.4.4/debian/patches/boost1.58-qt4moc-compatibility.patch 1970-01-01 01:00:00.000000000 +0100
+++ utopia-documents-2.4.4/debian/patches/boost1.58-qt4moc-compatibility.patch 2015-10-12 20:44:31.000000000 +0200
@@ -0,0 +1,527 @@
+Author: Steve Langasek <steve.langa...@ubuntu.com>
+Description: compatibility with boost 1.58
+ Newer versions of boost break compatibility with previous workarounds for
+ qt4 moc's inability to parse boost headers. Add a new workaround here.
+Index: utopia-documents-2.4.4/libutopia2/utopia2/extension.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libutopia2/utopia2/extension.h
++++ utopia-documents-2.4.4/libutopia2/utopia2/extension.h
+@@ -34,7 +34,9 @@
+
+ #include <utopia2/config.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+ #include <utopia2/extensionfactory.h>
+ #include <map>
+ #include <set>
+Index: utopia-documents-2.4.4/libpapyro/papyro/annotationprocessoraction.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libpapyro/papyro/annotationprocessoraction.h
++++ utopia-documents-2.4.4/libpapyro/papyro/annotationprocessoraction.h
+@@ -35,7 +35,9 @@
+ #include <spine/Annotation.h>
+ #include <spine/Document.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <QAction>
+ #include <QPointer>
+Index: utopia-documents-2.4.4/libpapyro/papyro/annotatorrunnable.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libpapyro/papyro/annotatorrunnable.h
++++ utopia-documents-2.4.4/libpapyro/papyro/annotatorrunnable.h
+@@ -34,7 +34,9 @@
+
+ #include <papyro/annotator.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <QObject>
+ #include <QRunnable>
+Index: utopia-documents-2.4.4/libpapyro/papyro/capabilities.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libpapyro/papyro/capabilities.h
++++ utopia-documents-2.4.4/libpapyro/papyro/capabilities.h
+@@ -34,7 +34,9 @@
+
+ #include <boost/scoped_ptr.hpp>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+ #include <boost/weak_ptr.hpp>
+ #include <spine/Capability.h>
+
+Index: utopia-documents-2.4.4/libpapyro/papyro/cslengine.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libpapyro/papyro/cslengine.h
++++ utopia-documents-2.4.4/libpapyro/papyro/cslengine.h
+@@ -35,7 +35,9 @@
+ #include <QObject>
+ #include <QString>
+ #include <QVariantMap>
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ namespace Papyro
+ {
+Index: utopia-documents-2.4.4/libpapyro/papyro/decorator.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libpapyro/papyro/decorator.h
++++ utopia-documents-2.4.4/libpapyro/papyro/decorator.h
+@@ -34,7 +34,9 @@
+
+ #include <papyro/config.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+ #include <utopia2/extension.h>
+
+ namespace Spine
+Index: utopia-documents-2.4.4/libpapyro/papyro/dispatcher.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libpapyro/papyro/dispatcher.h
++++ utopia-documents-2.4.4/libpapyro/papyro/dispatcher.h
+@@ -37,7 +37,9 @@
+ #include <spine/Annotation.h>
+ #include <spine/Document.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <QList>
+ #include <QMap>
+Index: utopia-documents-2.4.4/libpapyro/papyro/dispatcher_p.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libpapyro/papyro/dispatcher_p.h
++++ utopia-documents-2.4.4/libpapyro/papyro/dispatcher_p.h
+@@ -38,7 +38,9 @@
+ #include <spine/Annotation.h>
+ #include <spine/Document.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <QMutex>
+ #include <QQueue>
+Index: utopia-documents-2.4.4/libpapyro/papyro/documentmanager.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libpapyro/papyro/documentmanager.h
++++ utopia-documents-2.4.4/libpapyro/papyro/documentmanager.h
+@@ -36,7 +36,9 @@
+
+ #include <spine/Document.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <QObject>
+
+Index: utopia-documents-2.4.4/libpapyro/papyro/papyrotab_p.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libpapyro/papyro/papyrotab_p.h
++++ utopia-documents-2.4.4/libpapyro/papyro/papyrotab_p.h
+@@ -42,7 +42,9 @@
+ #include <utopia2/busagent.h>
+ #include <utopia2/networkaccessmanager.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <QObject>
+ #include <QQueue>
+Index: utopia-documents-2.4.4/libpapyro/papyro/papyrowindow_p.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libpapyro/papyro/papyrowindow_p.h
++++ utopia-documents-2.4.4/libpapyro/papyro/papyrowindow_p.h
+@@ -40,7 +40,9 @@
+ #include "utopia2/qt/abstractwindow_p.h"
+ #include <utopia2/networkaccessmanager.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <QModelIndex>
+ #include <QObject>
+Index: utopia-documents-2.4.4/libpapyro/papyro/printer.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libpapyro/papyro/printer.h
++++ utopia-documents-2.4.4/libpapyro/papyro/printer.h
+@@ -36,7 +36,9 @@
+
+ #include <spine/Document.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <QObject>
+ #include <QWidget>
+Index: utopia-documents-2.4.4/libpapyro/papyro/selectionprocessor.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libpapyro/papyro/selectionprocessor.h
++++ utopia-documents-2.4.4/libpapyro/papyro/selectionprocessor.h
+@@ -32,7 +32,9 @@
+ #ifndef PAPYRO_SELECTIONPROCESSOR_H
+ #define PAPYRO_SELECTIONPROCESSOR_H
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+ #include <papyro/abstractprocessor.h>
+ #include <papyro/config.h>
+ #include <spine/Document.h>
+Index: utopia-documents-2.4.4/libpapyro/papyro/selectionprocessoraction.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libpapyro/papyro/selectionprocessoraction.h
++++ utopia-documents-2.4.4/libpapyro/papyro/selectionprocessoraction.h
+@@ -32,7 +32,9 @@
+ #ifndef PAPYRO_SELECTIONPROCESSORACTION_H
+ #define PAPYRO_SELECTIONPROCESSORACTION_H
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+ #include <papyro/papyrowindow.h>
+
+ #include <QAction>
+Index: utopia-documents-2.4.4/libutopia2/utopia2/extensionfactory.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libutopia2/utopia2/extensionfactory.h
++++ utopia-documents-2.4.4/libutopia2/utopia2/extensionfactory.h
+@@ -41,7 +41,9 @@
+ #include <boost/preprocessor/punctuation/comma_if.hpp>
+ #include <boost/preprocessor/iteration/iterate.hpp>
+ #include <boost/scoped_ptr.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+ #include <map>
+ #include <set>
+ #include <string>
+Index: utopia-documents-2.4.4/libutopia2/utopia2/global.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libutopia2/utopia2/global.h
++++ utopia-documents-2.4.4/libutopia2/utopia2/global.h
+@@ -35,7 +35,9 @@
+ #include <utopia2/config.h>
+
+ #include <boost/scoped_ptr.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <QObject>
+ #include <QVariantMap>
+Index: utopia-documents-2.4.4/libutopia2/utopia2/networkaccessmanager.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libutopia2/utopia2/networkaccessmanager.h
++++ utopia-documents-2.4.4/libutopia2/utopia2/networkaccessmanager.h
+@@ -34,7 +34,9 @@
+
+ #include <utopia2/config.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <QNetworkAccessManager>
+
+Index: utopia-documents-2.4.4/libutopia2/utopia2/pluginmanager.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libutopia2/utopia2/pluginmanager.h
++++ utopia-documents-2.4.4/libutopia2/utopia2/pluginmanager.h
+@@ -34,7 +34,9 @@
+
+ #include <utopia2/plugin.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <QObject>
+
+Index: utopia-documents-2.4.4/libutopia2/utopia2/singleton.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libutopia2/utopia2/singleton.h
++++ utopia-documents-2.4.4/libutopia2/utopia2/singleton.h
+@@ -33,7 +33,9 @@
+ #define UTOPIA_SINGLETON_H
+
+ #include <boost/scoped_ptr.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <QThreadStorage>
+
+Index: utopia-documents-2.4.4/libutopia2_qt/utopia2/qt/abstractwindow_p.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libutopia2_qt/utopia2/qt/abstractwindow_p.h
++++ utopia-documents-2.4.4/libutopia2_qt/utopia2/qt/abstractwindow_p.h
+@@ -35,7 +35,9 @@
+ #include <utopia2/qt/config.h>
+ #include <utopia2/global.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <QObject>
+
+Index: utopia-documents-2.4.4/libutopia2_qt/utopia2/qt/cacheditem.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libutopia2_qt/utopia2/qt/cacheditem.h
++++ utopia-documents-2.4.4/libutopia2_qt/utopia2/qt/cacheditem.h
+@@ -34,7 +34,9 @@
+
+ #include <utopia2/qt/config.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <QDataStream>
+ #include <QDateTime>
+Index: utopia-documents-2.4.4/libutopia2_qt/utopia2/qt/flowbrowser_p.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libutopia2_qt/utopia2/qt/flowbrowser_p.h
++++ utopia-documents-2.4.4/libutopia2_qt/utopia2/qt/flowbrowser_p.h
+@@ -32,7 +32,9 @@
+ #ifndef Utopia_QT_FLOWBROWSER_P_H
+ #define Utopia_QT_FLOWBROWSER_P_H
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <QColor>
+ #include <QGLWidget>
+Index: utopia-documents-2.4.4/libutopia2_qt/utopia2/qt/imageformatmanager.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libutopia2_qt/utopia2/qt/imageformatmanager.h
++++ utopia-documents-2.4.4/libutopia2_qt/utopia2/qt/imageformatmanager.h
+@@ -33,7 +33,9 @@
+ #define Utopia_QT_IMAGEFORMATMANAGER_H
+
+ #include <boost/scoped_ptr.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <QObject>
+ #include <QPixmap>
+Index: utopia-documents-2.4.4/libutopia2_qt/utopia2/qt/uimanager.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libutopia2_qt/utopia2/qt/uimanager.h
++++ utopia-documents-2.4.4/libutopia2_qt/utopia2/qt/uimanager.h
+@@ -34,7 +34,9 @@
+
+ #include <utopia2/qt/config.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <QList>
+ #include <QMenuBar>
+Index: utopia-documents-2.4.4/libutopia2_qt/utopia2/qt/uimanager_p.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libutopia2_qt/utopia2/qt/uimanager_p.h
++++ utopia-documents-2.4.4/libutopia2_qt/utopia2/qt/uimanager_p.h
+@@ -34,7 +34,9 @@
+
+ #include <utopia2/qt/config.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+
+ #include <QList>
+ #include <QMenu>
+Index: utopia-documents-2.4.4/libspine/spine/Annotation.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libspine/spine/Annotation.h
++++ utopia-documents-2.4.4/libspine/spine/Annotation.h
+@@ -39,10 +39,12 @@
+ #include <vector>
+ #include <iostream>
+ #include <string>
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
+ #include <boost/weak_ptr.hpp>
+ #include <boost/scoped_ptr.hpp>
+ #include <boost/foreach.hpp>
++#endif
+
+ namespace Spine {
+
+Index: utopia-documents-2.4.4/libspine/spine/Capability.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libspine/spine/Capability.h
++++ utopia-documents-2.4.4/libspine/spine/Capability.h
+@@ -30,7 +30,9 @@
+ *
+ ****************************************************************************/
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+ #include <boost/weak_ptr.hpp>
+
+ namespace Spine {
+Index: utopia-documents-2.4.4/libspine/spine/Cursor.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libspine/spine/Cursor.h
++++ utopia-documents-2.4.4/libspine/spine/Cursor.h
+@@ -30,7 +30,9 @@
+ *
+ ****************************************************************************/
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+ #include <boost/tuple/tuple.hpp>
+ #include <string>
+ #include <iostream>
+Index: utopia-documents-2.4.4/libspine/spine/Document.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libspine/spine/Document.h
++++ utopia-documents-2.4.4/libspine/spine/Document.h
+@@ -39,9 +39,11 @@
+ #include <spine/TextSelection.h>
+ #include <spine/spineapi.h>
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
+ #include <boost/shared_array.hpp>
+ #include <boost/thread.hpp>
++#endif
+ #include <string>
+ #include <cstdlib>
+ #include <cwctype>
+Index: utopia-documents-2.4.4/libspine/spine/Image.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libspine/spine/Image.h
++++ utopia-documents-2.4.4/libspine/spine/Image.h
+@@ -35,7 +35,9 @@
+
+ #include <vector>
+ #include <algorithm>
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+ #include <boost/weak_ptr.hpp>
+
+ #if 0
+Index: utopia-documents-2.4.4/libspine/spine/Page.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libspine/spine/Page.h
++++ utopia-documents-2.4.4/libspine/spine/Page.h
+@@ -31,7 +31,9 @@
+ ****************************************************************************/
+ #include <spine/BoundingBox.h>
+ #include <spine/Image.h>
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+ #include <string>
+
+ namespace Spine
+Index: utopia-documents-2.4.4/libspine/spine/TextIterator.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libspine/spine/TextIterator.h
++++ utopia-documents-2.4.4/libspine/spine/TextIterator.h
+@@ -22,7 +22,9 @@
+ #ifndef TEXTITERATOR_INCL_
+ #define TEXTITERATOR_INCL_
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+ #include <string>
+ #include <iterator>
+ #include <vector>
+Index: utopia-documents-2.4.4/libspine/spine/TextSelection.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libspine/spine/TextSelection.h
++++ utopia-documents-2.4.4/libspine/spine/TextSelection.h
+@@ -22,7 +22,9 @@
+ #ifndef LIBSPINE_TEXTSELECTION_INCL_
+ #define LIBSPINE_TEXTSELECTION_INCL_
+
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+ #include <boost/weak_ptr.hpp>
+ #include <boost/shared_array.hpp>
+ #include <boost/tuple/tuple.hpp>
+Index: utopia-documents-2.4.4/libutopia2_qt/utopia2/qt/elidedlabel.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libutopia2_qt/utopia2/qt/elidedlabel.h
++++ utopia-documents-2.4.4/libutopia2_qt/utopia2/qt/elidedlabel.h
+@@ -35,7 +35,9 @@
+ #include <utopia2/qt/config.h>
+
+ #include <QLabel>
++#ifndef Q_MOC_RUN
+ #include <boost/scoped_ptr.hpp>
++#endif
+
+ namespace Utopia
+ {
+Index: utopia-documents-2.4.4/libspine/spine/Selection.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libspine/spine/Selection.h
++++ utopia-documents-2.4.4/libspine/spine/Selection.h
+@@ -22,7 +22,9 @@
+ #ifndef LIBSPINE_SELECTION_INCL_
+ #define LIBSPINE_SELECTION_INCL_
+
++#ifndef Q_MOC_RUN
+ #include <boost/foreach.hpp>
++#endif
+ #include <set>
+ #include <utility>
+
+Index: utopia-documents-2.4.4/libpapyro/papyro/documentview_p.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libpapyro/papyro/documentview_p.h
++++ utopia-documents-2.4.4/libpapyro/papyro/documentview_p.h
+@@ -39,7 +39,9 @@
+ #include <papyro/documentview.h>
+ #include <papyro/pageview.h>
+ #include <spine/Document.h>
++#ifndef Q_MOC_RUN
+ #include <boost/multi_array.hpp>
++#endif
+
+ #include <QMap>
+ #include <QObject>
+Index: utopia-documents-2.4.4/libutopia2/utopia2/threads.h
+===================================================================
+--- utopia-documents-2.4.4.orig/libutopia2/utopia2/threads.h
++++ utopia-documents-2.4.4/libutopia2/utopia2/threads.h
+@@ -37,7 +37,9 @@
+ #ifdef _Utopia_THREADED
+
+ #include <map>
++#ifndef Q_MOC_RUN
+ #include <boost/thread.hpp>
++#endif
+
+ #include <QString>
+
diff -Nru utopia-documents-2.4.4/debian/patches/series utopia-documents-2.4.4/debian/patches/series
--- utopia-documents-2.4.4/debian/patches/series 2014-10-23 15:29:43.000000000 +0200
+++ utopia-documents-2.4.4/debian/patches/series 2015-10-12 20:44:31.000000000 +0200
@@ -1,3 +1,4 @@
remove_xpdf_vms_files.diff
remove_incorrect_copyright_headers.diff
remove_unused_timeoutsocket.diff
+boost1.58-qt4moc-compatibility.patch
signature.asc
Description: PGP signature
