Hi, Attached is the diff for my k3d 0.6.7.0-2.1 NMU. Thanks Anibal for your patch -- I dropped the libsigc++-2.0-dev bit because the required version is in testing already.
Cheers, -- Adeodato Simó dato at net.com.org.es Debian Developer adeodato at debian.org La música es de los que la quieren escuchar y de nadie más. -- Andrés Calamaro
diff -u k3d-0.6.7.0/debian/changelog k3d-0.6.7.0/debian/changelog --- k3d-0.6.7.0/debian/changelog +++ k3d-0.6.7.0/debian/changelog @@ -1,3 +1,11 @@ +k3d (0.6.7.0-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Extend debian/patches/05_gcc4.3_build.patch with more include fixes from + Anibal Avelar. (Closes: #455678) + + -- Adeodato Simó <[EMAIL PROTECTED]> Wed, 2 Apr 2008 13:57:28 +0200 + k3d (0.6.7.0-2) unstable; urgency=low * debian/rules: Argh. In my narrow-mindedness for avoiding rebuilding of diff -u k3d-0.6.7.0/debian/patches/05_gcc4.3_build.patch k3d-0.6.7.0/debian/patches/05_gcc4.3_build.patch --- k3d-0.6.7.0/debian/patches/05_gcc4.3_build.patch +++ k3d-0.6.7.0/debian/patches/05_gcc4.3_build.patch @@ -1,5 +1,3 @@ -Index: k3d-0.6.7.0/hapy/src/Assert.cc -=================================================================== --- k3d-0.6.7.0.orig/hapy/src/Assert.cc +++ k3d-0.6.7.0/hapy/src/Assert.cc @@ -4,6 +4,7 @@ @@ -10,8 +8,6 @@ #include <cstring> #include <errno.h> -Index: k3d-0.6.7.0/k3dsdk/log.cpp -=================================================================== --- k3d-0.6.7.0.orig/k3dsdk/log.cpp +++ k3d-0.6.7.0/k3dsdk/log.cpp @@ -20,6 +20,7 @@ @@ -22,8 +18,6 @@ #include <iostream> #include <sstream> #include <vector> -Index: k3d-0.6.7.0/k3dsdk/string_modifiers.cpp -=================================================================== --- k3d-0.6.7.0.orig/k3dsdk/string_modifiers.cpp +++ k3d-0.6.7.0/k3dsdk/string_modifiers.cpp @@ -26,6 +26,7 @@ @@ -34,8 +28,6 @@ #include <cctype> namespace k3d -Index: k3d-0.6.7.0/surface_polygonizer/jules_bloomenthal.cpp -=================================================================== --- k3d-0.6.7.0.orig/surface_polygonizer/jules_bloomenthal.cpp +++ k3d-0.6.7.0/surface_polygonizer/jules_bloomenthal.cpp @@ -24,6 +24,7 @@ @@ -48,0 +41,285 @@ +--- k3d-0.6.7.0.orig/hapy/src/RuleId.cc ++++ k3d-0.6.7.0/hapy/src/RuleId.cc +@@ -4,6 +4,7 @@ + #include <Hapy/RuleId.h> + #include <Hapy/NumericLimits.h> + #include <Hapy/IoStream.h> ++#include <limits> + + Hapy::RuleId::Id Hapy::RuleId::ThePerm = 100; + Hapy::RuleId::Id Hapy::RuleId::TheTmp = -100; +--- k3d-0.6.7.0.orig/k3dsdk/algebra.h ++++ k3d-0.6.7.0/k3dsdk/algebra.h +@@ -30,10 +30,11 @@ + #include "vectors.h" + + #include <cfloat> ++#include <cstring> + + /**************************************************************** + * +-* C++ Vector and Matrix Algebra routines ++* C++ Vector and Matrix Algebra routinesex + * Author: Jean-Francois DOUE + * Version 3.1 --- October 1993 + * +--- k3d-0.6.7.0.orig/k3dsdk/bitmap.h ++++ k3d-0.6.7.0/k3dsdk/bitmap.h +@@ -32,6 +32,7 @@ + #include <functional> + #include <iostream> + #include <string> ++#include <cstring> + + namespace k3d + { +--- k3d-0.6.7.0.orig/k3dsdk/explicit_snap_source.cpp ++++ k3d-0.6.7.0/k3dsdk/explicit_snap_source.cpp +@@ -24,6 +24,7 @@ + #include "explicit_snap_source.h" + #include "result.h" + #include "vectors.h" ++#include <algorithm> + + namespace k3d + { +--- k3d-0.6.7.0.orig/k3dsdk/explicit_snap_target.cpp ++++ k3d-0.6.7.0/k3dsdk/explicit_snap_target.cpp +@@ -24,6 +24,7 @@ + #include "explicit_snap_target.h" + #include "result.h" + #include "vectors.h" ++#include <algorithm> + + namespace k3d + { +--- k3d-0.6.7.0.orig/k3dsdk/gl_info.cpp ++++ k3d-0.6.7.0/k3dsdk/gl_info.cpp +@@ -22,6 +22,7 @@ + */ + + #include "gl_info.h" ++#include <cstring> + + #if defined K3D_PLATFORM_WIN32 + +--- k3d-0.6.7.0.orig/k3dsdk/log_control.h ++++ k3d-0.6.7.0/k3dsdk/log_control.h +@@ -21,6 +21,7 @@ + // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + #include "signal_system.h" ++#include <time.h> + + namespace k3d + { +--- k3d-0.6.7.0.orig/k3dsdk/socket.cpp ++++ k3d-0.6.7.0/k3dsdk/socket.cpp +@@ -24,6 +24,7 @@ + #include "result.h" + #include "socket.h" + #include "string_cast.h" ++#include <cstring> + + #ifdef K3D_PLATFORM_WIN32 + +--- k3d-0.6.7.0.orig/modules/bitmap/bitmap_element.h ++++ k3d-0.6.7.0/modules/bitmap/bitmap_element.h +@@ -26,6 +26,7 @@ + + #include <k3dsdk/algebra.h> + #include <k3dsdk/bitmap.h> ++#include <memory> + + namespace libk3dbitmap + { +--- k3d-0.6.7.0.orig/ngui/angle_axis_control.h ++++ k3d-0.6.7.0/ngui/angle_axis_control.h +@@ -30,6 +30,7 @@ + #include <k3dsdk/signal_system.h> + + #include <gtkmm/table.h> ++#include <memory> + + namespace Gtk { class Button; } + namespace k3d { class iproperty; } +--- k3d-0.6.7.0.orig/ngui/aqsis_layer_chooser.h ++++ k3d-0.6.7.0/ngui/aqsis_layer_chooser.h +@@ -26,6 +26,7 @@ + + #include "ui_component.h" + #include <gtkmm/box.h> ++#include <memory> + + namespace k3d { namespace aqsis { class ilayer_connection_property; } } + namespace k3d { class istate_recorder; } +--- k3d-0.6.7.0.orig/ngui/bitmap_preview.h ++++ k3d-0.6.7.0/ngui/bitmap_preview.h +@@ -30,6 +30,7 @@ + #include <k3dsdk/bitmap.h> + + #include <gtkmm/buttonbox.h> ++#include <memory> + + namespace Gtk { class Image; } + namespace k3d { class idag; } +--- k3d-0.6.7.0.orig/ngui/bounding_box.h ++++ k3d-0.6.7.0/ngui/bounding_box.h +@@ -30,6 +30,7 @@ + #include <k3dsdk/bounding_box.h> + + #include <gtkmm/table.h> ++#include <memory> + + // Forward declarations + namespace Gtk { class Button; } +--- k3d-0.6.7.0.orig/ngui/check_button.h ++++ k3d-0.6.7.0/ngui/check_button.h +@@ -31,6 +31,7 @@ + #include <k3dsdk/iwritable_property.h> + + #include <gtkmm/checkbutton.h> ++#include <memory> + + // Forward declarations + namespace k3d { class istate_recorder; } +--- k3d-0.6.7.0.orig/ngui/check_menu_item.h ++++ k3d-0.6.7.0/ngui/check_menu_item.h +@@ -31,6 +31,7 @@ + #include <k3dsdk/iwritable_property.h> + + #include <gtkmm/checkmenuitem.h> ++#include <memory> + + // Forward declarations + namespace k3d { class istate_recorder; } +--- k3d-0.6.7.0.orig/ngui/color_chooser.h ++++ k3d-0.6.7.0/ngui/color_chooser.h +@@ -31,6 +31,7 @@ + #include <k3dsdk/iwritable_property.h> + + #include <gtkmm/button.h> ++#include <memory> + + namespace Gtk { class DrawingArea; } + namespace k3d { class istate_recorder; } +--- k3d-0.6.7.0.orig/ngui/combo_box.h ++++ k3d-0.6.7.0/ngui/combo_box.h +@@ -32,6 +32,7 @@ + + #include <gtkmm/comboboxentry.h> + #include <gtkmm/liststore.h> ++#include <memory> + + // Forward declarations + namespace k3d { class istate_recorder; } +--- k3d-0.6.7.0.orig/ngui/entry.h ++++ k3d-0.6.7.0/ngui/entry.h +@@ -30,6 +30,7 @@ + + #include <k3dsdk/iproperty.h> + #include <k3dsdk/iwritable_property.h> ++#include <memory> + + namespace k3d { class istate_recorder; } + +--- k3d-0.6.7.0.orig/ngui/enumeration_chooser.h ++++ k3d-0.6.7.0/ngui/enumeration_chooser.h +@@ -34,6 +34,7 @@ + + #include <gtkmm/combobox.h> + #include <gtkmm/liststore.h> ++#include <memory> + + // Forward declarations + namespace k3d { class istate_recorder; } +--- k3d-0.6.7.0.orig/ngui/node_chooser.h ++++ k3d-0.6.7.0/ngui/node_chooser.h +@@ -34,6 +34,7 @@ + #include <k3dsdk/result.h> + + #include <gtkmm/box.h> ++#include <memory> + + namespace Gtk { class Button; } + namespace Gtk { class Label; } +--- k3d-0.6.7.0.orig/ngui/node_history.h ++++ k3d-0.6.7.0/ngui/node_history.h +@@ -24,6 +24,7 @@ + #include "ui_component.h" + + #include <gtkmm/box.h> ++#include <memory> + + namespace libk3dngui + { +--- k3d-0.6.7.0.orig/ngui/path_chooser.h ++++ k3d-0.6.7.0/ngui/path_chooser.h +@@ -31,6 +31,7 @@ + #include <k3dsdk/iwritable_property.h> + + #include <gtkmm/box.h> ++#include <memory> + + namespace Gtk { class Button; } + namespace Gtk { class ComboBox; } +--- k3d-0.6.7.0.orig/ngui/point_control.h ++++ k3d-0.6.7.0/ngui/point_control.h +@@ -30,6 +30,7 @@ + #include <k3dsdk/vectors.h> + + #include <gtkmm/table.h> ++#include <memory> + + namespace Gtk { class Button; } + namespace k3d { class iproperty; } +--- k3d-0.6.7.0.orig/ngui/scale.h ++++ k3d-0.6.7.0/ngui/scale.h +@@ -30,6 +30,7 @@ + #include <k3dsdk/vectors.h> + + #include <gtkmm/table.h> ++#include <memory> + + // Forward declarations + namespace Gtk { class Button; } +--- k3d-0.6.7.0.orig/ngui/script_button.h ++++ k3d-0.6.7.0/ngui/script_button.h +@@ -32,6 +32,7 @@ + + #include <gtkmm/box.h> + #include <gtkmm/button.h> ++#include <memory> + + // Forward declarations + namespace k3d { class istate_recorder; } +--- k3d-0.6.7.0.orig/ngui/spin_button.h ++++ k3d-0.6.7.0/ngui/spin_button.h +@@ -33,6 +33,7 @@ + + #include <gtkmm/button.h> + #include <gtkmm/table.h> ++#include <memory> + + namespace Gtk { class Button; } + namespace k3d { class iproperty; } +--- k3d-0.6.7.0.orig/ngui/toggle_button.h ++++ k3d-0.6.7.0/ngui/toggle_button.h +@@ -31,6 +31,7 @@ + #include <k3dsdk/iwritable_property.h> + + #include <gtkmm/togglebutton.h> ++#include <memory> + + // Forward declarations + namespace k3d { class istate_recorder; } +--- k3d-0.6.7.0.orig/renderjob/main.cpp ++++ k3d-0.6.7.0/renderjob/main.cpp +@@ -31,6 +31,7 @@ + + #include <iostream> + #include <vector> ++#include <algorithm> + + namespace + {