[SCM] earth3d branch, master, updated. 88b54c4346ef77876519b8475ebf80fe36e76427
Aron Xu
aron at debian.org
Mon Jun 27 10:05:29 UTC 2011
The following commit has been merged in the master branch:
commit 88b54c4346ef77876519b8475ebf80fe36e76427
Author: Aron Xu <aron at debian.org>
Date: Mon Jun 27 18:05:16 2011 +0800
Use quilt patch system, clean up patches outside the patch system.
diff --git a/debian/changelog b/debian/changelog
index 6646257..131509e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
earth3d (1.0.5-2) UNRELEASED; urgency=low
* Team upload by Debian GIS Project.
- * Use 3.0 (quilt) format, dh compact 7.
+ * Use 3.0 (quilt) format, dh compact 7, covert patches to quilt.
* debian/copyright:
- Reference to GPL-2 instead of obsolete GPL.
- Add valid copyright info.
diff --git a/debian/control b/debian/control
index 0a68f08..6daa83c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
Priority: optional
Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Uploaders: Petter Reinholdtsen <pere at debian.org>, Dominique Andre Gunia <webmaster at earth3d.org>
-Build-Depends: debhelper (>=7), dpatch, libqt3-mt-dev, libqt3-headers, qt3-dev-tools, imagemagick
+Build-Depends: debhelper (>=7), quilt, libqt3-mt-dev, libqt3-headers, qt3-dev-tools, imagemagick
Standards-Version: 3.9.2
Package: earth3d
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e0a1ebe..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# List of patches to apply.
-#
-10_texture_compr
-20_png_library
diff --git a/debian/patches/10_fix_ftbfs.patch b/debian/patches/10_fix_ftbfs.patch
new file mode 100644
index 0000000..d726c14
--- /dev/null
+++ b/debian/patches/10_fix_ftbfs.patch
@@ -0,0 +1,127 @@
+From: Aron Xu <aron at debian.org>
+Subject: Use correct includes to avoid FTBFS
+ The patch was originally applied directly to source by previous maintainer.
+ During the covertion to quilt from dpatch, I make this patch.
+Last-Update: 2011-06-27
+--- earth3d-1.0.5.orig/formview.ui.h
++++ earth3d-1.0.5/formview.ui.h
+@@ -9,8 +9,7 @@
+ ** place of a destructor.
+ *****************************************************************************/
+
+-#include <iostream>
+-
++#include <cstdlib>
+ #include "connectNetworkService.h"
+ #include "serviceFoundLister.h"
+ #include <vector>
+--- earth3d-1.0.5.orig/listViewServiceItem.cpp
++++ earth3d-1.0.5/listViewServiceItem.cpp
+@@ -1,4 +1,5 @@
+ #include "listViewServiceItem.h"
++#include <cstdlib>
+ #include <qdom.h>
+ #include <qpixmap.h>
+
+--- earth3d-1.0.5.orig/network/urlTools.cpp
++++ earth3d-1.0.5/network/urlTools.cpp
+@@ -1,4 +1,5 @@
+ #include "urlTools.h"
++#include <cstdlib>
+ #include <qdom.h>
+ #include <qtextstream.h>
+ #include <iostream>
+--- earth3d-1.0.5.orig/network/urlDownload.cpp
++++ earth3d-1.0.5/network/urlDownload.cpp
+@@ -1,5 +1,6 @@
+ #include "urlDownload.h"
+ #include "urlTools.h"
++#include <cstdlib>
+ #include <string.h>
+ #include <iostream>
+ #include <qnetwork.h>
+@@ -12,7 +13,10 @@
+ #include "downloadFinishedEvent.h"
+
+ #ifndef WIN32
+-#include <alloc.h>
++#include <bits/c++config.h>
++#include <bits/allocator.h>
++
++using std::allocator;
+ #endif
+
+ using namespace std;
+--- earth3d-1.0.5.orig/network/serviceFoundLister.cpp
++++ earth3d-1.0.5/network/serviceFoundLister.cpp
+@@ -1,4 +1,5 @@
+ #include "serviceFoundLister.h"
++#include <cstdlib>
+ #include <iostream>
+ #include "listViewServiceItem.h"
+ #include <qdom.h>
+--- earth3d-1.0.5.orig/geometry/geometry2d3dFactory.cpp
++++ earth3d-1.0.5/geometry/geometry2d3dFactory.cpp
+@@ -1,4 +1,5 @@
+ #include "geometry2d3dFactory.h"
++#include <cstdlib>
+
+ Geometry2D3DFactory::Geometry2D3DFactory() {
+ }
+--- earth3d-1.0.5.orig/draw/treeDrawPOI.cpp
++++ earth3d-1.0.5/draw/treeDrawPOI.cpp
+@@ -1,5 +1,6 @@
+ #define GL_GLEXT_PROTOTYPES
+ #include "treeDrawPOI.h"
++#include <cstdlib>
+ #include <stdio.h>
+ #include <GL/glext.h>
+ #include "treeDrawPOISign.h"
+--- earth3d-1.0.5.orig/draw/drawSceneObjectScale.cpp
++++ earth3d-1.0.5/draw/drawSceneObjectScale.cpp
+@@ -1,4 +1,5 @@
+ #include "drawSceneObjectScale.h"
++#include <cstdlib>
+
+ DrawSceneObjectScale::DrawSceneObjectScale(DrawScene *scene)
+ : DrawSceneObjectTransform(scene) {
+--- earth3d-1.0.5.orig/draw/drawSceneObjectTranslate.cpp
++++ earth3d-1.0.5/draw/drawSceneObjectTranslate.cpp
+@@ -1,4 +1,5 @@
+ #include "drawSceneObjectTranslate.h"
++#include <cstdlib>
+
+ DrawSceneObjectTranslate::DrawSceneObjectTranslate(DrawScene *scene)
+ : DrawSceneObjectTransform(scene) {
+--- earth3d-1.0.5.orig/draw/drawSceneObjectTriangle.cpp
++++ earth3d-1.0.5/draw/drawSceneObjectTriangle.cpp
+@@ -1,4 +1,5 @@
+ #include "drawSceneObjectTriangle.h"
++#include <cstdlib>
+
+ DrawSceneObjectTriangle::DrawSceneObjectTriangle(DrawScene *scene)
+ : DrawSceneObject(scene) {
+--- earth3d-1.0.5.orig/draw/drawSceneObjectQuad.cpp
++++ earth3d-1.0.5/draw/drawSceneObjectQuad.cpp
+@@ -1,4 +1,5 @@
+ #include "drawSceneObjectQuad.h"
++#include <cstdlib>
+
+ DrawSceneObjectQuad::DrawSceneObjectQuad(DrawScene *scene)
+ : DrawSceneObject(scene) {
+--- earth3d-1.0.5.orig/draw/drawSceneObjectRotatequaternion.cpp
++++ earth3d-1.0.5/draw/drawSceneObjectRotatequaternion.cpp
+@@ -1,4 +1,5 @@
+ #include "drawSceneObjectRotatequaternion.h"
++#include <cstdlib>
+
+ DrawSceneObjectRotatequaternion::DrawSceneObjectRotatequaternion(DrawScene *scene)
+ : DrawSceneObjectTransform(scene) {
+--- earth3d-1.0.5.orig/draw/treeDrawFactory.cpp
++++ earth3d-1.0.5/draw/treeDrawFactory.cpp
+@@ -1,4 +1,5 @@
+ #include "treeDrawFactory.h"
++#include <cstdlib>
+ #include <qtextstream.h>
+ #include <qdom.h>
+ #include "treeDraw.h"
diff --git a/debian/patches/10_texture_compr.dpatch b/debian/patches/10_texture_compr.dpatch
deleted file mode 100755
index 020ce4f..0000000
--- a/debian/patches/10_texture_compr.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## debian/patches/10_texture_compr.dpatch by Petter Reinholdtsen
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Disable use of compressed textures to get the textures to show
-## DP: up on the maintainers display.
-
- at DPATCH@
---- earth3d-1.0.3.orig/earth3d.pro
-+++ earth3d-1.0.3/earth3d.pro
-@@ -49,7 +49,7 @@
- DEFINES += QT_THREAD_SUPPORT
- # DEFINES += DAVE
- # DEFINES += FORWARD_VIEW_DRAW
--DEFINES += USE_GL_TEXTURE_COMPRESSION
-+# DEFINES += USE_GL_TEXTURE_COMPRESSION
- # DEFINES += SCREENSHOT_ALWAY_BIND_TEXTURE
- # DEFINES += DEBUG_SPHERES
- # # DEFINES += USE_ICON_BLENDING
diff --git a/debian/patches/10_texture_compr.patch b/debian/patches/10_texture_compr.patch
new file mode 100644
index 0000000..2647f0c
--- /dev/null
+++ b/debian/patches/10_texture_compr.patch
@@ -0,0 +1,11 @@
+--- a/earth3d.pro
++++ b/earth3d.pro
+@@ -50,7 +50,7 @@
+ # DEFINES += NO_MULTITEXTURE
+ # DEFINES += DAVE
+ # DEFINES += FORWARD_VIEW_DRAW
+-DEFINES += USE_GL_TEXTURE_COMPRESSION
++# DEFINES += USE_GL_TEXTURE_COMPRESSION
+ # DEFINES += SCREENSHOT_ALWAY_BIND_TEXTURE
+ # DEFINES += DEBUG_SPHERES
+ # # DEFINES += USE_ICON_BLENDING
diff --git a/debian/patches/20_png_library.dpatch b/debian/patches/20_png_library.dpatch
deleted file mode 100755
index 5a8e3a8..0000000
--- a/debian/patches/20_png_library.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_png_library.dpatch by Ilya Barygin <barygin at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Link against PNG library to fix FTBFS.
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' earth3d-1.0.5~/earth3d.pro earth3d-1.0.5/earth3d.pro
---- earth3d-1.0.5~/earth3d.pro 2005-10-28 05:06:01.000000000 +0400
-+++ earth3d-1.0.5/earth3d.pro 2011-01-10 15:30:19.000000000 +0300
-@@ -67,7 +67,7 @@
- # QMAKE_CXXFLAGS_DEBUG += -D EARTH3DDEBUG -D DEBUG
- CONFIG += qt thread opengl warn_on release stl
-
--# LIBS += -lglut
-+LIBS += -lpng
- # DEFINES += STATISTIC_NODECOUNT
- INCLUDEPATH += /usr/include/libxml2/libxml /usr/include/libxml2 ../../network/rubyAgents/c ../../dataserver /sw/include /usr/X11R6/include/ /sw/include/libxml2 geometry/ network/ draw/ tree/ ./
-
diff --git a/debian/patches/20_png_library.patch b/debian/patches/20_png_library.patch
new file mode 100644
index 0000000..9d2d2e7
--- /dev/null
+++ b/debian/patches/20_png_library.patch
@@ -0,0 +1,13 @@
+From: Ilya Barygin <barygin at gmail.com>
+Subject: Fix FTBFS with binutils-gold by linking to libpng
+Bug-Debian: 554314
+--- a/earth3d.pro
++++ b/earth3d.pro
+@@ -68,6 +68,7 @@
+ CONFIG += qt thread opengl warn_on release stl
+
+ # LIBS += -lglut
++LIBS += -lpng
+ # DEFINES += STATISTIC_NODECOUNT
+ INCLUDEPATH += /usr/include/libxml2/libxml /usr/include/libxml2 ../../network/rubyAgents/c ../../dataserver /sw/include /usr/X11R6/include/ /sw/include/libxml2 geometry/ network/ draw/ tree/ ./
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..eb0c848
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+10_fix_ftbfs.patch
+20_png_library.patch
diff --git a/debian/rules b/debian/rules
index 9b27c82..78d4a12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ PACKAGE=earth3d
#export DH_VERBOSE=1
export DH_OPTIONS
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
CFLAGS = -Wall -g
@@ -22,7 +22,7 @@ debian/earth.xpm: images/webpres.png
convert -resize 32 $< $@
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp:
dh_testdir
qmake earth3d.pro
touch configure-stamp
diff --git a/draw/drawSceneObjectQuad.cpp b/draw/drawSceneObjectQuad.cpp
index da8ecfc..ffaf994 100644
--- a/draw/drawSceneObjectQuad.cpp
+++ b/draw/drawSceneObjectQuad.cpp
@@ -1,5 +1,4 @@
#include "drawSceneObjectQuad.h"
-#include <cstdlib>
DrawSceneObjectQuad::DrawSceneObjectQuad(DrawScene *scene)
: DrawSceneObject(scene) {
diff --git a/draw/drawSceneObjectRotatequaternion.cpp b/draw/drawSceneObjectRotatequaternion.cpp
index aa9cc18..5613b47 100644
--- a/draw/drawSceneObjectRotatequaternion.cpp
+++ b/draw/drawSceneObjectRotatequaternion.cpp
@@ -1,5 +1,4 @@
#include "drawSceneObjectRotatequaternion.h"
-#include <cstdlib>
DrawSceneObjectRotatequaternion::DrawSceneObjectRotatequaternion(DrawScene *scene)
: DrawSceneObjectTransform(scene) {
diff --git a/draw/drawSceneObjectScale.cpp b/draw/drawSceneObjectScale.cpp
index 6e268dc..a4d0c45 100644
--- a/draw/drawSceneObjectScale.cpp
+++ b/draw/drawSceneObjectScale.cpp
@@ -1,5 +1,4 @@
#include "drawSceneObjectScale.h"
-#include <cstdlib>
DrawSceneObjectScale::DrawSceneObjectScale(DrawScene *scene)
: DrawSceneObjectTransform(scene) {
diff --git a/draw/drawSceneObjectTranslate.cpp b/draw/drawSceneObjectTranslate.cpp
index bc4201c..c457b93 100644
--- a/draw/drawSceneObjectTranslate.cpp
+++ b/draw/drawSceneObjectTranslate.cpp
@@ -1,5 +1,4 @@
#include "drawSceneObjectTranslate.h"
-#include <cstdlib>
DrawSceneObjectTranslate::DrawSceneObjectTranslate(DrawScene *scene)
: DrawSceneObjectTransform(scene) {
diff --git a/draw/drawSceneObjectTriangle.cpp b/draw/drawSceneObjectTriangle.cpp
index c3f5a04..394b09d 100644
--- a/draw/drawSceneObjectTriangle.cpp
+++ b/draw/drawSceneObjectTriangle.cpp
@@ -1,5 +1,4 @@
#include "drawSceneObjectTriangle.h"
-#include <cstdlib>
DrawSceneObjectTriangle::DrawSceneObjectTriangle(DrawScene *scene)
: DrawSceneObject(scene) {
diff --git a/draw/treeDrawFactory.cpp b/draw/treeDrawFactory.cpp
index 5847d15..aa10359 100644
--- a/draw/treeDrawFactory.cpp
+++ b/draw/treeDrawFactory.cpp
@@ -1,5 +1,4 @@
#include "treeDrawFactory.h"
-#include <cstdlib>
#include <qtextstream.h>
#include <qdom.h>
#include "treeDraw.h"
diff --git a/draw/treeDrawPOI.cpp b/draw/treeDrawPOI.cpp
index 72cc567..a801c5a 100644
--- a/draw/treeDrawPOI.cpp
+++ b/draw/treeDrawPOI.cpp
@@ -1,6 +1,5 @@
#define GL_GLEXT_PROTOTYPES
#include "treeDrawPOI.h"
-#include <cstdlib>
#include <stdio.h>
#include <GL/glext.h>
#include "treeDrawPOISign.h"
diff --git a/formview.ui.h b/formview.ui.h
index 47f7510..0c55dea 100644
--- a/formview.ui.h
+++ b/formview.ui.h
@@ -9,7 +9,8 @@
** place of a destructor.
*****************************************************************************/
-#include <cstdlib>
+#include <iostream>
+
#include "connectNetworkService.h"
#include "serviceFoundLister.h"
#include <vector>
diff --git a/geometry/geometry2d3dFactory.cpp b/geometry/geometry2d3dFactory.cpp
index 1dbed1c..2645087 100644
--- a/geometry/geometry2d3dFactory.cpp
+++ b/geometry/geometry2d3dFactory.cpp
@@ -1,5 +1,4 @@
#include "geometry2d3dFactory.h"
-#include <cstdlib>
Geometry2D3DFactory::Geometry2D3DFactory() {
}
diff --git a/listViewServiceItem.cpp b/listViewServiceItem.cpp
index 565ce0f..7ec345f 100644
--- a/listViewServiceItem.cpp
+++ b/listViewServiceItem.cpp
@@ -1,5 +1,4 @@
#include "listViewServiceItem.h"
-#include <cstdlib>
#include <qdom.h>
#include <qpixmap.h>
diff --git a/network/serviceFoundLister.cpp b/network/serviceFoundLister.cpp
index e217187..8789b26 100644
--- a/network/serviceFoundLister.cpp
+++ b/network/serviceFoundLister.cpp
@@ -1,5 +1,4 @@
#include "serviceFoundLister.h"
-#include <cstdlib>
#include <iostream>
#include "listViewServiceItem.h"
#include <qdom.h>
diff --git a/network/urlDownload.cpp b/network/urlDownload.cpp
index 17ac6ce..0856cfd 100644
--- a/network/urlDownload.cpp
+++ b/network/urlDownload.cpp
@@ -1,6 +1,5 @@
#include "urlDownload.h"
#include "urlTools.h"
-#include <cstdlib>
#include <string.h>
#include <iostream>
#include <qnetwork.h>
@@ -13,10 +12,7 @@
#include "downloadFinishedEvent.h"
#ifndef WIN32
-#include <bits/c++config.h>
-#include <bits/allocator.h>
-
-using std::allocator;
+#include <alloc.h>
#endif
using namespace std;
diff --git a/network/urlTools.cpp b/network/urlTools.cpp
index 4b1c939..7afd50a 100644
--- a/network/urlTools.cpp
+++ b/network/urlTools.cpp
@@ -1,5 +1,4 @@
#include "urlTools.h"
-#include <cstdlib>
#include <qdom.h>
#include <qtextstream.h>
#include <iostream>
--
earth3d for Debian
More information about the Pkg-grass-devel
mailing list