Hi, Please find attached the diff of the NMUs I have recently done on kmatplot, which fix bugs #286533, #300867, #327980 and #326338.
Bye, Aurelien -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' [EMAIL PROTECTED] | [EMAIL PROTECTED] `- people.debian.org/~aurel32 | www.aurel32.net
diff -u kmatplot-0.4/configure kmatplot-0.4/configure --- kmatplot-0.4/configure +++ kmatplot-0.4/configure @@ -1015,7 +1015,7 @@ fi - CFLAGS=" $CFLAGS" + CFLAGS=" $CFLAGS -fPIC" # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 @@ -1244,7 +1244,7 @@ if test "$kde_use_debug_code" = "yes"; then CFLAGS="-g -O0 $CFLAGS" case $host in - *-*-linux-gnu) + *-*-linux-gnu | *-*-kfreebsd*-gnu) CFLAGS="-ansi -W -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS" ;; esac @@ -1560,7 +1560,7 @@ fi - case $host in *-*-linux-gnu) + case $host in *-*-linux-gnu | *-*-kfreebsd*-gnu) CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wbad-function-cast -Wcast-align -Wundef -Wconversion $CXXFLAGS" ;; esac @@ -5277,7 +5277,7 @@ if test "x$kde_use_qt_mt" = "xyes"; then case $host in - *-*-linux-*) + *-*-linux-* | *-*-kfreebsd*-gnu) if test "x$GCC" = "xyes"; then CPPFLAGS="$CPPFLAGS -DQT_THREAD_SUPPORT -pthread" X_EXTRA_LIBS="$X_EXTRA_LIBS -pthread" @@ -5310,7 +5310,7 @@ if test "x$kde_use_qt_mt" = "xyes"; then case $host in - *-*-linux-*) + *-*-linux-* | *-*-kfreebsd*-gnu) if test "x$GCC" = "xyes"; then LIBQT="-lqt-mt" kde_int_qt="-lqt-mt" diff -u kmatplot-0.4/debian/control kmatplot-0.4/debian/control --- kmatplot-0.4/debian/control +++ kmatplot-0.4/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Hugo van der Merwe <[EMAIL PROTECTED]> Build-Depends: debhelper (>> 3.0.0), libqt3-mt-dev, xlibmesa-gl-dev, octave2.1-headers, cdbs -Build-Conflicts: scilab +Build-Conflicts: scilab, autoconf, autoconf2.13 Standards-Version: 3.6.1.0 Package: kmatplot diff -u kmatplot-0.4/debian/changelog kmatplot-0.4/debian/changelog --- kmatplot-0.4/debian/changelog +++ kmatplot-0.4/debian/changelog @@ -1,3 +1,22 @@ +kmatplot (0.4-7.2) unstable; urgency=low + + * 0-day NMU during BSP. + * Build-conflicts on autoconf and autoconf2.13 to fix FTBFS on sparc. + + -- Aurelien Jarno <[EMAIL PROTECTED]> Sat, 17 Dec 2005 17:00:30 +0100 + +kmatplot (0.4-7.1) unstable; urgency=low + + * 0-day NMU during BSP. + * Rebuild for the Qt/KDE transition (closes: bug#327980). + * Rebuilt for libreadline transition (closes: bug#326338). + * Applied a patch from Andreas Jochen to make the package buildable with + gcc-4.0 (closes: bug#300867). + * Build the shared libraries with -fPIC (closes: bug#286533). + * Added support for GNU/kFreeBSD. + + -- Aurelien Jarno <[EMAIL PROTECTED]> Sat, 17 Dec 2005 15:43:54 +0100 + kmatplot (0.4-7) unstable; urgency=low * Rebuild with latest unstable packages (Closes: #249482) only in patch2: unchanged: --- kmatplot-0.4.orig/acinclude.m4 +++ kmatplot-0.4/acinclude.m4 @@ -950,7 +950,7 @@ if test "x$kde_use_qt_mt" = "xyes"; then case $host in - *-*-linux-*) + *-*-linux-* | *-*-kfreebsd*-gnu) if test "x$GCC" = "xyes"; then CPPFLAGS="$CPPFLAGS -DQT_THREAD_SUPPORT -pthread" X_EXTRA_LIBS="$X_EXTRA_LIBS -pthread" @@ -989,7 +989,7 @@ if test "x$kde_use_qt_mt" = "xyes"; then case $host in - *-*-linux-*) + *-*-linux-* | *-*-kfreebsd*-gnu) if test "x$GCC" = "xyes"; then LIBQT="-lqt-mt" kde_int_qt="-lqt-mt" @@ -2183,7 +2183,7 @@ KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"]) case $host in dnl - *-*-linux-gnu) + *-*-linux-gnu | *-*-kfreebsd*-gnu) CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wbad-function-cast -Wcast-align -Wundef -Wconversion $CXXFLAGS" ;; esac only in patch2: unchanged: --- kmatplot-0.4.orig/kmatplot/widgets/qsgraphicaldata.cpp +++ kmatplot-0.4/kmatplot/widgets/qsgraphicaldata.cpp @@ -224,7 +224,7 @@ QSGFill result = default_value; if ( source && source->rows() > row ) { int cols = source->cols() - start_col; - if ( cols>0 && !source->string(row,start_col+0).isEmpty() ) result.style = (QSGFill::Style )source->value(row,start_col+0); + if ( cols>0 && !source->string(row,start_col+0).isEmpty() ) result.style = (QSGFill::Style )(long)source->value(row,start_col+0); result.color = colorFromData( source, row, start_col+1, result.color ); } return result; @@ -237,7 +237,7 @@ QSGLine result = default_value; if ( source && source->rows() > row ) { int cols = source->cols() - start_col; - if ( cols>0 && !source->string(row,start_col+0).isEmpty() ) result.style = (QSGLine::Style )source->value(row,start_col+0); + if ( cols>0 && !source->string(row,start_col+0).isEmpty() ) result.style = (QSGLine::Style )(long)source->value(row,start_col+0); if ( cols>1 && !source->string(row,start_col+1).isEmpty() ) result.width = (int )source->value(row,start_col+1); result.color = colorFromData( source, row, start_col+2, result.color ); } @@ -251,8 +251,8 @@ QSGPoint result = default_value; if ( source && source->rows() > row ) { int cols = source->cols() - start_col; - if ( cols>0 && !source->string(row,start_col+0).isEmpty() ) result.style = (QSGPoint::Style )source->value(row,start_col+0); - if ( cols>1 && !source->string(row,start_col+1).isEmpty() ) result.fill = (QSGPoint::Fill )source->value(row,start_col+1); + if ( cols>0 && !source->string(row,start_col+0).isEmpty() ) result.style = (QSGPoint::Style )(long)source->value(row,start_col+0); + if ( cols>1 && !source->string(row,start_col+1).isEmpty() ) result.fill = (QSGPoint::Fill )(long)source->value(row,start_col+1); if ( cols>2 && !source->string(row,start_col+2).isEmpty() ) result.size = (int )source->value(row,start_col+2); result.color = colorFromData( source, row, start_col+3, result.color ); } @@ -266,7 +266,7 @@ QSGArrow result = default_value; if ( source && source->rows() > row ) { int cols = source->cols() - start_col; - if ( cols>0 && !source->string(row,start_col+0).isEmpty() ) result.style = (QSGArrow::Style )source->value(row,start_col+0); + if ( cols>0 && !source->string(row,start_col+0).isEmpty() ) result.style = (QSGArrow::Style )(long)source->value(row,start_col+0); if ( cols>1 && !source->string(row,start_col+1).isEmpty() ) result.size = (int )source->value(row,start_col+1); } return result; only in patch2: unchanged: --- kmatplot-0.4.orig/admin/acinclude.m4.in +++ kmatplot-0.4/admin/acinclude.m4.in @@ -950,7 +950,7 @@ if test "x$kde_use_qt_mt" = "xyes"; then case $host in - *-*-linux-*) + *-*-linux-* | *-*-kfreebsd*-gnu) if test "x$GCC" = "xyes"; then CPPFLAGS="$CPPFLAGS -DQT_THREAD_SUPPORT -pthread" X_EXTRA_LIBS="$X_EXTRA_LIBS -pthread" @@ -989,7 +989,7 @@ if test "x$kde_use_qt_mt" = "xyes"; then case $host in - *-*-linux-*) + *-*-linux-* | *-*-kfreebsd*-gnu) if test "x$GCC" = "xyes"; then LIBQT="-lqt-mt" kde_int_qt="-lqt-mt" @@ -2148,7 +2148,7 @@ if test "$kde_use_debug_code" = "yes"; then CFLAGS="-g -O0 $CFLAGS" case $host in - *-*-linux-gnu) + *-*-linux-gnu | *-*-kfreebsd*-gnu) CFLAGS="-ansi -W -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS" ;; esac @@ -2183,7 +2183,7 @@ KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"]) case $host in dnl - *-*-linux-gnu) + *-*-linux-gnu | *-*-kfreebsd*-gnu) CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wbad-function-cast -Wcast-align -Wundef -Wconversion $CXXFLAGS" ;; esac