r5652 - in packages/trunk/langdrill/debian: . patches

[Ansgar Burchardt]

Author: ansgar-guest
Date: 2008-02-06 17:26:08 +0000 (Wed, 06 Feb 2008)
New Revision: 5652

Added:
   packages/trunk/langdrill/debian/patches/010_min_max.diff
Modified:
   packages/trunk/langdrill/debian/changelog
   packages/trunk/langdrill/debian/patches/series
Log:
import NMU for 0.3-6.1:
 * Apply patch 010_min_max.diff fixing build with GCC 4.2 (closes: #385521)


Modified: packages/trunk/langdrill/debian/changelog
===================================================================
--- packages/trunk/langdrill/debian/changelog	2008-02-06 14:31:07 UTC (rev 5651)
+++ packages/trunk/langdrill/debian/changelog	2008-02-06 17:26:08 UTC (rev 5652)
@@ -1,3 +1,10 @@
+langdrill (0.3-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Apply patch 010_min_max.diff fixing build with GCC 4.2 (closes: #385521).
+
+ -- Mark Brown <broonie at debian.org>  Sun, 02 Sep 2007 11:58:22 +0100
+
 langdrill (0.3-6) unstable; urgency=low
 
   * Moved packaging to the Debian Games Team.

Added: packages/trunk/langdrill/debian/patches/010_min_max.diff
===================================================================
--- packages/trunk/langdrill/debian/patches/010_min_max.diff	                        (rev 0)
+++ packages/trunk/langdrill/debian/patches/010_min_max.diff	2008-02-06 17:26:08 UTC (rev 5652)
@@ -0,0 +1,21 @@
+The minimum and maximum operators were never terribly portable and have
+been dropped by GCC 4.2.
+Index: langdrill-0.3/src/main.cc
+===================================================================
+--- langdrill-0.3.orig/src/main.cc	2007-07-15 12:52:38.000000000 +0100
++++ langdrill-0.3/src/main.cc	2007-07-15 12:54:01.000000000 +0100
+@@ -460,9 +460,11 @@
+   // keys. In such a case, we must take some precations
+   setActiveButtons( keyTotalNr );
+ 
+-  // is this minimum operator portable ??
+-  // it should work with egcs at least !!
+-  int cols = keyTotalNr <? atoi(_setup.quizzAnswerNr);
++  int cols;
++  if (keyTotalNr < atoi(_setup.quizzAnswerNr))
++    cols = keyTotalNr;
++  else
++    cols = atoi(_setup.quizzAnswerNr);
+ 
+   int rows = keyTotalNr;
+   int *set = new int[cols];

Modified: packages/trunk/langdrill/debian/patches/series
===================================================================
--- packages/trunk/langdrill/debian/patches/series	2008-02-06 14:31:07 UTC (rev 5651)
+++ packages/trunk/langdrill/debian/patches/series	2008-02-06 17:26:08 UTC (rev 5652)
@@ -1,6 +1,7 @@
 000_pkg_config.diff
 010_cxx_standard.diff
 010_vdk_updates.diff
+010_min_max.diff
 020_documentation.diff
 030_french_utf8.diff
 030_japanese.diff