I attatch a patch (suitable for adding to the quilt series) that does
that for the two source files that are impacted by this issue and
fixes another compilation issue (I'm not sure of the correctness of
that second fix and as such am not applying the patch tag please check
it before uploading it).
I also had to modify debian/rules to force linking aginst some
libraries due to the new stricter linker behaviour i've attatched the
modified rules file for that.
Sorry forgot to actually attatch the files
#!/usr/bin/make -f
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
#
# Modified to make a template file for a multi-binary package with separated
# build-arch and build-indep targets by Bill Allombert 2001
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
# This has to be exported to make some magic below work.
export DH_OPTIONS
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
#GCC4_ICES_HERE := arm m68k hppa
DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
#ifneq (,$(filter $(DEB_HOST_ARCH_CPU),$(GCC4_ICES_HERE)))
# export CC=gcc-3.4
# export CPP=cpp-3.4
# export CXX=g++-3.4
#endif
# Since the configure-script doesn't work when building outside of the
# source dir, we have to copy the damned thing a few times.
# This is a crude hack really and the configure script should be fixed
# but for now it works...
#
# So first we build a list of stuff to copy.
LIST = $(shell ls | grep -v ^debian$ | grep -v ^build-)
BUILDDIRS = build-glut build-kde build-gnome
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
# For the KDE part
-include debian/debiandirs
debian/debiandirs: admin/debianrules
perl -w admin/debianrules echodirs > debian/debiandirs
################
# CONFIG PHASE #
################
config: config-glut config-gnome config-kde
config-glut: config-glut-stamp
config-glut-stamp:
-mkdir build-glut
-chmod a+x configure
-for TMP in $(LIST); do cp -ldpR $$TMP build-glut; done
-cp /usr/share/misc/config.* build-glut
cd build-glut && LIBS=-ldl ./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--disable-rpath \
--with-glut \
--with-lua \
--without-arts \
LDFLAGS="-Wl,--as-needed"
touch config-glut-stamp
config-gnome: config-gnome-stamp
config-gnome-stamp:
-mkdir build-gnome
-chmod a+x configure
-for TMP in $(LIST); do cp -ldpR $$TMP build-gnome; done
-cp /usr/share/misc/config.* build-gnome
cd build-gnome && LIBS=-ldl ./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--disable-rpath \
--with-gnome \
--with-lua \
--without-arts \
--with-gconf-schema-file-dir=/usr/share/gconf/schemas \
LDFLAGS="-Wl,--as-needed"
touch config-gnome-stamp
config-kde: config-kde-stamp
config-kde-stamp:
-mkdir build-kde
-chmod a+x configure
-for TMP in $(LIST); do cp -ldpR $$TMP build-kde; done
-cp /usr/share/misc/config.* build-kde
cd build-kde && LIBS="-lDCOP -ldl" ./configure
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--disable-rpath \
--with-kde --enable-libsuffix= \
--without-arts \
--with-lua
touch config-kde-stamp
###############
# BUILD PHASE #
###############
build: build-arch build-indep
build-arch: build-glut build-gnome build-kde
build-indep: build-glut
build-glut: build-glut-stamp
build-glut-stamp: config-glut
cd build-glut && $(MAKE)
touch build-glut-stamp
build-gnome: build-gnome-stamp
build-gnome-stamp: config-gnome
cd build-gnome && $(MAKE)
touch build-gnome-stamp
build-kde: build-kde-stamp
build-kde-stamp: config-kde
cd build-kde && $(MAKE)
touch build-kde-stamp
###############
# CLEAN PHASE #
###############
clean:
dh_testdir
dh_testroot
rm -f *-stamp
rm -rf $(BUILDDIRS)
rm -rf debian/debiandirs
rm -rf config.sub config.guess
dh_clean
#################
# INSTALL PHASE #
#################
install: install-arch install-indep
install-indep: install-indep-stamp
install-indep-stamp: build-indep
dh_testdir
dh_testroot
dh_prep -i
dh_installdirs -i
# Common files
cd build-glut && GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=yes \
$(MAKE) install DESTDIR=$(CURDIR)/debian/celestia-common
rm -rf debian/celestia-common/usr/bin \
debian/celestia-common/usr/lib \
debian/celestia-common/usr/share/celestia/COPYING*
mv debian/celestia-common/usr/share/celestia/celestia.cfg \
debian/celestia-common/etc/celestia.cfg
ln -s /etc/celestia.cfg debian/celestia-common/usr/share/celestia/
touch install-indep-stamp
install-arch: build-arch install-indep
dh_testdir
dh_testroot
dh_prep -a
dh_installdirs -a
# GLUT frontend
cd build-glut/src/celestia &&
GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=yes \
$(MAKE) install DESTDIR=$(CURDIR)/debian/celestia-glut
mv debian/celestia-glut/usr/bin/celestia
debian/celestia-glut/usr/bin/celestia-glut
chrpath --delete debian/celestia-glut/usr/bin/celestia-glut
mkdir -p debian/celestia-glut/usr/share/applications
cp debian/celestia-glut.desktop
debian/celestia-glut/usr/share/applications/
# GNOME frontend
cd build-gnome && GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=yes \
$(MAKE) install DESTDIR=$(CURDIR)/debian/celestia-gnome
mv debian/celestia-gnome/usr/bin/celestia
debian/celestia-gnome/usr/bin/celestia-gnome
chrpath --delete debian/celestia-gnome/usr/bin/celestia-gnome
mkdir -p debian/celestia-gnome/usr/share/celestia
# KDE frontend
cd build-kde && GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=yes \
$(MAKE) install DESTDIR=$(CURDIR)/debian/celestia-kde
mv debian/celestia-kde/usr/bin/celestia
debian/celestia-kde/usr/bin/celestia-kde
chrpath --delete debian/celestia-kde/usr/bin/celestia-kde
rm -rf debian/celestia-kde/usr/share/apps/celestia
ln -s ../celestia debian/celestia-kde/usr/share/apps/
# Install KDE manual that is no longer installed automatically...
mkdir -p debian/celestia-kde/usr/share/doc/kde/HTML/en/celestia
cp build-kde/src/celestia/kde/doc/celestia/*.jpg
debian/celestia-kde/usr/share/doc/kde/HTML/en/celestia/
cp build-kde/src/celestia/kde/doc/celestia/index.*
debian/celestia-kde/usr/share/doc/kde/HTML/en/celestia/
# Remove /usr/share/celestia files already found in celestia-common
for i in celestia-glut celestia-gnome celestia-kde; \
do \
cd $(CURDIR)/debian/celestia-common/usr/share && \
find . ! -type d -print0 | \
(cd $(CURDIR)/debian/$$i/usr/share && \
xargs -0 rm -f); \
rm -f $(CURDIR)/debian/$$i/usr/share/celestia/COPYING* \
$(CURDIR)/debian/$$i/usr/share/celestia/celestia.cfg \
$(CURDIR)/debian/$$i/celestia; \
cd $(CURDIR)/debian/$$i && \
find . -mindepth 1 -depth -type d -print0 | \
xargs -0 rmdir --ignore-fail-on-non-empty; \
done
dh_install -a
################
# BINARY PHASE #
################
# 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_installchangelogs ChangeLog
dh_installdocs
dh_icons
# dh_installexamples
dh_installmenu
# dh_installdebconf
# dh_installinfo
dh_installman
dh_gconf
dh_link
dh_strip
dh_compress -X.docbook
dh_fixperms
dh_shlibdeps
dh_installdeb
dh_gencontrol
dh_md5sums
dh_builddeb
# Build architecture independant packages using the common target.
binary-indep: install-indep
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
# Build architecture dependant packages using the common target.
binary-arch: install-arch
$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
binary: binary-arch binary-indep
.PHONY: build clean binary-indep binary-arch config config-glut config-gnome
config-kde build-glut build-gnome build-kde build-indep build-arch build binary
install install-indep install-arch
Index: celestia-1.6.0+dfsg/src/celengine/mesh.cpp
===================================================================
--- celestia-1.6.0+dfsg.orig/src/celengine/mesh.cpp 2011-03-13 12:42:25.000000000 +0000
+++ celestia-1.6.0+dfsg/src/celengine/mesh.cpp 2011-03-13 12:42:47.000000000 +0000
@@ -7,13 +7,13 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
+#include <cassert>
+#include <iostream>
+#include <algorithm>
#include "mesh.h"
#include "rendcontext.h"
#include "gl.h"
#include "glext.h"
-#include <cassert>
-#include <iostream>
-#include <algorithm>
using namespace std;
Index: celestia-1.6.0+dfsg/src/celengine/model.cpp
===================================================================
--- celestia-1.6.0+dfsg.orig/src/celengine/model.cpp 2011-03-13 12:50:06.000000000 +0000
+++ celestia-1.6.0+dfsg/src/celengine/model.cpp 2011-03-13 12:50:06.000000000 +0000
@@ -7,11 +7,11 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
-#include "model.h"
-#include "rendcontext.h"
#include <cassert>
#include <functional>
#include <algorithm>
+#include "model.h"
+#include "rendcontext.h"
using namespace std;
Index: celestia-1.6.0+dfsg/src/celestia/celx_object.cpp
===================================================================
--- celestia-1.6.0+dfsg.orig/src/celestia/celx_object.cpp 2011-03-13 12:57:59.000000000 +0000
+++ celestia-1.6.0+dfsg/src/celestia/celx_object.cpp 2011-03-13 12:59:15.000000000 +0000
@@ -773,7 +773,7 @@
markAlpha = 1.0f;
Color markColorAlpha(0.0f, 1.0f, 0.0f, 0.9f);
- markColorAlpha = Color::Color(markColor, markAlpha);
+ markColorAlpha = Color(markColor, markAlpha);
const char* markLabel = celx.safeGetString(6, WrongType, "Fifth argument to object:mark must be a string");
if (markLabel == NULL)
