diff -Nru celestia-1.6.0+dfsg/debian/celestia-kde.1 celestia-1.6.0+dfsg/debian/celestia-kde.1 --- celestia-1.6.0+dfsg/debian/celestia-kde.1 2009-12-19 23:39:00.000000000 +0000 +++ celestia-1.6.0+dfsg/debian/celestia-kde.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,195 +0,0 @@ -.\" Please adjust this date whenever revising the manpage. -.TH CELESTIA 1 "May 23, 2001" -.SH NAME -celestia \- A real-time visual space simulation -.SH SYNOPSIS -.B celestia -.RI [ options ] -.SH DESCRIPTION -This manual page documents briefly \fBcelestia\fP, a 3D space simulator. -Celestia is a real-time visual simulation of space in our local region of the -universe. Choose a point within about 1000 light years of Earth, and Celestia -will show you an approximation of how it would appear to your eyes were you -actually there. Some of what Celestia shows is necessarily hypothetical--the -farther away from Earth you get, the less real data there is and the more -guesswork is involved. Thus Celestia supplements observational data with good -guesses based on models of stellar and planetary processes. -.PP -Celestia is unique in its ability to allow you to navigate at an immense range -of scales. Orbit a couple kilometers above the surface of a tiny, irregular -asteroid, then head off toward Jupiter, watching it grow from a bright point of -light into a looming sphere filling your field of vision. Leave our solar -system entirely and observe the sun as it fades from a brilliant disk to a -bright star, disappearing almost entirely as you head off toward the Upsilon -Andromeda system to orbit around its innermost giant planet. -.SH OVERVIEW -Celestia will start up in a window, display a welcome message and some -information about your target (top left corner), your speed, and the -current time (Universal Time, so it'll probably be a few hours off from -your computer's clock.) In Celestia, you'll generally have an object -selected; currently, it's Eros, but it could also be a star, planet, -spacecraft, or galaxy. The simplest way to select an object is to click -on it. Try clicking on a star to select it. Right drag the mouse to -orbit arround the selected target. Left dragging the mouse changes your -orientation too, but the camera rotates about its center instead of -rotating around the target. Rolling the mouse wheel will change your -distance to the space station--you can move light years away, then roll -the wheel in the opposite direction to get back to your starting -location. If your mouse lacks a wheel, you can use the Home and End -keys instead. -.PP -Press G and you'll zoom through space toward the selected star. If you -press G again, you'll approach the star even closer. Press H to select -our Sun, and then G to go back to our solar system. You'll find -yourself half a light year away from the Sun, which looks merely like a -bright star at this range. Press G three more times to get within about -30 AU of the Sun and you will be to see a few planets become visible -near the Sun. -.\" Right click on the sun to bring up a menu of planets and -.\" other objects in the solar system. After selecting a planet from the -.\" menu, hit G again to travel toward it. Once there, hold down the right -.\" mouse button and drag to orbit the planet. -.SH USAGE -Mouse functions: -.PP -.TS -tab (@); -l l. -Left drag@orient camera -Right drag@orbit the selected object -Mouse wheel,@ -Middle drag@adjust distance to selection -left click@select target, double click to center -.TE -.PP -Keyboard commands: -.PP -Navigation -.PP -.TS -tab (@); -l l. -H@Select the sun (Home) -C@Center on selected object -G@Goto selected object -F@Follow selected object -Y@Orbit the selected object at a rate synced to its rotation -ESC@Cancel motion -.TE -.PP -Free movement -.PP -.TS -tab (@); -l l. -HOME@Move closer to object -END@Move farther from object -F1@Stop -F2@Set velocity to 1 km/s -F3@Set velocity to 1,000 km/s -F4@Set velocity to 1,000,000 km/s -F5@Set velocity to 1 AU/s -F6@Set velocity to 1 ly/s -A@Increase velocity by 10x -Z@Decrease velocity by 10x -Q@Reverse direction -X@Set movement direction toward center of screen -.TE -.PP -Time -.PP -.TS -tab (@); -l l. -Space@stop time -L@Time 10x faster -K@Time 10x slower -J@Reverse time -.TE -.PP -Options -.PP -.TS -tab (@); -l l. -U@Toggle galaxy rendering -N@Toggle planet and moon labels -O@Toggle planet orbits -V@Toggle HUD Text -I@Toggle planet atmospheres (cloud textures) -W@Toggle wireframe mode -/@Toggle constellation diagrams -= @Toggle constellation labels -;@Toggle earth-based equatorial coordinate sphere -B@Toggle star labels -P@Toggle per-pixel lighting (if supported) -[@Decrease limiting magnitude (fewer stars visible) -]@Increase limiting magnitude (more stars visible) -{@Decrease ambient illumination -}@Increase ambient illumination -,@Narrow field of view -\.@Widen field of view -.TE -.PP -Other -.PP -.TS -tab (@); -l l. -D@Run demo -`@Show frames rendered per second -.TE -.PP -It's possible to choose a star or planet by name: press Enter and type in the -name, and pressing Enter again. You can use common names, or Bayer -designations and HD catalog numbers for stars. Bayer and Flamsteed -designations need to be entered like "Upsilon And" and "51 Peg". The -constellation must be given as a three letter abbreviation and the full Greek -letter name spelled out. HD catalog numbers must be entered with a space -between HD and the number. -.SH OPTIONS -The \fIglut\fP based version accepts the usual X Window System specific -options, namely: -.TP 8 -.B \-display \fIDISPLAY\fP -Specify the X server to connect to. If not specified, the value of the -DISPLAY environment variable is used. -.TP 8 -.B \-geometry \fIWxH+X+Y\fP -Determines where window's should be created on the screen. The -parameter following -geometry should be formatted as a -standard X geometry specification. The effect of using this option -is to change the GLUT initial size and initial position the same as -if glutInitWindowSize or glutInitWindowPosition were -called directly. -.TP 8 -.B \-iconic -Requests all top-level windows be created in an iconic state. -.TP 8 -.B \-indirect -Force the use of indirect OpenGL rendering contexts. -.TP 8 -.B \-direct -Force the use of direct OpenGL rendering contexts (not all GLX -implementations support direct rendering contexts). A fatal error -is generated if direct rendering is not supported by the OpenGL -implementation. - -If neither -indirect or -direct are used to force a particular -behavior, GLUT will attempt to use direct rendering if possible -and otherwise fallback to indirect rendering. -.TP 8 -.B \-gldebug -After processing callbacks and/or events, check if there are any -OpenGL errors by calling glGetError. If an error is reported, -print out a warning by looking up the error code with -gluErrorString. Using this option is helpful in detecting -OpenGL run-time errors. -.TP 8 -.B \-sync -Enable synchronous X protocol transactions. This option makes it -easier to track down potential X protocol errors. -.SH AUTHOR -Celestia has been written by Chris Laurel and -it's available under the terms and conditions of the GNU General Public -LIcense from http://celestia.sf.net/ diff -Nru celestia-1.6.0+dfsg/debian/celestia-kde.docs celestia-1.6.0+dfsg/debian/celestia-kde.docs --- celestia-1.6.0+dfsg/debian/celestia-kde.docs 2009-12-20 11:14:02.000000000 +0000 +++ celestia-1.6.0+dfsg/debian/celestia-kde.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -NEWS -README -AUTHORS -TRANSLATORS diff -Nru celestia-1.6.0+dfsg/debian/celestia-kde.manpages celestia-1.6.0+dfsg/debian/celestia-kde.manpages --- celestia-1.6.0+dfsg/debian/celestia-kde.manpages 2009-12-19 23:39:00.000000000 +0000 +++ celestia-1.6.0+dfsg/debian/celestia-kde.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/celestia-kde.1 diff -Nru celestia-1.6.0+dfsg/debian/celestia-kde.menu celestia-1.6.0+dfsg/debian/celestia-kde.menu --- celestia-1.6.0+dfsg/debian/celestia-kde.menu 2009-12-19 23:39:00.000000000 +0000 +++ celestia-1.6.0+dfsg/debian/celestia-kde.menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -?package(celestia-kde):\ - needs="X11"\ - section="Applications/Science/Astronomy"\ - hints="OpenGL,KDE"\ - title="Celestia (KDE)"\ - command="/usr/bin/celestia-kde" diff -Nru celestia-1.6.0+dfsg/debian/celestia-kde.postinst celestia-1.6.0+dfsg/debian/celestia-kde.postinst --- celestia-1.6.0+dfsg/debian/celestia-kde.postinst 2009-12-19 23:39:00.000000000 +0000 +++ celestia-1.6.0+dfsg/debian/celestia-kde.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -#!/bin/sh -e - -update-alternatives --install /usr/bin/celestia celestia /usr/bin/celestia-kde 200 \ - --slave /usr/share/man/man1/celestia.1.gz celestia.1.gz /usr/share/man/man1/celestia-kde.1.gz - -#DEBHELPER# diff -Nru celestia-1.6.0+dfsg/debian/celestia-kde.prerm celestia-1.6.0+dfsg/debian/celestia-kde.prerm --- celestia-1.6.0+dfsg/debian/celestia-kde.prerm 2009-12-19 23:39:00.000000000 +0000 +++ celestia-1.6.0+dfsg/debian/celestia-kde.prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -#!/bin/sh -e - -if [ "$1" = remove ] || [ "$1" = deconfigure ]; then - update-alternatives --remove celestia /usr/bin/celestia-kde -fi - -#DEBHELPER# diff -Nru celestia-1.6.0+dfsg/debian/celestia-kde.README.Debian celestia-1.6.0+dfsg/debian/celestia-kde.README.Debian --- celestia-1.6.0+dfsg/debian/celestia-kde.README.Debian 2009-12-19 23:39:00.000000000 +0000 +++ celestia-1.6.0+dfsg/debian/celestia-kde.README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -celestia for Debian -------------------- - -Some notes: - -- If celestia crashes at startup or certain objects have wrong colors, uncomment - the line - # IgnoreGLExtensions [ "GL_ARB_vertex_program" ] - in /etc/celestia.cfg. Note that this is not a celestia bug - celestia only - uses OpenGL extensions your OpenGL library claims to support. For more - information, see Q1 in the FAQ. - -- Docs can be found in /usr/share/doc/celestia-common/, the FAQ is in the forum - at http://www.shatters.net/forum/. - -- You can get more information and download add-ons at - http://www.shatters.net/celestia/. Feel free to use the scripts, this version - of celestia is linked against liblua which enables celestia's scripting - engine. - - -- Mathias Weyland , Sun May 8 23:37:50 CEST 2005 diff -Nru celestia-1.6.0+dfsg/debian/changelog celestia-1.6.0+dfsg/debian/changelog --- celestia-1.6.0+dfsg/debian/changelog 2010-08-02 19:51:09.000000000 +0000 +++ celestia-1.6.0+dfsg/debian/changelog 2011-05-05 22:31:25.000000000 +0000 @@ -1,3 +1,40 @@ +celestia (1.6.0+dfsg-2.1~natty0) natty; urgency=low + + * Import from Debian to natty. + + -- Daniel Baumann Fri, 06 May 2011 00:31:25 +0200 + +celestia (1.6.0+dfsg-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove KDE frontend support, thus removing dependency on kde4libs-dev. + (Closes: #604263, #516238, #527923, #567789, #498941, #604903). + * Remove KDE 3 related files, as we don't use it anymore: + - debian/celestia-kde.1 + - debian/celestia-kde.README.Debian + - debian/celestia-kde.docs + - debian/celestia-kde.manpages + - debian/celestia-kde.menu + - debian/celestia-kde.postinst + - debian/celiestia-kde.prerm + * Remove celestia-kde: + - Remove binary package. + - Remove celestia-kde from celestia's depends, keeping the order of + preferences of the rest of the packages. + - Remove KDE front-end from celestia-glut's description. + + * Modify debian/rules to not build celestia-kde: + - Remove build-kde from BUILDDIRS. + - Remove KDE-related commands. + + * Fix build with GCC 4.5 using fix-build-with-gcc-4.5.patch, thanks + to Peter Green (Closes: #564970). + + * Add missing -ldl to link against libdl. This is done with + add_missing_ldl.patch. + + -- Lisandro Damián Nicanor Pérez Meyer Tue, 29 Mar 2011 09:55:40 -0300 + celestia (1.6.0+dfsg-2) unstable; urgency=low * Apply patch from Alessio Tregliam dropping aRTs support. Closes: #563664 diff -Nru celestia-1.6.0+dfsg/debian/control celestia-1.6.0+dfsg/debian/control --- celestia-1.6.0+dfsg/debian/control 2010-08-02 19:50:48.000000000 +0000 +++ celestia-1.6.0+dfsg/debian/control 2011-03-30 06:50:27.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Guus Sliepen Uploaders: Kees Cook -Build-Depends: debhelper (>= 7.0.0), freeglut3-dev, libqt3-mt-dev, kdelibs4-dev, liblua5.1-dev, libgnomeui-dev, libgtkglext1-dev, libtheora-dev, chrpath, autotools-dev +Build-Depends: debhelper (>= 7.0.0), freeglut3-dev, libqt3-mt-dev, liblua5.1-dev, libgnomeui-dev, libgtkglext1-dev, libtheora-dev, chrpath, autotools-dev Standards-Version: 3.9.1 Homepage: http://www.shatters.net/celestia/ @@ -24,7 +24,7 @@ Package: celestia Architecture: all -Depends: celestia-kde | celestia-gnome | celestia-glut, ${misc:Depends} +Depends: celestia-gnome | celestia-glut, ${misc:Depends} Description: A real-time visual space simulation Celestia is a free 3D astronomy program. Based on the Hipparcos Catalogue, it allows users to display objects ranging in scale from @@ -34,22 +34,6 @@ . This is a dummy package that selects at least one frontend for Celestia. -Package: celestia-kde -Section: kde -Architecture: any -Depends: celestia-common (>=1.4.1), ${shlibs:Depends}, ${misc:Depends} -Conflicts: celestia (<< 1.4.1) -Replaces: celestia (<< 1.4.1) -Suggests: stellarium, khelpcenter | khelpcenter4 -Description: A real-time visual space simulation (KDE frontend) - Celestia is a free 3D astronomy program. Based on the Hipparcos - Catalogue, it allows users to display objects ranging in scale from - artificial satellites to entire galaxies in three dimensions using - OpenGL. Unlike most planetarium software, the user is free to travel - about the Universe. - . - This package contains the KDE frontend for Celestia. - Package: celestia-gnome Section: gnome Architecture: any @@ -80,5 +64,5 @@ OpenGL. Unlike most planetarium software, the user is free to travel about the Universe. . - This package contains a minimal frontend for Celestia. There are separate - packages that provide frontends that integrate with GNOME and KDE. + This package contains a minimal frontend for Celestia. There is a separate + package that provides a frontend that integrates with GNOME. diff -Nru celestia-1.6.0+dfsg/debian/patches/add_missing_ldl.patch celestia-1.6.0+dfsg/debian/patches/add_missing_ldl.patch --- celestia-1.6.0+dfsg/debian/patches/add_missing_ldl.patch 1970-01-01 00:00:00.000000000 +0000 +++ celestia-1.6.0+dfsg/debian/patches/add_missing_ldl.patch 2011-03-30 06:50:27.000000000 +0000 @@ -0,0 +1,13 @@ +Author: Lisandro Damián Nicanor Pérez Meyer +Subject: Link against libdl, as it is needed. +--- a/configure ++++ b/configure +@@ -23534,7 +23534,7 @@ + + + +-LIBS="$LIBS -lm" ++LIBS="$LIBS -lm -ldl" + + GTK_LIBS="" + GTKGL_LIBS="" diff -Nru celestia-1.6.0+dfsg/debian/patches/fix-build-with-gcc-4.5.patch celestia-1.6.0+dfsg/debian/patches/fix-build-with-gcc-4.5.patch --- celestia-1.6.0+dfsg/debian/patches/fix-build-with-gcc-4.5.patch 1970-01-01 00:00:00.000000000 +0000 +++ celestia-1.6.0+dfsg/debian/patches/fix-build-with-gcc-4.5.patch 2011-03-30 06:50:27.000000000 +0000 @@ -0,0 +1,49 @@ +Author: Peter Green +Subject: fix compilation with GCC 4.5. + +--- a/src/celengine/mesh.cpp ++++ b/src/celengine/mesh.cpp +@@ -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 ++#include ++#include + #include "mesh.h" + #include "rendcontext.h" + #include "gl.h" + #include "glext.h" +-#include +-#include +-#include + + using namespace std; + +--- a/src/celengine/model.cpp ++++ b/src/celengine/model.cpp +@@ -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 + #include + #include ++#include "model.h" ++#include "rendcontext.h" + + using namespace std; + +--- a/src/celestia/celx_object.cpp ++++ b/src/celestia/celx_object.cpp +@@ -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) diff -Nru celestia-1.6.0+dfsg/debian/patches/series celestia-1.6.0+dfsg/debian/patches/series --- celestia-1.6.0+dfsg/debian/patches/series 2010-08-02 19:52:33.000000000 +0000 +++ celestia-1.6.0+dfsg/debian/patches/series 2011-03-30 06:50:27.000000000 +0000 @@ -2,3 +2,5 @@ update-desktop-files.diff use-stdint.h.diff add-norwegian-translation.diff +fix-build-with-gcc-4.5.patch +add_missing_ldl.patch diff -Nru celestia-1.6.0+dfsg/debian/rules celestia-1.6.0+dfsg/debian/rules --- celestia-1.6.0+dfsg/debian/rules 2010-08-02 19:15:00.000000000 +0000 +++ celestia-1.6.0+dfsg/debian/rules 2011-03-30 06:50:27.000000000 +0000 @@ -32,7 +32,7 @@ # # 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 +BUILDDIRS = build-glut build-gnome CFLAGS = -Wall -g @@ -45,16 +45,10 @@ 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: config-glut config-gnome config-glut: config-glut-stamp config-glut-stamp: @@ -62,7 +56,7 @@ -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 && ./configure --host=$(DEB_HOST_GNU_TYPE) \ + cd build-glut && LIBS=-ldl ./configure --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ --mandir=\$${prefix}/share/man \ @@ -80,7 +74,7 @@ -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 && ./configure --host=$(DEB_HOST_GNU_TYPE) \ + cd build-gnome && LIBS=-ldl ./configure --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ --mandir=\$${prefix}/share/man \ @@ -93,30 +87,12 @@ 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 && ./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-arch: build-glut build-gnome build-indep: build-glut @@ -130,12 +106,6 @@ 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 # ############### @@ -201,23 +171,8 @@ 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; \ + for i in celestia-glut celestia-gnome; \ do \ cd $(CURDIR)/debian/celestia-common/usr/share && \ find . ! -type d -print0 | \ @@ -270,4 +225,4 @@ $(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 +.PHONY: build clean binary-indep binary-arch config config-glut config-gnome build-glut build-gnome build-indep build-arch build binary install install-indep install-arch