From 7c07b26b28e45691f909cc65b9223394781c4098 Mon Sep 17 00:00:00 2001 From: Gautier Hattenberger Date: Wed, 9 Feb 2011 16:47:15 +0100 Subject: [PATCH] add jsbsim debian packaging stuff --- jsbsim/JSBSim.pc.in | 9 ++++++ jsbsim/Makefile.am | 17 +++++++++++ jsbsim/README | 9 ++++++ jsbsim/debian/changelog | 5 ++++ jsbsim/debian/compat | 1 + jsbsim/debian/control | 13 ++++++++ jsbsim/debian/rules | 7 +++++ jsbsim/jsbsim_silent.patch | 61 ++++++++++++++++++++++++++++++++++++++ 8 files changed, 122 insertions(+) create mode 100644 jsbsim/JSBSim.pc.in create mode 100644 jsbsim/Makefile.am create mode 100644 jsbsim/README create mode 100644 jsbsim/debian/changelog create mode 100644 jsbsim/debian/compat create mode 100644 jsbsim/debian/control create mode 100755 jsbsim/debian/rules create mode 100644 jsbsim/jsbsim_silent.patch diff --git a/jsbsim/JSBSim.pc.in b/jsbsim/JSBSim.pc.in new file mode 100644 index 0000000..99dfb9c --- /dev/null +++ b/jsbsim/JSBSim.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +Name: JSBSim +Description: JSBSim (Paparazzi version) +Version: @VERSION@ +Libs: -L${libdir} -lJSBSim +Cflags: -I${includedir}/JSBSim diff --git a/jsbsim/Makefile.am b/jsbsim/Makefile.am new file mode 100644 index 0000000..2b579b4 --- /dev/null +++ b/jsbsim/Makefile.am @@ -0,0 +1,17 @@ +EXTRA_DIST = \ + autogen.sh JSBSim.xsd JSBSim.xsl JSBSim.vcproj JSBSim.dox + +SUBDIRS = src systems aircraft engine scripts data_output data_plot check_cases + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = JSBSim.pc + +dist-hook: + (cd $(top_srcdir)) + +# +# Rule to build RPM distribution package +# +rpm: dist + rpm -ta $(PACKAGE)-$(VERSION).tar.gz + diff --git a/jsbsim/README b/jsbsim/README new file mode 100644 index 0000000..505f8dd --- /dev/null +++ b/jsbsim/README @@ -0,0 +1,9 @@ +DEB package instruction + +* Add debian folder to jsbsim sources +* Add JSBSim.pc.in to jsbsim sources +* Merge Makefile.am (in order to generate JSBSim.pc) +* Apply jsbsim_silent.patch (if it is still up-to-date...) + +* Run dpkg-buildpackage -b + diff --git a/jsbsim/debian/changelog b/jsbsim/debian/changelog new file mode 100644 index 0000000..13e9558 --- /dev/null +++ b/jsbsim/debian/changelog @@ -0,0 +1,5 @@ +paparazzi-jsbsim (1.2) unstable; urgency=low + + * Initial release of debian package for Paparazzi simulator + + -- Gautier Hattenberger Sun, 10 Oct 2010 11:06:18 +0000 diff --git a/jsbsim/debian/compat b/jsbsim/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/jsbsim/debian/compat @@ -0,0 +1 @@ +7 diff --git a/jsbsim/debian/control b/jsbsim/debian/control new file mode 100644 index 0000000..db6933c --- /dev/null +++ b/jsbsim/debian/control @@ -0,0 +1,13 @@ +Source: paparazzi-jsbsim +Section: extra +Priority: optional +Maintainer: Gautier Hattenberger +Standards-Version: 1.2 + +Package: paparazzi-jsbsim +Architecture: all +Depends: ${misc:Depends} +Description: + JSBSim shared libraries package (jsbsim.sourceforge.net) + Package made for the Paparazzi project (paparazzi.enac.fr) + diff --git a/jsbsim/debian/rules b/jsbsim/debian/rules new file mode 100755 index 0000000..616a179 --- /dev/null +++ b/jsbsim/debian/rules @@ -0,0 +1,7 @@ +#!/usr/bin/make -f + +DEB_CONFIGURE_USER_FLAGS = --enable-libraries --enable-shared --disable-static + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk + diff --git a/jsbsim/jsbsim_silent.patch b/jsbsim/jsbsim_silent.patch new file mode 100644 index 0000000..e4d5b42 --- /dev/null +++ b/jsbsim/jsbsim_silent.patch @@ -0,0 +1,61 @@ +Index: src/FGJSBBase.h +=================================================================== +RCS file: /cvsroot/jsbsim/JSBSim/src/FGJSBBase.h,v +retrieving revision 1.24 +diff -r1.24 FGJSBBase.h +308c308 +< void Debug(int from) {}; +--- +> void Debug(int from __attribute__ ((unused))) {}; +Index: src/models/propulsion/FGTank.cpp +=================================================================== +RCS file: /cvsroot/jsbsim/JSBSim/src/models/propulsion/FGTank.cpp,v +retrieving revision 1.18 +diff -r1.18 FGTank.cpp +182c182 +< const double FGTank::GetXYZ(int idx) +--- +> double FGTank::GetXYZ(int idx) +Index: src/models/propulsion/FGTank.h +=================================================================== +RCS file: /cvsroot/jsbsim/JSBSim/src/models/propulsion/FGTank.h,v +retrieving revision 1.14 +diff -r1.14 FGTank.h +251c251 +< const double GetXYZ(int idx); +--- +> double GetXYZ(int idx); +Index: src/models/propulsion/FGThruster.h +=================================================================== +RCS file: /cvsroot/jsbsim/JSBSim/src/models/propulsion/FGThruster.h,v +retrieving revision 1.12 +diff -r1.12 FGThruster.h +99c99 +< virtual void SetRPM(double rpm) {}; +--- +> virtual void SetRPM(double rpm __attribute__ ((unused))) {}; +Index: src/simgear/xml/easyxml.hxx +=================================================================== +RCS file: /cvsroot/jsbsim/JSBSim/src/simgear/xml/easyxml.hxx,v +retrieving revision 1.4 +diff -r1.4 easyxml.hxx +249c249 +< virtual void startElement (const char * name, const XMLAttributes &atts) {} +--- +> virtual void startElement (const char * name __attribute__ ((unused)), const XMLAttributes &atts __attribute__ ((unused))) {} +258c258 +< virtual void endElement (const char * name) {} +--- +> virtual void endElement (const char * name __attribute__ ((unused))) {} +273c273 +< virtual void data (const char * s, int length) {} +--- +> virtual void data (const char * s __attribute__ ((unused)), int length __attribute__ ((unused))) {} +288c288 +< virtual void pi (const char * target, const char * data) {} +--- +> virtual void pi (const char * target __attribute__ ((unused)), const char * data __attribute__ ((unused))) {} +301c301 +< virtual void warning (const char * message, int line, int column) {} +--- +> virtual void warning (const char * message __attribute__ ((unused)), int line __attribute__ ((unused)), int column __attribute__ ((unused))) {}