diff -Nru dnprogs-2.49/debian/changelog dnprogs-2.49ubuntu1/debian/changelog --- dnprogs-2.49/debian/changelog 2009-01-05 16:03:54.000000000 +0300 +++ dnprogs-2.49ubuntu1/debian/changelog 2009-09-23 11:21:02.000000000 +0400 @@ -1,3 +1,10 @@ +dnprogs (2.49ubuntu1) karmic; urgency=low + + * dncopy/unixfile.cc: remove conflicting declaration of basename() + (LP: #435071). + + -- Ilya Barygin Wed, 23 Sep 2009 11:17:02 +0400 + dnprogs (2.49) unstable; urgency=low * Increase kernel socket buffer size in libdap so it matches the block diff -Nru dnprogs-2.49/debian/control dnprogs-2.49ubuntu1/debian/control --- dnprogs-2.49/debian/control 2008-03-23 19:15:43.000000000 +0300 +++ dnprogs-2.49ubuntu1/debian/control 2009-09-23 11:09:51.000000000 +0400 @@ -1,7 +1,8 @@ Source: dnprogs Section: net Priority: extra -Maintainer: Christine Caulfield +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Christine Caulfield Build-Depends: debhelper(>= 4.1.16), libncurses5-dev, libfuse-dev Standards-Version: 3.5.6 diff -Nru dnprogs-2.49/dncopy/unixfile.cc dnprogs-2.49ubuntu1/dncopy/unixfile.cc --- dnprogs-2.49/dncopy/unixfile.cc 2008-10-04 14:18:28.000000000 +0400 +++ dnprogs-2.49ubuntu1/dncopy/unixfile.cc 2009-09-23 11:15:23.000000000 +0400 @@ -21,9 +21,6 @@ #include "file.h" #include "unixfile.h" -// basename() is in libc but not in my header files -extern "C" char *basename(const char *); - int unixfile::open(const char *mode) {