--- simgear-2.0.0.orig/config.guess +++ simgear-2.0.0/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2009-12-30' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -56,8 +56,9 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." --- simgear-2.0.0.orig/config.sub +++ simgear-2.0.0/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2010-01-22' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -75,8 +75,9 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -380,7 +381,8 @@ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile-* | tilegx-* \ | tron-* \ | ubicom32-* \ | v850-* | v850e-* | vax-* \ @@ -1085,6 +1087,11 @@ basic_machine=tic6x-unknown os=-coff ;; + # This must be matched before tile*. + tilegx*) + basic_machine=tilegx-unknown + os=-linux-gnu + ;; tile*) basic_machine=tile-unknown os=-linux-gnu @@ -1435,6 +1442,8 @@ -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) --- simgear-2.0.0.orig/debian/copyright +++ simgear-2.0.0/debian/copyright @@ -0,0 +1,141 @@ +This package was debianized by Ove Kaaven on +Tue, 6 Feb 2001 13:06:57 +0100. + +It was downloaded from http://www.simgear.org/downloads.html + +Upstream Authors: Curtis L. Olson +and the rest of the FlightGear team (see the Thanks file +in the FlightGear package). + +SimGear copyright holders include, but are not limited to: + + Copyright (C) 2003-2005 Alexander Zaprjagaev + Copyright (C) 2003 Andrew J. Ross + Copyright (C) 1998-2001 Bernard Bright + Copyright (C) 1999-2000 Brian Paul + Copyright (C) 2001 César Blecua Udías + Copyright (C) 1998 Christian Mayer + Copyright (C) 1998-2004 Curtis L. Olson + Copyright (C) 2000-2002 David Megginson + Copyright (C) 2000 Edward A Williams + Copyright (C) 2002 Erik Hofman + Copyright (C) 1988 Free Software Foundation + Copyright (C) 2005 Harald JOHNSEN + Copyright (C) 1998-1999 James Clark + Copyright (C) 2003 James Turner + Copyright (C) 2002 Jim Wilson + Copyright (C) 2002-2004 Mark J. Harris + Copyright (C) 1997 Mark J. Kilgard + Copyright (C) 2005-2007 Mathias Froehlich + Copyright (C) 2003 Melchior FRANZ + Copyright (C) 2008 Nicolas VIVIEN + Copyright (C) 2000-2001 Norman Vine + Copyright (C) 2007-2008 Stuart Buchanan + Copyright (C) 2000 The PLIB Team + Copyright (C) 2008 Till Busch + Copyright (C) 2008 Tiago Gusmão + Copyright (C) 2006-2008 Tim Moore + Copyright (C) 1997-1998 Todd Veldhuizen + +The official SimGear license is: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + +On Debian systems, the complete text of the GNU Library General Public +License can be found in /usr/share/common-licenses/LGPL-2 file. + + +However, many parts of this library are licensed differently: + + This program is 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 of the + License, or (at your option) any later version. + +On Debian systems, the complete text of the GNU General Public +License can be found in /usr/share/common-licenses/GPL-2 file. + +Some parts are derived from James Clark's expat, http://expat.sourceforge.net/ +(which is under a MIT license), via the Mozilla project, who attached +a dual MPL 1.1/GPL license. Within the context of SimGear, it may be +considered GPL. + +Some parts are derived from Steve Baker's PLIB, http://plib.sourceforge.net/ +Those parts are under GPL, version 2 or later. + + +The OpenGL extensions-handling code is licensed this way: + + Copyright (c) 2001 César Blecua Udías All Rights Reserved. + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + CESAR BLECUA UDIAS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF + OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + + +The RenderTexture code is licensed this way: + + Copyright (c) 2002-2004 Mark J. Harris + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any + damages arising from the use of this software. + + Permission is granted to anyone to use this software for any + purpose, including commercial applications, and to alter it and + redistribute it freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you + must not claim that you wrote the original software. If you use + this software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + + 2. Altered source versions must be plainly marked as such, and + must not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. + + +The Texture code is licensed this way: + + Copyright (c) Mark J. Kilgard, 1997. + + Code added in april 2003 by Erik Hofman + + This program is freely distributable without licensing fees + and is provided without guarantee or warrantee expressed or + implied. This program is -not- in the public domain. + +It is derived from GLUT, whence permission to modify was given thus: + + From: Mark Kilgard + Subject: Bug#131997: GLUT license + + Anthony, + + > Would it be possible for you to just make it absolutely clear that + > everyone's allowed to use, copy, and modify (and distribute their + > modifications) of libglut? + > + > Just quoting the above and replying "Yes, that's fine" or similar + > would be okay. + + Yes, that's fine. --- simgear-2.0.0.orig/debian/docs +++ simgear-2.0.0/debian/docs @@ -0,0 +1,2 @@ +NEWS +README --- simgear-2.0.0.orig/debian/watch +++ simgear-2.0.0/debian/watch @@ -0,0 +1,3 @@ +version=3 +#ftp://ftp.simgear.org/pub/simgear/Source/SimGear-(.*)\.tar\.gz +ftp://ftp.ihg.uni-duisburg.de/Mirrors/ftp.simgear.org/Source/SimGear-(.*)\.tar\.gz --- simgear-2.0.0.orig/debian/compat +++ simgear-2.0.0/debian/compat @@ -0,0 +1 @@ +5 --- simgear-2.0.0.orig/debian/changelog +++ simgear-2.0.0/debian/changelog @@ -0,0 +1,279 @@ +simgear (2.0.0-2ubuntu1) natty; urgency=low + + * simgear/screen/Makefile.in: Add -ldl call to fix FTBFS + + -- Stefan Ebner Mon, 07 Feb 2011 22:36:37 +0100 + +simgear (2.0.0-2) unstable; urgency=low + + * Fixed circular dependencies in debian/sorules that were dropped + non-deterministically by GNU Make, causing subtle misbuilds. + Closes: #609439. + * Note to self: always remember to use pbuilder. Closes: #609511. + + -- Ove Kaaven Tue, 11 Jan 2011 03:50:33 +0100 + +simgear (2.0.0-1) unstable; urgency=low + + * New upstream release. + * Add a couple of ${misc:Depends} to debian/control. + + -- Ove Kaaven Fri, 08 Oct 2010 10:44:32 +0200 + +simgear (1.9.1-2) unstable; urgency=low + + * Updated debian/copyright. + + -- Ove Kaaven Sun, 12 Jul 2009 22:21:32 +0200 + +simgear (1.9.1-1) unstable; urgency=low + + * New upstream release. + * Updated debian/control, sorules, and things for SimGear 1.9.1. + This includes depending on plib 1.8.5. Closes: #528637, #530638. + * debian/rules now supports parallellized builds, and building + out of a svn checkout. It also cleans up a bit better. + * Added Vcs-Browser and Vcs-Svn fields to debian/control. + * Converted debian/watch to version 3. Closes: #529139. + * Added patch to compile with g++ 4.4. Closes: #505019. + + -- Ove Kaaven Sun, 14 Jun 2009 20:38:10 +0200 + +simgear (1.0.0-4) unstable; urgency=low + + * Made the pkg-fgfs-crew mailing list the official maintainer of the + SimGear package, and myself a mere uploader. + * Updated libglut3-dev build-dependency to freeglut3-dev. + Closes: #394503. + + -- Ove Kaaven Sat, 21 Jun 2008 12:20:45 +0200 + +simgear (1.0.0-3) unstable; urgency=low + + * Added Homepage field. + * Upgraded Standards-Version to 3.7.3. + * Changed the generated sonames to contain the full version of the + package, rather than just the major version. (Upstream doesn't care + about shared libraries and a stable ABI.) + * Accordingly, renamed the shared-library package to simgear1.0.0, + and make it conflict with simgear0. + * Use debian/compat file instead of setting DH_COMPAT in debian/rules. + Upgraded DH build-dependency and compatibility level to 5. + * Removed usage of dh_testversion. + * Use ${binary:Version} instead of ${Source-Version} in debian/control. + * Set optimization level according to DEB_BUILD_OPTIONS. + * Implemented a system to add dependency information to the generated + .so files, so linking against one of them will pull in whatever else + is needed from simgear or plib. Because of circular dependencies, + this isn't perfect, but I think I at least achieved my goal of making + it possible for stuff to link against SimGear without having to tweak + makefiles. + + -- Ove Kaaven Tue, 08 Apr 2008 08:42:41 +0200 + +simgear (1.0.0-2) unstable; urgency=low + + * Add definitions for Alpha, HPPA, and S/390 to nasal/naref.h, + thanks to Steve Langasek. This should fix FTBFS on those + platforms. (Unfortunately, upstream currently doesn't appear + willing to fix their stuff themselves.) Closes: #461399. + + -- Ove Kaaven Sat, 23 Feb 2008 05:33:40 +0100 + +simgear (1.0.0-1) unstable; urgency=low + + * New upstream release. + + -- Ove Kaaven Sat, 22 Dec 2007 15:24:54 +0100 + +simgear (0.3.10-2) unstable; urgency=low + + * Updated the build dependencies for xorg 7.0. Apparently the + amd64 autobuilder doesn't use Provides. Closes: #366223. + + -- Ove Kaaven Wed, 17 May 2006 17:09:32 -0400 + +simgear (0.3.10-1) unstable; urgency=low + + * New upstream release, for flightgear 0.9.10. + + -- Ove Kaaven Fri, 5 May 2006 20:21:37 -0400 + +simgear (0.3.9-3) unstable; urgency=low + + * Apply patch from Martin Michlmayr for g++ 4.1 build failure. + Closes: #356606. + * Build-Depend on libalut-dev, bump flightgear versioned conflict + (so that a flightgear built with libalut-dev is required too). + + -- Ove Kaaven Sun, 19 Mar 2006 06:11:36 -0500 + +simgear (0.3.9-2) unstable; urgency=low + + * RenderTexture.cpp is updated to revision 1.16 from upstream CVS, + in order to support DRI (which is not able to render to texture). + Closes: #348268. + + -- Ove Kaaven Mon, 30 Jan 2006 05:34:32 -0500 + +simgear (0.3.9-1) unstable; urgency=low + + * New upstream release, for flightgear 0.9.9. + * Updated debian/copyright to note that the new + render-to-texture code is using a BSD-style license + (which appears to be the zlib/libpng license). + Also changed it to no longer say that the GPL covers + a little of this library - it actually covers a lot. + + -- Ove Kaaven Mon, 2 Jan 2006 15:58:09 -0500 + +simgear (0.3.8-2) unstable; urgency=low + + * Allright then, if you absolutely insist on a gcc 4.0-compiled + package before the next upstream release. Mumble. + Updated Conflicts line to ensure proper flightgear upgrade, + no source changes. Closes: #319229. + + -- Ove Kaaven Mon, 25 Jul 2005 01:55:18 -0400 + +simgear (0.3.8-1) unstable; urgency=low + + * New upstream release, for flightgear 0.9.8. + * Changed Build-Depends to depend on plib1.8.4-dev. + + -- Ove Kaaven Sun, 27 Mar 2005 21:56:34 -0500 + +simgear (0.3.7-1) unstable; urgency=low + + * New upstream release, for flightgear 0.9.6. + * Added autotools-dev to the build-deps and copy + config.sub and config.guess from it from debian/rules. + * Added --with-jpeg-factory configure option. Closes: #273559. + + -- Ove Kaaven Sun, 30 Jan 2005 15:27:06 -0500 + +simgear (0.3.6-1) unstable; urgency=low + + * New upstream release, for flightgear 0.9.5. + * Upstream seem to have switched to OpenAL. + Added build dependency on libopenal-dev. + + -- Ove Kaaven Mon, 16 Aug 2004 21:08:52 +0200 + +simgear (0.3.5-1) unstable; urgency=low + + * New upstream release, for flightgear 0.9.4. + * Changed Build-Depends for new xlibs package layout. + * Changed Build-Depends to depend on plib1.8.3-dev. + * Removed MetaKit build-dependency, simgear apparently + stopped using it in 0.3.4. + + -- Ove Kaaven Wed, 7 Apr 2004 10:48:44 +0200 + +simgear (0.3.4-1) unstable; urgency=low + + * New upstream release, for flightgear 0.9.3. + + -- Ove Kaaven Sun, 9 Nov 2003 23:12:23 +0100 + +simgear (0.3.3-1) unstable; urgency=low + + * New upstream release, for flightgear 0.9.2. + + -- Ove Kaaven Fri, 6 Jun 2003 02:14:12 +0200 + +simgear (0.3.1-2) unstable; urgency=low + + * Rebuilt with metakit 2.4.9.2. + + -- Ove Kaaven Thu, 17 Apr 2003 11:51:25 +0200 + +simgear (0.3.1-1) unstable; urgency=low + + * New upstream release, for flightgear 0.9.0. + + -- Ove Kaaven Thu, 5 Dec 2002 02:41:46 +0100 + +simgear (0.2.0-1) unstable; urgency=low + + * New upstream release, for flightgear 0.8.0. + * Disabled JPEG image factory support again since its sources + aren't in the upstream tarball anymore for some reason. + + -- Ove Kaaven Mon, 9 Sep 2002 18:48:40 +0200 + +simgear (0.0.18-1) unstable; urgency=low + + * New upstream release, for flightgear 0.7.10. + + -- Ove Kaaven Sat, 27 Apr 2002 19:26:02 +0200 + +simgear (0.0.17-2) unstable; urgency=low + + * Rebuilt with metakit 2.4.3. + + -- Ove Kaaven Wed, 27 Mar 2002 21:24:21 +0100 + +simgear (0.0.17-1) unstable; urgency=low + + * New upstream release, for flightgear 0.7.9. + Good, this release don't try to compile metakit on its own anymore. + * Make sure to conflict with flightgear (<< 0.7.9) to avoid the + mess I got in the testing distribution last time. + * Updated copyright file, after discovering that many files are + marked with a GPL copyright, though the official license is LGPL. + * Compiled with JPEG image factory support for the heck of it. + + -- Ove Kaaven Sun, 17 Feb 2002 11:56:57 +0100 + +simgear (0.0.16-2) unstable; urgency=low + + * Ensure that the embedded metakit's configure script is + not run (it should use the libmetakit-dev I build-depend + on anyway, not the embedded one). + + -- Ove Kaaven Wed, 7 Nov 2001 21:17:49 +0100 + +simgear (0.0.16-1) unstable; urgency=low + + * New upstream release, for flightgear 0.7.8. + * Build-depend on plib >= 1.4.1. + + -- Ove Kaaven Sat, 14 Jul 2001 20:43:35 +0200 + +simgear (0.0.15-1) unstable; urgency=low + + * New upstream release, for flightgear 0.7.7. + * Added -V option to dh_makeshlibs, so dependencies gets versioned. + * Made simgear-dev depend on the current simgear0 version. + * Build-depend on debhelper v3. + * Standards-Version upgraded to 3.5.5. + + -- Ove Kaaven Fri, 22 Jun 2001 16:45:55 +0200 + +simgear (0.0.14-3) unstable; urgency=low + + * Fixed some garbage in debian/control. + + -- Ove Kaaven Sat, 3 Mar 2001 17:51:07 +0100 + +simgear (0.0.14-2) unstable; urgency=low + + * Rebuilt with debhelper v3, to fix the "ldconfig in postinst" + I had forgotten. + + -- Ove Kaaven Mon, 19 Feb 2001 20:17:13 +0100 + +simgear (0.0.14-1) unstable; urgency=low + + * Initial Release. + * Did some involved stuff in debian/rules to build shared libs + (upstream sources didn't). At least it looks more elegant than + plib's method of doing same... + + -- Ove Kaaven Tue, 6 Feb 2001 13:06:57 +0100 + +Local variables: +mode: debian-changelog +add-log-mailing-address "ovek@arcticnet.no" +End: --- simgear-2.0.0.orig/debian/control +++ simgear-2.0.0/debian/control @@ -0,0 +1,39 @@ +Source: simgear +Section: libs +Priority: extra +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian FlightGear Crew +Uploaders: Ove Kaaven +Build-Depends: debhelper (>> 5), + libx11-dev, libxext-dev, libxi-dev, libice-dev, libsm-dev, libxt-dev, libxmu-dev, + libgl1-mesa-dev | xlibmesa-gl-dev | libgl-dev, + libglu1-mesa-dev | libglu1-xorg-dev | xlibmesa-glu-dev | libglu-dev, + freeglut3-dev | libglut3-dev, zlib1g-dev, libjpeg62-dev | libjpeg-dev, + libboost-dev, libplib-dev (>= 1.8.5), libopenscenegraph-dev (>> 2.8.0), + libopenal-dev, libalut-dev, autotools-dev +Standards-Version: 3.7.3 +Homepage: http://www.simgear.org/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/ +Vcs-Svn: svn://svn.debian.org/pkg-fgfs/simgear/trunk/ + +Package: simgear2.0.0 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: simgear0 +Description: Simulator Construction Gear -- shared libraries + SimGear is a collection of libraries useful for constructing + simulation and visualization applications such as FlightGear + or TerraGear. + . + This package contains the shared libraries. + +Package: simgear-dev +Architecture: any +Section: devel +Depends: simgear2.0.0 (= ${binary:Version}), libplib-dev, libopenscenegraph-dev, libc6-dev, ${misc:Depends} +Description: Simulator Construction Gear -- development files + SimGear is a collection of libraries useful for constructing + simulation and visualization applications such as FlightGear + or TerraGear. + . + This package contains the headers and static libraries. --- simgear-2.0.0.orig/debian/rules +++ simgear-2.0.0/debian/rules @@ -0,0 +1,121 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +CFLAGS=-O0 -g +else +CFLAGS=-O2 -g +endif +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +MAKEFLAGS += -j$(NUMJOBS) +endif + +deb_version := $(lastword $(shell dpkg-parsechangelog|grep "^Version: ")) +version := $(shell echo $(deb_version)|sed -n 's,^\(.*\)-[^-]*$$,\1,p') +package := simgear$(version) + +configure: configure-stamp +configure-stamp: + dh_testdir + + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" \ + ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ + --with-jpeg-factory + + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: configure-stamp + dh_testdir + + # First build the shared libraries + $(MAKE) CPPFLAGS="-fPIC -pipe" + + # "convert" .a to .so (yikes) + $(MAKE) -f debian/sorules + + $(MAKE) clean + + # Then build the static library without PIC + $(MAKE) CPPFLAGS="-pipe" + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + $(MAKE) -f debian/sorules clean + -$(MAKE) -i clean + -$(MAKE) -i distclean + # distclean seems to not always be thorough + -find -name .deps -type d -exec rm -rf {} \; + # regenerated during build + -rm -f simgear/version.h + + dh_clean + + # update from autotools-dev + cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub . + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Install static libraries and include files + $(MAKE) install prefix=$(CURDIR)/debian/simgear-dev/usr + + # Install shared libraries + install -d debian/$(package)/usr/lib + find simgear -name 'lib*.so.*' -exec \ + install -m 755 {} $(CURDIR)/debian/$(package)/usr/lib \; + (cd debian/$(package)/usr/lib && for ii in `ls lib*.so.*`; do \ + ln -s $$ii `echo $$ii|sed 's/\\.so\\..*/.so/'`; done) + mv debian/$(package)/usr/lib/lib*.so debian/simgear-dev/usr/lib + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + +# dh_installdebconf + dh_installdocs + dh_installexamples + dh_installmenu +# dh_installemacsen +# dh_installpam +# dh_installinit + dh_installcron +# dh_installmanpages + dh_installinfo +# dh_undocumented + dh_installchangelogs ChangeLog + dh_link + dh_strip + dh_compress + dh_fixperms + # You may want to make some executables suid here. +# dh_suidregister + dh_makeshlibs -V + dh_installdeb +# dh_perl + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- simgear-2.0.0.orig/debian/deps.py +++ simgear-2.0.0/debian/deps.py @@ -0,0 +1,152 @@ +#!/usr/bin/python +import sys, os + +# Run: +# python debian/deps.py `find simgear -name "*.so"` /usr/lib/libplib*.so /usr/lib/libosg*.so +# Use output to update debian/sorules (beware of circular dependencies) + +debug = 0 + +sofiles = sys.argv[1:] +sofiles.sort() +l_ext = [ + '/usr/lib/libX11.so', + '/usr/lib/libjpeg.so', + '/usr/lib/libalut.so', '/usr/lib/libopenal.so', + '/usr/lib/libGLU.so', '/usr/lib/libGL.so', + '/usr/lib/libz.so', + '/usr/lib/libdl.so', +] +s_ign = ['_Unwind_Resume'] +l_ign = [ + '/usr/lib/libm.so', + '/lib/libpthread.so.0', + '/usr/lib/libstdc++.so.6', + '/lib/libc.so.6' +] +sofiles.extend(l_ext) +sofiles.extend(l_ign) + +defs = {} +undefs = {} +for sof in sofiles: + undefs[sof] = [] + syms = os.popen("nm -D -f posix %s" % sof, "r").readlines() + for syml in syms: + toks = syml.rstrip().split() + if toks[1] == "U": + undefs[sof].append(toks[0]) + else: + defs[toks[0]] = sof + +sodeps = {} +for sof in sofiles: + if not sof.startswith('simgear/'): + continue + if sof == "simgear/nasal/libsgnasal.so": + continue + dp = {} + miss = [] + for ud in undefs[sof]: + dso = defs.get(ud) + if dso is None: + if ud not in s_ign: + miss.append(ud) + else: + dp.setdefault(dso, []).append(ud) + sdp = [] + odp = [] + edp = [] + for adep in dp.keys(): + if adep.startswith('simgear/'): + sdp.append(adep) + elif adep in l_ext: + edp.append(adep) + elif not adep in l_ign: + odp.append(adep) + sdp.sort() + odp.sort() + edp.sort() + deps = sdp + odp + edp + sodeps[sof] = deps + if debug: + print "%s:" % sof, + for dep in deps: + s = dp[dep] + print "%s [%s]" % (dep, " ".join(s)), + print + +if debug: + print + +ruledrops = {} +for line in open("debian/sorules"): + if line.startswith("# "): + idx = line.find(": dropped ") + if idx != -1: + sof = line[2:idx] + deps = line[idx+10:].rstrip().split(", ") + ruledrops[sof] = deps + +def shorten(sof): + idx = sof.rfind("/lib") + return sof[idx+4:-3] + +def check_cycle(robj, obj, visit): + if obj in visit: + if obj == robj: + return [shorten(obj)], [] + else: + return [], [] + deps = sodeps.get(obj) + drop = ruledrops.get(shorten(obj)) + cycles = [] + drops = [] + if deps is None: + return cycles, drops + rvisit = visit + [obj] + for dep in deps: + rcycles, rdrops = check_cycle(robj, dep, rvisit) + if rcycles: + if drop is not None and shorten(dep) in drop: + drops.append(shorten(dep)) + else: + for cycle in rcycles: + cycles.append(shorten(obj) + " <= " + cycle) + return cycles, drops + +def apply_drop(deps, drop): + rdeps = [] + for dep in deps: + if shorten(dep) not in drop: + rdeps.append(dep) + return rdeps + +cycles = [] +sodrops = {} +for sof in sofiles: + if not sodeps.has_key(sof): + continue + rcycles, rdrops = check_cycle(sof, sof, []) + cycles.extend(rcycles) + if rdrops: + sodrops[sof] = rdrops + sodeps[sof] = apply_drop(sodeps[sof], rdrops) + +if len(cycles): + print "Unresolved circular dependencies:" + for cycle in cycles: + print cycle + print + +for sof in sofiles: + if not sodeps.has_key(sof): + continue + deps = sodeps[sof] + if sodrops.has_key(sof): + print "# %s: dropped %s" % (shorten(sof), ", ".join(sodrops[sof])) + print "%s: %s" % (sof, sof[:-3] + ".a"), + print " ".join(deps) + +# if len(miss): +# print " Undefined:", " ".join(miss) --- simgear-2.0.0.orig/debian/sorules +++ simgear-2.0.0/debian/sorules @@ -0,0 +1,70 @@ +deb_version:=$(lastword $(shell dpkg-parsechangelog|grep "^Version: ")) +version:=$(shell echo $(deb_version)|sed -n 's,^\(.*\)-[^-]*$$,\1,p') +soname:=$(version) +libs:=$(shell find simgear -name 'lib*.a' -print) +solibs:=$(patsubst %.a,%.so,$(libs)) + +all: build + +build: $(solibs) + +clean: + rm -f $(solibs) + rm -f $(patsubst %.so,%.so.$(soname),$(solibs)) + +simgear/%.so: simgear/%.a + @ echo Linking $@... + @ cd $(dir $@) && \ + basea="$(notdir $<)" && \ + baseso="$(notdir $@)" && \ + libs="$(patsubst simgear/%.so,$(CURDIR)/simgear/%.so,$(wordlist 2,$(words $^),$^))" && \ + g++ -shared -Wl,-soname,$$baseso.$(soname) \ + -o $$baseso.$(version) \ + `ar t $$basea` $$libs && \ + ln -sf $$baseso.$(version) $$baseso + +# nasal is C, not C++ +simgear/nasal/libsgnasal.so: simgear/nasal/libsgnasal.a /usr/lib/libm.so + @ echo Linking $@... + @ cd $(dir $@) && \ + basea="$(notdir $<)" && \ + baseso="$(notdir $@)" && \ + libs="$(patsubst simgear/%.so,$(CURDIR)/simgear/%.so,$(wordlist 2,$(words $^),$^))" && \ + gcc -shared -Wl,-soname,$$baseso.$(soname) \ + -o $$baseso.$(version) \ + `ar t $$basea` $$libs && \ + ln -sf $$baseso.$(version) $$baseso + +# Beware of circular dependencies... +# To the extent possible, I've tried to resolve circularities by choosing +# whatever direction of the dependencies avoids having to tweak the makefiles +# of other software, like FlightGear or Atlas. +simgear/bucket/libsgbucket.so: simgear/bucket/libsgbucket.a simgear/misc/libsgmisc.so +simgear/debug/libsgdebug.so: simgear/debug/libsgdebug.a +simgear/environment/libsgenvironment.so: simgear/environment/libsgenvironment.a simgear/io/libsgio.so simgear/math/libsgmath.so simgear/props/libsgprops.so simgear/scene/sky/libsgsky.so simgear/sound/libsgsound.so simgear/structure/libsgstructure.so /usr/lib/libosg.so /usr/lib/libosgParticle.so +simgear/ephemeris/libsgephem.so: simgear/ephemeris/libsgephem.a simgear/debug/libsgdebug.so simgear/misc/libsgmisc.so +simgear/io/libsgio.so: simgear/io/libsgio.a simgear/bucket/libsgbucket.so simgear/debug/libsgdebug.so simgear/misc/libsgmisc.so simgear/serial/libsgserial.so /usr/lib/libplibnet.so /usr/lib/libz.so +simgear/magvar/libsgmagvar.so: simgear/magvar/libsgmagvar.a +simgear/math/libsgmath.so: simgear/math/libsgmath.a simgear/debug/libsgdebug.so simgear/misc/libsgmisc.so simgear/props/libsgprops.so simgear/structure/libsgstructure.so /usr/lib/libosg.so +simgear/misc/libsgmisc.so: simgear/misc/libsgmisc.a simgear/debug/libsgdebug.so simgear/props/libsgprops.so simgear/structure/libsgstructure.so /usr/lib/libosg.so /usr/lib/libosgDB.so /usr/lib/libz.so +# sgprops: dropped sgmisc, sgstructure +simgear/props/libsgprops.so: simgear/props/libsgprops.a simgear/debug/libsgdebug.so simgear/xml/libsgxml.so +simgear/route/libsgroute.so: simgear/route/libsgroute.a simgear/math/libsgmath.so +simgear/scene/bvh/libsgbvh.so: simgear/scene/bvh/libsgbvh.a +simgear/scene/material/libsgmaterial.so: simgear/scene/material/libsgmaterial.a simgear/debug/libsgdebug.so simgear/math/libsgmath.so simgear/misc/libsgmisc.so simgear/props/libsgprops.so simgear/scene/model/libsgmodel.so simgear/scene/tgdb/libsgtgdb.so simgear/scene/util/libsgutil.so simgear/structure/libsgstructure.so /usr/lib/libosg.so /usr/lib/libosgDB.so /usr/lib/libosgUtil.so +# sgmodel: dropped sgmaterial +simgear/scene/model/libsgmodel.so: simgear/scene/model/libsgmodel.a simgear/debug/libsgdebug.so simgear/math/libsgmath.so simgear/misc/libsgmisc.so simgear/props/libsgprops.so simgear/scene/bvh/libsgbvh.so simgear/scene/util/libsgutil.so simgear/structure/libsgstructure.so /usr/lib/libosg.so /usr/lib/libosgDB.so /usr/lib/libosgParticle.so /usr/lib/libosgText.so /usr/lib/libosgUtil.so /usr/lib/libGL.so +simgear/scene/sky/libsgsky.so: simgear/scene/sky/libsgsky.a simgear/debug/libsgdebug.so simgear/math/libsgmath.so simgear/misc/libsgmisc.so simgear/props/libsgprops.so simgear/scene/material/libsgmaterial.so simgear/scene/model/libsgmodel.so simgear/scene/util/libsgutil.so simgear/screen/libsgscreen.so /usr/lib/libosg.so /usr/lib/libosgDB.so /usr/lib/libGL.so /usr/lib/libGLU.so +# sgtgdb: dropped sgmaterial +simgear/scene/tgdb/libsgtgdb.so: simgear/scene/tgdb/libsgtgdb.a simgear/bucket/libsgbucket.so simgear/debug/libsgdebug.so simgear/io/libsgio.so simgear/math/libsgmath.so simgear/misc/libsgmisc.so simgear/props/libsgprops.so simgear/scene/model/libsgmodel.so simgear/scene/util/libsgutil.so /usr/lib/libosg.so /usr/lib/libosgDB.so /usr/lib/libGL.so +# sgutil: dropped sgmaterial +simgear/scene/util/libsgutil.so: simgear/scene/util/libsgutil.a /usr/lib/libosg.so /usr/lib/libosgDB.so +simgear/screen/libsgscreen.so: simgear/screen/libsgscreen.a simgear/debug/libsgdebug.so /usr/lib/libosg.so /usr/lib/libosgDB.so /usr/lib/libGL.so /usr/lib/libGLU.so /usr/lib/libX11.so /usr/lib/libdl.so /usr/lib/libjpeg.so +simgear/serial/libsgserial.so: simgear/serial/libsgserial.a simgear/debug/libsgdebug.so +simgear/sound/libsgsound.so: simgear/sound/libsgsound.a simgear/debug/libsgdebug.so simgear/math/libsgmath.so simgear/misc/libsgmisc.so simgear/props/libsgprops.so simgear/structure/libsgstructure.so /usr/lib/libalut.so /usr/lib/libopenal.so +simgear/structure/libsgstructure.so: simgear/structure/libsgstructure.a simgear/debug/libsgdebug.so simgear/props/libsgprops.so simgear/timing/libsgtiming.so +simgear/threads/libsgthreads.so: simgear/threads/libsgthreads.a +# sgtiming: dropped sgmisc, sgstructure +simgear/timing/libsgtiming.so: simgear/timing/libsgtiming.a simgear/debug/libsgdebug.so +# sgxml: dropped sgstructure +simgear/xml/libsgxml.so: simgear/xml/libsgxml.a --- simgear-2.0.0.orig/simgear/debug/logstream.hxx +++ simgear-2.0.0/simgear/debug/logstream.hxx @@ -31,6 +31,7 @@ # include #endif +#include #include #include #include --- simgear-2.0.0.orig/simgear/screen/Makefile.in +++ simgear-2.0.0/simgear/screen/Makefile.in @@ -262,7 +262,8 @@ @HAVE_GLUT_TRUE@TestRenderTexture_LDADD = \ @HAVE_GLUT_TRUE@ libsgscreen.a \ @HAVE_GLUT_TRUE@ $(top_builddir)/simgear/debug/libsgdebug.a \ -@HAVE_GLUT_TRUE@ $(opengl_LIBS) +@HAVE_GLUT_TRUE@ $(opengl_LIBS) \ +@HAVE_GLUT_TRUE@ -ldl INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DGLX_GLXEXT_PROTOTYPES all: all-am --- simgear-2.0.0.orig/simgear/nasal/naref.h +++ simgear-2.0.0/simgear/nasal/naref.h @@ -12,10 +12,11 @@ # define NASAL_NAN64 #elif defined(_M_IX86) || defined(i386) || defined(__x86_64) || \ defined(__ia64__) || defined(_M_IA64) || defined(__ARMEL__) || \ - defined(_M_X64) + defined(_M_X64) || defined(__alpha__) # define NASAL_LE #elif defined(__sparc) || defined(__ppc__) || defined(__PPC) || \ - defined(__mips) || defined(__ARMEB__) + defined(__mips) || defined(__ARMEB__) || \ + defined(__hppa__) || defined(__s390__) || defined(__s390x__) # define NASAL_BE #else # error Unrecognized CPU architecture