I have prepared and am about to make an NMU for this. Here's the patch:
diff -u tulip-2.0.4/debian/changelog tulip-2.0.4/debian/changelog
--- tulip-2.0.4/debian/changelog
+++ tulip-2.0.4/debian/changelog
@@ -1,3 +1,11 @@
+tulip (2.0.4-3.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * Fixed further syntax errors (Closes: #357996)
+ * Removed unused build-dep on libosmesa6-dev
+
+ -- Ben Hutchings <[EMAIL PROTECTED]> Sun, 27 Aug 2006 18:31:25 +0100
+
tulip (2.0.4-3) unstable; urgency=low
* Updated patches:
diff -u tulip-2.0.4/debian/control tulip-2.0.4/debian/control
--- tulip-2.0.4/debian/control
+++ tulip-2.0.4/debian/control
@@ -2,7 +2,7 @@
Section: graphics
Priority: optional
Maintainer: Yann Dirson <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 5), libqt3-mt-dev, qt3-apps-dev, freeglut3-dev,
docbook-to-man, libgl1-mesa-swx11-dev, libosmesa6-dev [!hppa !ia64], sharutils,
dh-buildinfo, libfreetype6-dev, libxml2-dev, libgle3-dev, libxml2-utils,
graphviz, xmltex, libjpeg62-dev, libpng12-dev, doxygen, ftgl-dev
+Build-Depends: debhelper (>> 5), libqt3-mt-dev, qt3-apps-dev, freeglut3-dev,
docbook-to-man, libgl1-mesa-swx11-dev, sharutils, dh-buildinfo,
libfreetype6-dev, libxml2-dev, libgle3-dev, libxml2-utils, graphviz, xmltex,
libjpeg62-dev, libpng12-dev, doxygen, ftgl-dev
Standards-Version: 3.7.2
Package: tulip
only in patch2:
unchanged:
--- tulip-2.0.4.orig/library/tulip/src/StatisticsNodeModule.cpp
+++ tulip-2.0.4/library/tulip/src/StatisticsNodeModule.cpp
@@ -6,8 +6,6 @@
using namespace std;
-namespace tlp
-{
void StatsNodeModule::ComputeAveragePoint(SuperGraph *superGraph, const
std::vector<MetricProxy*> &metrics, int nDimensions, std::vector<float> &result)
{
Iterator<node> *itN = superGraph->getNodes();
@@ -511,7 +509,6 @@
return res;
}
-}
only in patch2:
unchanged:
--- tulip-2.0.4.orig/library/tulip/src/Plane.cpp
+++ tulip-2.0.4/library/tulip/src/Plane.cpp
@@ -2,8 +2,6 @@
using namespace std;
-namespace tlp
-{
Plane::Plane()
{
@@ -85,4 +83,3 @@
{
return (a * pos[0] + b * pos[1] + c * pos[2] + d);
}
-}
only in patch2:
unchanged:
--- tulip-2.0.4.orig/library/tulip/src/Polynome.cpp
+++ tulip-2.0.4/library/tulip/src/Polynome.cpp
@@ -7,8 +7,6 @@
#define PI 3.14159265
-namespace tlp
-{
Polynome::Polynome()
{
a = 0;
@@ -78,4 +76,3 @@
}
}
-}
only in patch2:
unchanged:
--- tulip-2.0.4.orig/library/tulip-ogl/src/GlADRenderOptions.cpp
+++ tulip-2.0.4/library/tulip-ogl/src/GlADRenderOptions.cpp
@@ -7,8 +7,6 @@
#include "tulip/GlADRenderOptions.h"
-namespace tlp
-{
GlADRenderOptions::GlADRenderOptions()
{
renderStatesValue = 2 + 8 + 32; // We enable GlAD_Solid, GlAD_ZEnable and
GlAD_Culling
@@ -75,4 +73,3 @@
else
glDisable(GL_CULL_FACE);
}
-}
only in patch2:
unchanged:
--- tulip-2.0.4.orig/library/tulip-ogl/src/GlHudLine.cpp
+++ tulip-2.0.4/library/tulip-ogl/src/GlHudLine.cpp
@@ -15,8 +15,6 @@
using namespace std;
-namespace tlp
-{
GlHudLine::GlHudLine()
{
}
@@ -127,4 +125,3 @@
{
this->thickness = thickness;
}
-}
only in patch2:
unchanged:
--- tulip-2.0.4.orig/library/tulip-ogl/src/GlADComposite.cpp
+++ tulip-2.0.4/library/tulip-ogl/src/GlADComposite.cpp
@@ -3,7 +3,6 @@
using namespace tlp;
using namespace std;
-namespace tlp {
typedef stdext::hash_map<string, GlAugmentedDisplay *>::const_iterator ITM;
//============================================================
GlADComposite::GlADComposite() {
@@ -49,4 +48,3 @@
(*ite).second->draw(graph);
}
//============================================================
-}
only in patch2:
unchanged:
--- tulip-2.0.4.orig/library/tulip-ogl/src/GlHudRect.cpp
+++ tulip-2.0.4/library/tulip-ogl/src/GlHudRect.cpp
@@ -15,8 +15,6 @@
using namespace std;
-namespace tlp
-{
GlHudRect::GlHudRect() {
}
@@ -133,4 +131,3 @@
(y <= maxY));
}
//=====================================================
-}
only in patch2:
unchanged:
--- tulip-2.0.4.orig/library/tulip-ogl/src/GlADLine.cpp
+++ tulip-2.0.4/library/tulip-ogl/src/GlADLine.cpp
@@ -8,7 +8,6 @@
#include "tulip/GlADLine.h"
using namespace std;
-namespace tlp {
GlADLine::GlADLine() {
// No default constructor
@@ -116,4 +115,3 @@
{
this->thickness = thickness;
}
-}
only in patch2:
unchanged:
--- tulip-2.0.4.orig/library/tulip-ogl/src/GlADQuad.cpp
+++ tulip-2.0.4/library/tulip-ogl/src/GlADQuad.cpp
@@ -8,8 +8,6 @@
using namespace std;
-namespace tlp
-{
GlADQuad::GlADQuad()
{
// No default constructor :)
@@ -145,4 +143,3 @@
unsetup();
}
-}
only in patch2:
unchanged:
--- tulip-2.0.4.orig/library/tulip-ogl/src/GlHudRect4.cpp
+++ tulip-2.0.4/library/tulip-ogl/src/GlHudRect4.cpp
@@ -16,7 +16,6 @@
using namespace std;
-namespace tlp {
GlHudRect4::GlHudRect4() {
for(int i=0; i < N_RECT_POINTS; ++i){
@@ -141,4 +140,3 @@
positions[i]->setZ(1);
}
}
-}
only in patch2:
unchanged:
--- tulip-2.0.4.orig/library/tulip-ogl/src/GlAugmentedDisplay.cpp
+++ tulip-2.0.4/library/tulip-ogl/src/GlAugmentedDisplay.cpp
@@ -15,8 +15,6 @@
using namespace std;
-namespace tlp
-{
GlAugmentedDisplay::GlAugmentedDisplay() {
}
@@ -52,4 +50,3 @@
bool GlAugmentedDisplay::getRenderState(GlADRenderState renderState) const {
return renderOptions.getRenderState(renderState);
}
-}
only in patch2:
unchanged:
--- tulip-2.0.4.orig/library/tulip-ogl/src/GlADBox.cpp
+++ tulip-2.0.4/library/tulip-ogl/src/GlADBox.cpp
@@ -9,8 +9,6 @@
using namespace std;
-namespace tlp
-{
GlADBox::GlADBox()
{
// no default constructor :)
@@ -195,4 +193,3 @@
faces[i]->setRenderOptions(renderOptions);
}
}
-}
only in patch2:
unchanged:
--- tulip-2.0.4.orig/library/tulip-ogl/src/GlADAxisPoint.cpp
+++ tulip-2.0.4/library/tulip-ogl/src/GlADAxisPoint.cpp
@@ -7,8 +7,6 @@
#include "tulip/GlADAxisPoint.h"
using namespace std;
-namespace tlp
-{
GlADAxisPoint::GlADAxisPoint()
{
// cout << __PRETTY_FUNCTION__ << endl ;
@@ -159,4 +157,3 @@
this->displayDim[i] = displayDim[i];
}
-}
only in patch2:
unchanged:
--- tulip-2.0.4.orig/library/tulip-ogl/src/GlHud.cpp
+++ tulip-2.0.4/library/tulip-ogl/src/GlHud.cpp
@@ -15,7 +15,6 @@
using namespace std;
-namespace tlp {
//=========================================================
GlHud::GlHud() {
}
@@ -64,4 +63,3 @@
return res;
}
//=========================================================
-}
only in patch2:
unchanged:
--- tulip-2.0.4.orig/library/tulip-ogl/src/GlADGrid.cpp
+++ tulip-2.0.4/library/tulip-ogl/src/GlADGrid.cpp
@@ -11,7 +11,6 @@
using namespace std;
-namespace tlp {
//============================================================
GlADGrid::GlADGrid() {
//cout << "[START] ... " << __PRETTY_FUNCTION__ << endl;
@@ -122,4 +121,3 @@
}
-}
only in patch2:
unchanged:
--- tulip-2.0.4.orig/library/tulip-ogl/src/GlADPoint.cpp
+++ tulip-2.0.4/library/tulip-ogl/src/GlADPoint.cpp
@@ -7,8 +7,6 @@
#include "tulip/GlADPoint.h"
-namespace tlp
-{
GlADPoint::GlADPoint()
{
position = new Coord(0, 0, 0);
@@ -63,4 +61,3 @@
this->color = new Color(color);
}
-}
only in patch2:
unchanged:
--- tulip-2.0.4.orig/library/tulip-ogl/src/GlHudCircle.cpp
+++ tulip-2.0.4/library/tulip-ogl/src/GlHudCircle.cpp
@@ -16,7 +16,6 @@
using namespace std;
-namespace tlp {
GlHudCircle::GlHudCircle() {
}
@@ -94,4 +93,3 @@
computeCircle();
}
-}
only in patch2:
unchanged:
--- tulip-2.0.4.orig/thirdparty/ftgl/FTTextureGlyph.h
+++ tulip-2.0.4/thirdparty/ftgl/FTTextureGlyph.h
@@ -52,7 +52,7 @@
* Reset the currently active texture to zero to get into a known
state before
* drawing a string. This is to get round possible threading issues.
*/
- static void FTTextureGlyph::ResetActiveTexture(){ activeTextureID = 0;}
+ static void ResetActiveTexture(){ activeTextureID = 0;}
private:
/**
only in patch2:
unchanged:
--- tulip-2.0.4.orig/software/tulip/src/TulipStatsWidget.cpp
+++ tulip-2.0.4/software/tulip/src/TulipStatsWidget.cpp
@@ -55,8 +55,6 @@
using namespace tlp;
using namespace std;
-namespace tlp
-{
TulipStats::TulipStats(QWidget *parent, const char *name, WFlags fl) :
TulipStatsData(parent, name, fl), glGraphWidget(0), supergraph(0)
{
// cout << "[START]..." << __PRETTY_FUNCTION__ ;
@@ -1234,5 +1232,4 @@
// cout << " ...[END]" << endl;
}
-}
only in patch2:
unchanged:
--- tulip-2.0.4.orig/software/tulip/src/GridOptionsWidget.cpp
+++ tulip-2.0.4/software/tulip/src/GridOptionsWidget.cpp
@@ -18,8 +18,6 @@
using namespace tlp;
using namespace std;
-namespace tlp
-{
GridOptionsWidget::GridOptionsWidget(QWidget *parent, const char *name,
WFlags fl) : GridOptionsData(parent, name, fl), glGraphWidget(0) {
connect(CancelBtn, SIGNAL(clicked()), SLOT(close()));
connect(OkBtn, SIGNAL(clicked()), SLOT(validateGrid()));
@@ -166,4 +164,3 @@
glGraphWidget->updateGL();
}
//==============================================
-}
-- END ---- Ben Hutchings -- [EMAIL PROTECTED] shortened to [EMAIL PROTECTED] If you've signed my GPG key, please send a signature on and to the new uid. I'm not a reverse psychological virus. Please don't copy me into your sig.
signature.asc
Description: This is a digitally signed message part
