Bug#358881: NMU diff

[Martin Michlmayr]

tags 358881 + pending
thanks

I've uploaded the following NMU to delayed-2.


diff -u dasher-3.2.18/debian/changelog dasher-3.2.18/debian/changelog
--- dasher-3.2.18/debian/changelog
+++ dasher-3.2.18/debian/changelog
@@ -1,3 +1,10 @@
+dasher (3.2.18-2.1) unstable; urgency=low
+
+  * NMU as part of the GCC 4.1 transition.
+  * Remove extra qualification from C++ header files (Closes: #358881).
+
+ -- Martin Michlmayr <tbm at cyrius.com>  Fri, 26 May 2006 20:28:18 +0200
+
 dasher (3.2.18-2) unstable; urgency=high
 
   * Rebuild to fix deps since the libwnck-related binNMU.
only in patch2:
unchanged:
--- dasher-3.2.18.orig/Src/DasherCore/DasherViewSquare.h
+++ dasher-3.2.18/Src/DasherCore/DasherViewSquare.h
@@ -33,7 +33,7 @@
 	virtual void RenderNodes();
 	
 	void ChangeScreen(CDasherScreen* NewScreen);
-	void CDasherViewSquare::DrawGoTo(screenint mousex, screenint mousey);
+	void DrawGoTo(screenint mousex, screenint mousey);
 	void DrawMouse(screenint mousex, screenint mousey);
 	void DrawMouseLine(screenint mousex, screenint mousey);
 	void DrawKeyboard();
only in patch2:
unchanged:
--- dasher-3.2.18.orig/Src/DasherCore/LanguageModelling/SymbolAlphabet.h
+++ dasher-3.2.18/Src/DasherCore/LanguageModelling/SymbolAlphabet.h
@@ -38,7 +38,7 @@
 		// iSize is the number of Symbols - please dont change the constructor
 		// Add functions to set customizable behaviour
 
-		CSymbolAlphabet::CSymbolAlphabet(int iSize)
+		CSymbolAlphabet(int iSize)
 			: m_iSize(iSize)
 		{
 		  //			DASHER_ASSERT(iSize>0);

-- 
Martin Michlmayr
http://www.cyrius.com/