rev 9883 - in kde-extras/tora/tags: . 1.3.22-7/debian 1.3.22-7/debian/patches

[Michael Meskes]

Author: meskes
Date: 2008-03-27 09:41:32 +0000 (Thu, 27 Mar 2008)
New Revision: 9883

Added:
   kde-extras/tora/tags/1.3.22-7/
   kde-extras/tora/tags/1.3.22-7/debian/patches/03_gcc43_includes.dpatch
Modified:
   kde-extras/tora/tags/1.3.22-7/debian/changelog
   kde-extras/tora/tags/1.3.22-7/debian/control
   kde-extras/tora/tags/1.3.22-7/debian/patches/00list
Log:
And 1.3.22-7


Copied: kde-extras/tora/tags/1.3.22-7 (from rev 9882, kde-extras/tora/tags/1.3.22-6)

Modified: kde-extras/tora/tags/1.3.22-7/debian/changelog
===================================================================
--- kde-extras/tora/tags/1.3.22-6/debian/changelog	2008-03-27 09:40:16 UTC (rev 9882)
+++ kde-extras/tora/tags/1.3.22-7/debian/changelog	2008-03-27 09:41:32 UTC (rev 9883)
@@ -1,3 +1,10 @@
+tora (1.3.22-7) unstable; urgency=low
+
+  * Removed build dependency on libqt3-compat-headers, closes: #464914
+  * Added include directives needed by gcc-4.3, closes: #462239
+
+ -- Michael Meskes <meskes at debian.org>  Mon, 11 Feb 2008 10:57:12 +0100
+
 tora (1.3.22-6) unstable; urgency=low
 
   * Fixed clean target yet again so building twice in a row is possible.

Modified: kde-extras/tora/tags/1.3.22-7/debian/control
===================================================================
--- kde-extras/tora/tags/1.3.22-6/debian/control	2008-03-27 09:40:16 UTC (rev 9882)
+++ kde-extras/tora/tags/1.3.22-7/debian/control	2008-03-27 09:41:32 UTC (rev 9883)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Michael Meskes <meskes at debian.org>
-Build-Depends: debhelper (>= 5), autotools-dev, libqt3-compat-headers, kdelibs4-dev, docbook-xml (>= 4.2), xsltproc, docbook-xsl, kdebase-bin, libqscintilla-dev, texinfo, dpatch
+Build-Depends: debhelper (>= 5), autotools-dev, kdelibs4-dev, docbook-xml (>= 4.2), xsltproc, docbook-xsl, kdebase-bin, libqscintilla-dev, texinfo, dpatch
 Standards-Version: 3.7.3
 
 Package: tora

Modified: kde-extras/tora/tags/1.3.22-7/debian/patches/00list
===================================================================
--- kde-extras/tora/tags/1.3.22-6/debian/patches/00list	2008-03-27 09:40:16 UTC (rev 9882)
+++ kde-extras/tora/tags/1.3.22-7/debian/patches/00list	2008-03-27 09:41:32 UTC (rev 9883)
@@ -1,3 +1,4 @@
 01_maximize
 02_cleantarget
+03_gcc43_includes
 

Added: kde-extras/tora/tags/1.3.22-7/debian/patches/03_gcc43_includes.dpatch
===================================================================
--- kde-extras/tora/tags/1.3.22-7/debian/patches/03_gcc43_includes.dpatch	                        (rev 0)
+++ kde-extras/tora/tags/1.3.22-7/debian/patches/03_gcc43_includes.dpatch	2008-03-27 09:41:32 UTC (rev 9883)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_gcc43_include.dpatch by Michael Meskes <meskes at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add missing include directives for gcc-4.3
+
+ at DPATCH@
+
+diff -ruN tora-1.3.22.orig/ext/loki/loki-0.1.6/src/SmallObj.cpp tora-1.3.22/ext/loki/loki-0.1.6/src/SmallObj.cpp
+--- tora-1.3.22.orig/ext/loki/loki-0.1.6/src/SmallObj.cpp	2006-10-17 22:05:42.000000000 +0200
++++ tora-1.3.22/ext/loki/loki-0.1.6/src/SmallObj.cpp	2008-02-11 11:04:08.000000000 +0100
+@@ -21,6 +21,7 @@
+ #include <cassert>
+ #include <vector>
+ #include <bitset>
++#include <limits.h>
+ 
+ //#define DO_EXTRA_LOKI_TESTS
+ //#define USE_NEW_TO_ALLOCATE