--- earth3d-1.0.5.orig/formview.ui.h +++ earth3d-1.0.5/formview.ui.h @@ -9,8 +9,7 @@ ** place of a destructor. *****************************************************************************/ -#include - +#include #include "connectNetworkService.h" #include "serviceFoundLister.h" #include --- earth3d-1.0.5.orig/listViewServiceItem.cpp +++ earth3d-1.0.5/listViewServiceItem.cpp @@ -1,4 +1,5 @@ #include "listViewServiceItem.h" +#include #include #include --- earth3d-1.0.5.orig/debian/earth3d.manpages +++ earth3d-1.0.5/debian/earth3d.manpages @@ -0,0 +1 @@ +earth3d.1 --- earth3d-1.0.5.orig/debian/control +++ earth3d-1.0.5/debian/control @@ -0,0 +1,15 @@ +Source: earth3d +Section: utils +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Petter Reinholdtsen +Uploaders: Dominique Andre Gunia , Debian GIS Project +Build-Depends: debhelper (>> 4.0.0), dpatch, libqt3-mt-dev, libqt3-headers, qt3-dev-tools, imagemagick +Standards-Version: 3.7.2 + +Package: earth3d +Architecture: any +Depends: ${shlibs:Depends} +Description: Map client displaying a 3D model of the world + The map data is fetched from a server on the net, and the client will + display recent satellite images and map data. --- earth3d-1.0.5.orig/debian/compat +++ earth3d-1.0.5/debian/compat @@ -0,0 +1 @@ +4 --- earth3d-1.0.5.orig/debian/earth3d.docs +++ earth3d-1.0.5/debian/earth3d.docs @@ -0,0 +1 @@ +README --- earth3d-1.0.5.orig/debian/earth3d.desktop +++ earth3d-1.0.5/debian/earth3d.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Icon=earth +Exec=earth3d +DocPath= +Comment=earth3d - 3D Model of the earth +Name=earth3d +Categories=Qt;Education;Science --- earth3d-1.0.5.orig/debian/rules +++ earth3d-1.0.5/debian/rules @@ -0,0 +1,112 @@ +#!/usr/bin/make -f + +PACKAGE=earth3d + +#export DH_VERBOSE=1 +export DH_OPTIONS + +include /usr/share/dpatch/dpatch.make + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +debian/earth.xpm: images/webpres.png + convert -resize 32 $< $@ + +configure: configure-stamp +configure-stamp: patch-stamp + dh_testdir + qmake earth3d.pro + touch configure-stamp + +#Architecture +build: build-arch build-indep + +build-arch: build-arch-stamp +build-arch-stamp: configure-stamp + +# Add here commands to compile the arch part of the package. + $(MAKE) + +build-indep: build-indep-stamp +build-indep-stamp: configure-stamp + +# Add here commands to compile the indep part of the package. +#$(MAKE) doc + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-arch-stamp build-indep-stamp configure-stamp + rm -f debian/earth.xpm + +# Add here commands to clean up after the build process. + -$(MAKE) distclean + + rm -f Makefile + + dh_clean + +install: install-arch #install-indep +install-indep: + dh_testdir + dh_testroot + dh_clean -k -i + dh_installdirs -i + +# dh_movefiles -i + +install-arch: debian/earth.xpm + dh_testdir + dh_testroot + dh_clean -k -a + dh_installdirs -a + dh_installman + + $(MAKE) install DESTDIR=$(CURDIR)/debian/$(PACKAGE) + + # The qmake install target is empty. Do the install here instead. + install earth3d $(CURDIR)/debian/$(PACKAGE)/usr/bin/earth3d + install -m644 Changelog \ + $(CURDIR)/debian/$(PACKAGE)/usr/share/doc/$(PACKAGE)/changelog + install -D -m 644 debian/earth.xpm $(CURDIR)/debian/$(PACKAGE)/usr/share/pixmaps/earth.xpm + install -D -m 644 debian/earth3d.desktop $(CURDIR)/debian/$(PACKAGE)/usr/share/applications/kde/earth3d.desktop + +# dh_movefiles -a +# Must not depend on anything. This is to be called by +# binary-arch/binary-multi +# in another 'make' thread. +binary-common: + dh_testdir + dh_testroot + dh_installdocs + dh_installchangelogs + dh_installmenu + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_shlibdeps + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb +# Build architecture independant packages using the common target. +binary-indep: build-indep install-indep + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependant packages using the common target. +binary-arch: build-arch install-arch + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + +binary: binary-arch #binary-indep +.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure --- earth3d-1.0.5.orig/debian/copyright +++ earth3d-1.0.5/debian/copyright @@ -0,0 +1,15 @@ +This package was debianized by Petter Reinholdtsen 2005-07-10 10:53 +0200. + +It was downloaded from + +Upstream Author: Dominique Andre Gunia + +Copyright: + +These programs are free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) any +later version. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- earth3d-1.0.5.orig/debian/dirs +++ earth3d-1.0.5/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/doc/earth3d --- earth3d-1.0.5.orig/debian/earth3d.menu +++ earth3d-1.0.5/debian/earth3d.menu @@ -0,0 +1,6 @@ +?package(earth3d):\ + needs="X11"\ + section="Apps/Science"\ + title="Earth3D"\ + command="/usr/bin/earth3d"\ + icon="/usr/share/pixmaps/earth.xpm" --- earth3d-1.0.5.orig/debian/changelog +++ earth3d-1.0.5/debian/changelog @@ -0,0 +1,87 @@ +earth3d (1.0.5-1.1ubuntu2) natty; urgency=low + + * Link against PNG library to fix FTBFS. + + -- Ilya Barygin Mon, 10 Jan 2011 15:30:39 +0300 + +earth3d (1.0.5-1.1ubuntu1) karmic; urgency=low + + * debian/earth3d.desktop: + - fix typo (LP: #286738) + + -- Michael Vogt Wed, 07 Oct 2009 09:48:31 +0200 + +earth3d (1.0.5-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with GCC 4.3 (Closes: #417173). + + -- Luk Claes Sun, 09 Mar 2008 11:14:10 +0000 + +earth3d (1.0.5-1) unstable; urgency=low + + * Convert to a non-native package, it was uploaded as a native package + by mistake. (Closes: #385103) + * Add KDE desktop entry to make the program show up in the KDE menu + Edutainment/Science as well as the Debian menu Apps/Science. + + -- Petter Reinholdtsen Mon, 4 Sep 2006 08:17:56 +0200 + +earth3d (1.0.5) unstable; urgency=low + + * New upstream release. + - Improve handling of scroll mouses. + * Update standards-version to 3.7.2 (no changes needed). + + -- Petter Reinholdtsen Tue, 8 Aug 2006 19:13:59 +0200 + +earth3d (1.0.4-1) unstable; urgency=low + + * New upstream release. + - New runtime options to select texture features. + - Includes earth3d(1) manual page. (Closes: #327552) + - Added client caching of geo data. + * Drop 10_texture_compr.dpatch, as this is a runtime option now. + * Add code to include menu icon. Patch from Steffen Joeris. + (Closes: #335884) + + -- Petter Reinholdtsen Tue, 1 Nov 2005 23:06:37 +0100 + +earth3d (1.0.3-1) unstable; urgency=low + + * New upstream release. + * Undefine USE_GL_TEXTURE_COMPRESSION during built to get textures + to show up with more X drivers. (10_texture_compr.dpatch) + * Removed patches applied upstream: + - 10_gcc4.dpatch + - 20_upstream_location.dpatch + - 30_addnewline.dpatch + - 40_badurl.dpatch + + -- Petter Reinholdtsen Sun, 11 Sep 2005 00:00:54 +0200 + +earth3d (1.0.2-3) unstable; urgency=low + + * Added menu file. + * Avoid crashing when a bad url is given to earth3d. (Closes: #323491) + + -- Petter Reinholdtsen Wed, 28 Aug 2005 16:25:50 +0200 + +earth3d (1.0.2-2) unstable; urgency=low + + * Add missing build-depend on dpatch. + * Add trailing newline in network/urlTools.h to avoid compiler + warning. (30_addnewline.dpatch) + * Add the Debian GIS Project as an uploader. This program is a GIS tool. + + -- Petter Reinholdtsen Sun, 14 Aug 2005 09:13:15 +0200 + +earth3d (1.0.2-1) unstable; urgency=low + + * Initial release. (Closes: #317649) + * Make QueuedMessage copy constructor take a const reference to get the + code compiling using gcc 4.0. (10_gcc4.dpatch) + * Add link to the sourceforge page in the README. + (20_upstream_location.dpatch) + + -- Petter Reinholdtsen Tue, 2 Aug 2005 22:51:38 +0200 --- earth3d-1.0.5.orig/debian/patches/10_texture_compr.dpatch +++ earth3d-1.0.5/debian/patches/10_texture_compr.dpatch @@ -0,0 +1,19 @@ +#! /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. + +@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 --- earth3d-1.0.5.orig/debian/patches/00list +++ earth3d-1.0.5/debian/patches/00list @@ -0,0 +1,5 @@ +# +# List of patches to apply. +# +#10_texture_compr +20_png_library --- earth3d-1.0.5.orig/debian/patches/20_png_library.dpatch +++ earth3d-1.0.5/debian/patches/20_png_library.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_png_library.dpatch by Ilya Barygin +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Link against PNG library to fix FTBFS. + +@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/ ./ + --- earth3d-1.0.5.orig/geometry/geometry2d3dFactory.cpp +++ earth3d-1.0.5/geometry/geometry2d3dFactory.cpp @@ -1,4 +1,5 @@ #include "geometry2d3dFactory.h" +#include Geometry2D3DFactory::Geometry2D3DFactory() { } --- 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 #include #include #include @@ -12,7 +13,10 @@ #include "downloadFinishedEvent.h" #ifndef WIN32 -#include +#include +#include + +using std::allocator; #endif using namespace std; --- earth3d-1.0.5.orig/network/urlTools.cpp +++ earth3d-1.0.5/network/urlTools.cpp @@ -1,4 +1,5 @@ #include "urlTools.h" +#include #include #include #include --- earth3d-1.0.5.orig/network/serviceFoundLister.cpp +++ earth3d-1.0.5/network/serviceFoundLister.cpp @@ -1,4 +1,5 @@ #include "serviceFoundLister.h" +#include #include #include "listViewServiceItem.h" #include --- 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 #include #include #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 DrawSceneObjectScale::DrawSceneObjectScale(DrawScene *scene) : DrawSceneObjectTransform(scene) { --- earth3d-1.0.5.orig/draw/drawSceneObjectQuad.cpp +++ earth3d-1.0.5/draw/drawSceneObjectQuad.cpp @@ -1,4 +1,5 @@ #include "drawSceneObjectQuad.h" +#include DrawSceneObjectQuad::DrawSceneObjectQuad(DrawScene *scene) : DrawSceneObject(scene) { --- earth3d-1.0.5.orig/draw/treeDrawFactory.cpp +++ earth3d-1.0.5/draw/treeDrawFactory.cpp @@ -1,4 +1,5 @@ #include "treeDrawFactory.h" +#include #include #include #include "treeDraw.h" --- earth3d-1.0.5.orig/draw/drawSceneObjectRotatequaternion.cpp +++ earth3d-1.0.5/draw/drawSceneObjectRotatequaternion.cpp @@ -1,4 +1,5 @@ #include "drawSceneObjectRotatequaternion.h" +#include DrawSceneObjectRotatequaternion::DrawSceneObjectRotatequaternion(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 DrawSceneObjectTriangle::DrawSceneObjectTriangle(DrawScene *scene) : DrawSceneObject(scene) { --- earth3d-1.0.5.orig/draw/drawSceneObjectTranslate.cpp +++ earth3d-1.0.5/draw/drawSceneObjectTranslate.cpp @@ -1,4 +1,5 @@ #include "drawSceneObjectTranslate.h" +#include DrawSceneObjectTranslate::DrawSceneObjectTranslate(DrawScene *scene) : DrawSceneObjectTransform(scene) {