r16010 - in packages/trunk/libclaw/debian: . patches

[Markus Koschany]

Author: apo
Date: 2017-08-17 20:18:12 +0000 (Thu, 17 Aug 2017)
New Revision: 16010

Added:
   packages/trunk/libclaw/debian/patches/gcc7.patch
Modified:
   packages/trunk/libclaw/debian/changelog
   packages/trunk/libclaw/debian/compat
   packages/trunk/libclaw/debian/control
   packages/trunk/libclaw/debian/patches/series
   packages/trunk/libclaw/debian/rules
Log:
Release libclaw 1.7.4-2


Modified: packages/trunk/libclaw/debian/changelog
===================================================================
--- packages/trunk/libclaw/debian/changelog	2017-08-03 09:04:04 UTC (rev 16009)
+++ packages/trunk/libclaw/debian/changelog	2017-08-17 20:18:12 UTC (rev 16010)
@@ -1,3 +1,12 @@
+libclaw (1.7.4-2) unstable; urgency=medium
+
+  * Team upload.
+  * Add gcc7.patch and fix FTBFS with GCC 7.
+  * Switch to compat level 10.
+  * Declare compliance with Debian Policy 4.0.1.
+
+ -- Markus Koschany <apo at debian.org>  Thu, 17 Aug 2017 22:11:06 +0200
+
 libclaw (1.7.4-1) unstable; urgency=medium
 
   * Team upload.

Modified: packages/trunk/libclaw/debian/compat
===================================================================
--- packages/trunk/libclaw/debian/compat	2017-08-03 09:04:04 UTC (rev 16009)
+++ packages/trunk/libclaw/debian/compat	2017-08-17 20:18:12 UTC (rev 16010)
@@ -1 +1 @@
-9
+10

Modified: packages/trunk/libclaw/debian/control
===================================================================
--- packages/trunk/libclaw/debian/control	2017-08-03 09:04:04 UTC (rev 16009)
+++ packages/trunk/libclaw/debian/control	2017-08-17 20:18:12 UTC (rev 16010)
@@ -8,14 +8,14 @@
  Gonéri Le Bouder <goneri at rulezlan.org>
 Build-Depends:
  cmake (>= 2.8),
- debhelper (>= 9),
+ debhelper (>= 10),
  docbook-to-man,
  doxygen (>= 1.5),
  gettext (>= 0.17),
  libboost-dev (>= 1.42),
  libjpeg-dev,
  libpng-dev
-Standards-Version: 3.9.8
+Standards-Version: 4.0.1
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/libclaw/
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/libclaw/
 Homepage: http://libclaw.sourceforge.net

Added: packages/trunk/libclaw/debian/patches/gcc7.patch
===================================================================
--- packages/trunk/libclaw/debian/patches/gcc7.patch	                        (rev 0)
+++ packages/trunk/libclaw/debian/patches/gcc7.patch	2017-08-17 20:18:12 UTC (rev 16010)
@@ -0,0 +1,41 @@
+From: Markus Koschany <apo at debian.org>
+Date: Thu, 17 Aug 2017 22:06:24 +0200
+Subject: gcc7
+
+Fix FTBFS with GCC7.
+
+Bug-Debian: https://bugs.debian.org/853488
+Origin: https://src.fedoraproject.org/rpms/libclaw/blob/master/f/libclaw-1.7.4-gcc7.patch
+---
+ claw/impl/box_2d.tpp    | 4 ++--
+ claw/impl/rectangle.tpp | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/claw/impl/box_2d.tpp b/claw/impl/box_2d.tpp
+index e4b6936..71f3883 100644
+--- a/claw/impl/box_2d.tpp
++++ b/claw/impl/box_2d.tpp
+@@ -136,8 +136,8 @@ template<typename U>
+ claw::math::box_2d<U> claw::math::box_2d<T>::cast_value_type_to() const
+ {
+   return claw::math::box_2d<U>
+-    ( first_point.cast_value_type_to<U>(),
+-      second_point.cast_value_type_to<U>() );
++    ( first_point.template cast_value_type_to<U>(),
++      second_point.template cast_value_type_to<U>() );
+ } // box_2d::cast_value_type_to()
+ 
+ /*----------------------------------------------------------------------------*/
+diff --git a/claw/impl/rectangle.tpp b/claw/impl/rectangle.tpp
+index 9e6f14a..3c3c8f3 100644
+--- a/claw/impl/rectangle.tpp
++++ b/claw/impl/rectangle.tpp
+@@ -140,7 +140,7 @@ template<typename U>
+ claw::math::rectangle<U> claw::math::rectangle<T>::cast_value_type_to() const
+ {
+   return claw::math::rectangle<U>
+-    ( position.cast_value_type_to<U>(), (U)width, (U)height );
++    ( position.template cast_value_type_to<U>(), (U)width, (U)height );
+ } // rectangle::cast_value_type_to()
+ 
+ /*----------------------------------------------------------------------------*/

Modified: packages/trunk/libclaw/debian/patches/series
===================================================================
--- packages/trunk/libclaw/debian/patches/series	2017-08-03 09:04:04 UTC (rev 16009)
+++ packages/trunk/libclaw/debian/patches/series	2017-08-17 20:18:12 UTC (rev 16010)
@@ -2,3 +2,4 @@
 spelling-errors.patch
 gcc6-ftbfs.patch
 boost1.61.patch
+gcc7.patch

Modified: packages/trunk/libclaw/debian/rules
===================================================================
--- packages/trunk/libclaw/debian/rules	2017-08-03 09:04:04 UTC (rev 16009)
+++ packages/trunk/libclaw/debian/rules	2017-08-17 20:18:12 UTC (rev 16010)
@@ -3,7 +3,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --buildsystem=cmake --parallel
+	dh $@ --buildsystem=cmake
 
 override_dh_installman:
 	docbook-to-man doc/man/claw-config.man.sgml > debian/claw-config.1