[Pkg-gstreamer-commits] [SCM] UNNAMED PROJECT branch, master, updated. debian/0.10.1-2-7-g9c96dba

[George Kiagiadakis]

The following commit has been merged in the master branch:
commit cf613e457d8ef84333cfc5004833606433552b4f
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Sat May 5 13:37:59 2012 +0300

    Remove patches/boost1.48.patch: No longer needed, the fix is upstream.

diff --git a/debian/changelog b/debian/changelog
index cc220f9..5ecab88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qt-gstreamer (0.10.2-1) unstable; urgency=low
 
   * New upstream release.
     - Individual glib headers are no longer used (Closes: #665602)
+  * Remove patches/boost1.48.patch: No longer needed, the fix is upstream.
 
  -- George Kiagiadakis <kiagiadakis.george at gmail.com>  Sat, 05 May 2012 13:34:04 +0300
 
diff --git a/debian/patches/boost1.48.patch b/debian/patches/boost1.48.patch
deleted file mode 100644
index c48eec6..0000000
--- a/debian/patches/boost1.48.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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: #653796
-Author: Tobias Frost <tobi at coldtobi.de>
-Reviewed-By: Steve Robbins <smr at debian.org>
-
---- a/src/QGlib/connect.h
-+++ b/src/QGlib/connect.h
-@@ -19,6 +19,11 @@
- #ifndef QGLIB_CONNECT_H
- #define QGLIB_CONNECT_H
- 
-+#ifdef Q_MOC_RUN
-+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
-+#endif
-+
-+
- #include "global.h"
- #include "quark.h"
- #include <QtCore/QObject>
---- a/src/QGst/bin.h
-+++ b/src/QGst/bin.h
-@@ -19,6 +19,10 @@
- #ifndef QGST_BIN_H
- #define QGST_BIN_H
- 
-+#ifdef Q_MOC_RUN
-+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
-+#endif
-+
- #include "element.h"
- #include "childproxy.h"
- 
---- a/src/QGst/Ui/videowidget.h
-+++ b/src/QGst/Ui/videowidget.h
-@@ -19,6 +19,10 @@
- #ifndef QGST_UI_VIDEOWIDGET_H
- #define QGST_UI_VIDEOWIDGET_H
- 
-+#ifdef Q_MOC_RUN
-+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
-+#endif
-+
- #include "global.h"
- #include "../element.h"
- #include <QtGui/QWidget>
diff --git a/debian/patches/series b/debian/patches/series
index b6d72e2..f02d583 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 00_no_latex_docs.diff
-boost1.48.patch
-

-- 
UNNAMED PROJECT