r2028 - in vdr/vdr-plugin-weather/trunk/debian: . patches

[Thomas Schmidt]

Author: tschmidt
Date: 2006-03-14 16:15:50 +0000 (Tue, 14 Mar 2006)
New Revision: 2028

Added:
   vdr/vdr-plugin-weather/trunk/debian/patches/03_g++4.1-fix.dpatch
Modified:
   vdr/vdr-plugin-weather/trunk/debian/changelog
   vdr/vdr-plugin-weather/trunk/debian/patches/00list
Log:
vdr-plugin-weather: added 03_g++4.1.dpatch

Modified: vdr/vdr-plugin-weather/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-weather/trunk/debian/changelog	2006-03-14 16:04:14 UTC (rev 2027)
+++ vdr/vdr-plugin-weather/trunk/debian/changelog	2006-03-14 16:15:50 UTC (rev 2028)
@@ -1,3 +1,13 @@
+vdr-plugin-weather (0.2.1e-25) unstable; urgency=low
+
+  * NOT RELEASED YET
+
+  * Thomas Schmidt <tschmidt at debian.org>
+    - Added 03_g++4.1-fix.dpatch to fix FTBFS with g++4.1, many thanks
+      to Martin Michlmayr (closes: #356440)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Tue, 14 Mar 2006 17:11:15 +0100
+
 vdr-plugin-weather (0.2.1e-24) unstable; urgency=low
 
   * Tobias Grimm <tg at e-tobi.net>

Modified: vdr/vdr-plugin-weather/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-weather/trunk/debian/patches/00list	2006-03-14 16:04:14 UTC (rev 2027)
+++ vdr/vdr-plugin-weather/trunk/debian/patches/00list	2006-03-14 16:15:50 UTC (rev 2028)
@@ -1,2 +1,3 @@
 01_Makefile-fPIC-fix
 02_vdr_1.3-fix
+03_g++4.1-fix

Added: vdr/vdr-plugin-weather/trunk/debian/patches/03_g++4.1-fix.dpatch
===================================================================
--- vdr/vdr-plugin-weather/trunk/debian/patches/03_g++4.1-fix.dpatch	2006-03-14 16:04:14 UTC (rev 2027)
+++ vdr/vdr-plugin-weather/trunk/debian/patches/03_g++4.1-fix.dpatch	2006-03-14 16:15:50 UTC (rev 2028)
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 03_g++4.1-fix.dpatch by Martin Michlmayr <tbm at cyrius.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes FTBFS with g++4.1 (closes: #356440)
+
+ at DPATCH@
+diff -urNad vdr-plugin-weather-0.2.1e/display.h /tmp/dpep.hTuTzZ/vdr-plugin-weather-0.2.1e/display.h
+--- vdr-plugin-weather-0.2.1e/display.h	2006-03-14 17:14:01.411816750 +0100
++++ /tmp/dpep.hTuTzZ/vdr-plugin-weather-0.2.1e/display.h	2006-03-14 17:14:17.580827250 +0100
+@@ -25,9 +25,9 @@
+ 		void initBorderBitmap(cBitmap &b, tColor col);
+ 		void drawWindRose(cOsd *osd, int degree, int x, int y);
+ 		void drawWeather(cOsd *osd, Decoded_METAR *mptr, int x, int y);
+-		std::string cWeatherOsd::getIntensity(const std::string weather);
+-		std::string cWeatherOsd::getPrecipitation(const std::string weather);
+-		std::string cWeatherOsd::getCoverage(const std::string weather);
++		std::string getIntensity(const std::string weather);
++		std::string getPrecipitation(const std::string weather);
++		std::string getCoverage(const std::string weather);
+ };
+ 
+ #endif //WEATHER_DISPLAY_H


Property changes on: vdr/vdr-plugin-weather/trunk/debian/patches/03_g++4.1-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *