Bug#560457: xnc: diff for NMU version 5.0.4-3.1

[Mehdi Dogguy <mehdi@dogguy.org>]

tags 560457 + patch pending
thanks

Dear maintainer,

I've prepared an NMU for xnc (versioned as 5.0.4-3.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
Mehdi Dogguy

diff -u xnc-5.0.4/debian/changelog xnc-5.0.4/debian/changelog
--- xnc-5.0.4/debian/changelog
+++ xnc-5.0.4/debian/changelog
@@ -1,3 +1,12 @@
+xnc (5.0.4-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS due to invalid string constant to char* conversion in
+    commonfuncs.cxx, thanks to Leonid Khramov who also provided a
+    similar fix (Closes: #560457).
+
+ -- Mehdi Dogguy <mehdi@debian.org>  Tue, 02 Feb 2010 14:19:03 +0100
+
 xnc (5.0.4-3) unstable; urgency=low
 
   * QA upload.
only in patch2:
unchanged:
--- xnc-5.0.4.orig/src/lib/tool/commonfuncs.cxx
+++ xnc-5.0.4/src/lib/tool/commonfuncs.cxx
@@ -119,7 +119,7 @@
 //Get first content of dirname
 char*   get_first_content(const char *curdir, char *cont)
 {
-        char *b=strchr(curdir,'/');
+        char *b=strchr(const_cast<char *>(curdir),'/');
         if(b)
           {
                   strncpy(cont,curdir,b-curdir);
@@ -262,7 +262,7 @@
 //--------------------------------------------------------------------------
 int    is_filtered(char *s, char *ff)
 {
-  char  *f="";
+  char  *f=(char *)"";
   while (*s != 0)
   {
     f = ff;
@@ -380,7 +380,7 @@
 int hex_one_digit(char ch1)
 {
   char ch=toupper(ch1);
-  char *hex="0123456789ABCDEF";
+  char hex[]="0123456789ABCDEF";
   int  i;
   for(i=0;i<16;i++)
     if(ch==hex[i])