NMU'd; here's the diff:
diff -u tulip-3.0.0~B6/debian/patches/series
tulip-3.0.0~B6/debian/patches/series
--- tulip-3.0.0~B6/debian/patches/series
+++ tulip-3.0.0~B6/debian/patches/series
@@ -4,0 +5 @@
+04-gcc43-headers
diff -u tulip-3.0.0~B6/debian/changelog tulip-3.0.0~B6/debian/changelog
--- tulip-3.0.0~B6/debian/changelog
+++ tulip-3.0.0~B6/debian/changelog
@@ -1,3 +1,13 @@
+tulip (3.0.0~B6-2.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * New patch:
+ * Add #include directives needed for g++ 4.3 (Closes: #461728)
+ * Replaced Vera font with DejaVu (Closes: #461293)
+ * Fixed debhelper option for binary-indep target
+
+ -- Ben Hutchings <[EMAIL PROTECTED]> Sat, 05 Apr 2008 21:46:03 +0100
+
tulip (3.0.0~B6-2) unstable; urgency=low
* Updated debian/copyright to include details about copyright holders
diff -u tulip-3.0.0~B6/debian/control tulip-3.0.0~B6/debian/control
--- tulip-3.0.0~B6/debian/control
+++ tulip-3.0.0~B6/debian/control
@@ -8,7 +8,7 @@
Package: tulip
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-bitstream-vera
+Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-dejavu-core
Suggests: tulip-doc
Description: A system dedicated to the visualization of huge graphs
Tulip is capable of managing graphs with up to 500,000 nodes and edges
diff -u tulip-3.0.0~B6/debian/rules tulip-3.0.0~B6/debian/rules
--- tulip-3.0.0~B6/debian/rules
+++ tulip-3.0.0~B6/debian/rules
@@ -70,14 +70,14 @@
make install -C $(BUILD_TREE) DESTDIR=$(tmpdir)
cd $(tmpdir)/usr/lib/tlp/bitmaps && \
- ln -sf /usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf
font.ttf && \
- ln -sf /usr/share/fonts/truetype/ttf-bitstream-vera/VeraBd.ttf
fontb.ttf
+ ln -sf /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
font.ttf && \
+ ln -sf /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
fontb.ttf
dh_movefiles
test -z "$$(find ${tmpdir} ! -type d | tee >(cat >&2))"
# Build architecture-independent files here.
-binary-arch: DH_OPTIONS=-i
+binary-indep: DH_OPTIONS=-i
binary-indep: build-doc install
dh_testdir
dh_testroot
only in patch2:
unchanged:
--- tulip-3.0.0~B6.orig/software/tlprender/src/JPEGWriter.cpp
+++ tulip-3.0.0~B6/software/tlprender/src/JPEGWriter.cpp
@@ -14,6 +14,7 @@
#endif
#include <stdio.h>
+#include <string.h>
#include <iostream>
#include <sstream>
only in patch2:
unchanged:
--- tulip-3.0.0~B6.orig/debian/patches/04-gcc43-headers
+++ tulip-3.0.0~B6/debian/patches/04-gcc43-headers
@@ -0,0 +1,148 @@
+--- tulip-3.0.0~B6.orig/library/tulip/include/tulip/tulipconf.h
++++ tulip-3.0.0~B6/library/tulip/include/tulip/tulipconf.h
+@@ -19,10 +19,13 @@
+ #else
+ # define _DEPRECATED __attribute__ ((deprecated))
+ # define stdext __gnu_cxx
+-# if (__GNUC_MINOR__ < 4 && __GNUC__ < 4)
++# if (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
+ # include <ext/stl_hash_fun.h>
+-# else
++# elif (__GNUC__ == 3 && __GNUC_MINOR__ >= 4 || \
++ __GNUC__ == 4 && __GNUC_MINOR__ < 3)
+ # include <ext/hash_fun.h>
++# else
++# include <backward/hash_fun.h>
+ # endif
+ #endif
+
+--- tulip-3.0.0~B6.orig/library/tulip/src/StringCollection.cpp
++++ tulip-3.0.0~B6/library/tulip/src/StringCollection.cpp
+@@ -10,6 +10,7 @@
+ (at your option) any later version.
+ */
+ #include<vector>
++#include<algorithm>
+ #include<tulip/StringCollection.h>
+
+ using namespace std;
+--- tulip-3.0.0~B6.orig/library/tulip/src/IdManager.cpp
++++ tulip-3.0.0~B6/library/tulip/src/IdManager.cpp
+@@ -21,6 +21,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
++#include <limits.h>
+
+ #include "tulip/IdManager.h"
+ using namespace std;
+--- tulip-3.0.0~B6.orig/library/tulip/src/PluginLibraryLoader.cpp
++++ tulip-3.0.0~B6/library/tulip/src/PluginLibraryLoader.cpp
+@@ -9,6 +9,7 @@
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ */
++#include <string.h>
+ #include "tulip/PluginLibraryLoader.h"
+ #include "tulip/TulipRelease.h"
+
+--- tulip-3.0.0~B6.orig/library/tulip-ogl/src/TextRenderer.cpp
++++ tulip-3.0.0~B6/library/tulip-ogl/src/TextRenderer.cpp
+@@ -22,6 +22,7 @@
+ #include <iostream>
+ #include <cassert>
+ #include <stack>
++#include <string.h>
+
+ using namespace std;
+ using namespace tlp;
+--- tulip-3.0.0~B6.orig/library/tulip/include/tulip/TLPParser.h
++++ tulip-3.0.0~B6/library/tulip/include/tulip/TLPParser.h
+@@ -15,6 +15,7 @@
+ #include <sstream>
+ #include <string>
+ #include <list>
++#include <string.h>
+
+ #include <tulip/PluginProgress.h>
+
+--- tulip-3.0.0~B6.orig/library/tulip/src/TLPExport.cpp
++++ tulip-3.0.0~B6/library/tulip/src/TLPExport.cpp
+@@ -16,6 +16,7 @@
+ #include <ext/hash_map>
+ #endif
+ #include <iostream>
++#include <string.h>
+ #include <time.h>
+
+ #include <tulip/TulipPlugin.h>
+--- tulip-3.0.0~B6.orig/library/tulip/src/TLPImport.cpp
++++ tulip-3.0.0~B6/library/tulip/src/TLPImport.cpp
+@@ -13,6 +13,7 @@
+ #include <string>
+ #include <errno.h>
+ #include <locale.h>
++#include <string.h>
+ #include <sys/stat.h>
+
+ #if (__GNUC__ < 3)
+--- tulip-3.0.0~B6.orig/plugins/import/dotImport.cpp
++++ tulip-3.0.0~B6/plugins/import/dotImport.cpp
+@@ -12,6 +12,7 @@
+ #include <fstream>
+ #include <sstream>
+ #include <math.h>
++#include <string.h>
+ #include <tulip/TulipPlugin.h>
+ #include <tulip/hash_string.h>
+ #include <vector>
+--- tulip-3.0.0~B6.orig/plugins/import/dotImportCLUT.h
++++ tulip-3.0.0~B6/plugins/import/dotImportCLUT.h
+@@ -10,6 +10,7 @@
+ (at your option) any later version.
+ */
+
++#include <string.h>
+
+ struct X11Color
+ {
+--- tulip-3.0.0~B6.orig/library/tulip/include/tulip/cxx/Circle.cxx
++++ tulip-3.0.0~B6/library/tulip/include/tulip/cxx/Circle.cxx
+@@ -9,6 +9,7 @@
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ */
++#include <stdlib.h>
+
+ template<typename Obj>
+ tlp::Circle<Obj> & tlp::Circle<Obj>::merge(const tlp::Circle<Obj> &c) {
+--- tulip-3.0.0~B6.orig/plugins/import/GMLParser.h
++++ tulip-3.0.0~B6/plugins/import/GMLParser.h
+@@ -12,6 +12,7 @@
+ #include <iostream>
+ #include <string>
+ #include <list>
++#include <string.h>
+
+ /*
+ Il faut ajouter la gestion correcte des erreurs et cest nikel.
+--- tulip-3.0.0~B6.orig/plugins/layout/rectanglePackingFonctions.cpp
++++ tulip-3.0.0~B6/plugins/layout/rectanglePackingFonctions.cpp
+@@ -9,6 +9,7 @@
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ */
++#include <stdlib.h>
+ #include "rectanglePackingFonctions.h"
+
+ vector<Rectangle<float> > &
RectanglePackingLimitRectangles(vector<Rectangle<float> > & v, const char *
quality, PluginProgress * progress){
+--- tulip-3.0.0~B6.orig/software/tlprender/src/JPEGWriter.cpp
++++ tulip-3.0.0~B6/software/tlprender/src/JPEGWriter.cpp
+@@ -14,6 +14,7 @@
+ #endif
+
+ #include <stdio.h>
++#include <string.h>
+ #include <iostream>
+ #include <sstream>
+
only in patch2:
unchanged:
--- tulip-3.0.0~B6.orig/plugins/layout/rectanglePackingFonctions.cpp
+++ tulip-3.0.0~B6/plugins/layout/rectanglePackingFonctions.cpp
@@ -9,6 +9,7 @@
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
*/
+#include <stdlib.h>
#include "rectanglePackingFonctions.h"
vector<Rectangle<float> > &
RectanglePackingLimitRectangles(vector<Rectangle<float> > & v, const char *
quality, PluginProgress * progress){
only in patch2:
unchanged:
--- tulip-3.0.0~B6.orig/plugins/import/dotImport.cpp
+++ tulip-3.0.0~B6/plugins/import/dotImport.cpp
@@ -12,6 +12,7 @@
#include <fstream>
#include <sstream>
#include <math.h>
+#include <string.h>
#include <tulip/TulipPlugin.h>
#include <tulip/hash_string.h>
#include <vector>
only in patch2:
unchanged:
--- tulip-3.0.0~B6.orig/plugins/import/GMLParser.h
+++ tulip-3.0.0~B6/plugins/import/GMLParser.h
@@ -12,6 +12,7 @@
#include <iostream>
#include <string>
#include <list>
+#include <string.h>
/*
Il faut ajouter la gestion correcte des erreurs et cest nikel.
only in patch2:
unchanged:
--- tulip-3.0.0~B6.orig/plugins/import/dotImportCLUT.h
+++ tulip-3.0.0~B6/plugins/import/dotImportCLUT.h
@@ -10,6 +10,7 @@
(at your option) any later version.
*/
+#include <string.h>
struct X11Color
{
only in patch2:
unchanged:
--- tulip-3.0.0~B6.orig/library/tulip/src/IdManager.cpp
+++ tulip-3.0.0~B6/library/tulip/src/IdManager.cpp
@@ -21,6 +21,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+#include <limits.h>
#include "tulip/IdManager.h"
using namespace std;
only in patch2:
unchanged:
--- tulip-3.0.0~B6.orig/library/tulip/src/TLPImport.cpp
+++ tulip-3.0.0~B6/library/tulip/src/TLPImport.cpp
@@ -13,6 +13,7 @@
#include <string>
#include <errno.h>
#include <locale.h>
+#include <string.h>
#include <sys/stat.h>
#if (__GNUC__ < 3)
only in patch2:
unchanged:
--- tulip-3.0.0~B6.orig/library/tulip/src/TLPExport.cpp
+++ tulip-3.0.0~B6/library/tulip/src/TLPExport.cpp
@@ -16,6 +16,7 @@
#include <ext/hash_map>
#endif
#include <iostream>
+#include <string.h>
#include <time.h>
#include <tulip/TulipPlugin.h>
only in patch2:
unchanged:
--- tulip-3.0.0~B6.orig/library/tulip/src/StringCollection.cpp
+++ tulip-3.0.0~B6/library/tulip/src/StringCollection.cpp
@@ -10,6 +10,7 @@
(at your option) any later version.
*/
#include<vector>
+#include<algorithm>
#include<tulip/StringCollection.h>
using namespace std;
only in patch2:
unchanged:
--- tulip-3.0.0~B6.orig/library/tulip/src/PluginLibraryLoader.cpp
+++ tulip-3.0.0~B6/library/tulip/src/PluginLibraryLoader.cpp
@@ -9,6 +9,7 @@
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
*/
+#include <string.h>
#include "tulip/PluginLibraryLoader.h"
#include "tulip/TulipRelease.h"
only in patch2:
unchanged:
--- tulip-3.0.0~B6.orig/library/tulip/include/tulip/TLPParser.h
+++ tulip-3.0.0~B6/library/tulip/include/tulip/TLPParser.h
@@ -15,6 +15,7 @@
#include <sstream>
#include <string>
#include <list>
+#include <string.h>
#include <tulip/PluginProgress.h>
only in patch2:
unchanged:
--- tulip-3.0.0~B6.orig/library/tulip/include/tulip/tulipconf.h
+++ tulip-3.0.0~B6/library/tulip/include/tulip/tulipconf.h
@@ -19,10 +19,13 @@
#else
# define _DEPRECATED __attribute__ ((deprecated))
# define stdext __gnu_cxx
-# if (__GNUC_MINOR__ < 4 && __GNUC__ < 4)
+# if (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
# include <ext/stl_hash_fun.h>
-# else
+# elif (__GNUC__ == 3 && __GNUC_MINOR__ >= 4 || \
+ __GNUC__ == 4 && __GNUC_MINOR__ < 3)
# include <ext/hash_fun.h>
+# else
+# include <backward/hash_fun.h>
# endif
#endif
only in patch2:
unchanged:
--- tulip-3.0.0~B6.orig/library/tulip/include/tulip/cxx/Circle.cxx
+++ tulip-3.0.0~B6/library/tulip/include/tulip/cxx/Circle.cxx
@@ -9,6 +9,7 @@
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
*/
+#include <stdlib.h>
template<typename Obj>
tlp::Circle<Obj> & tlp::Circle<Obj>::merge(const tlp::Circle<Obj> &c) {
only in patch2:
unchanged:
--- tulip-3.0.0~B6.orig/library/tulip-ogl/src/TextRenderer.cpp
+++ tulip-3.0.0~B6/library/tulip-ogl/src/TextRenderer.cpp
@@ -22,6 +22,7 @@
#include <iostream>
#include <cassert>
#include <stack>
+#include <string.h>
using namespace std;
using namespace tlp;
--- END ------ Ben Hutchings It is a miracle that curiosity survives formal education. - Albert Einstein
signature.asc
Description: This is a digitally signed message part
