+++ /dev/null
-#!/bin/sh
-#
-# clean upstream source to achieve DFSG compliance
-# Copyright 2010 by Bdale Garbee. GPL v2 or any later version.
-#
-
-git rm -rf dists lib lib-extra lib-test web
-rm -rf dists lib lib-extra lib-test web
-
-exit 0
--- /dev/null
+openrocket (1.1.0-2) unstable; urgency=low
+
+ * add desktop files so we get a menu entry
+
+ -- Bdale Garbee <bdale@gag.com> Wed, 04 Aug 2010 20:49:15 -0400
+
+openrocket (1.1.0-1) unstable; urgency=low
+
+ * new upstream version
+ * update build deps
+
+ -- Bdale Garbee <bdale@gag.com> Tue, 03 Aug 2010 22:50:39 -0400
+
+openrocket (1.0.0-3) unstable; urgency=low
+
+ * fix bashism in debian/rules file, closes: #581463
+
+ -- Bdale Garbee <bdale@gag.com> Wed, 12 May 2010 23:48:04 -0600
+
+openrocket (1.0.0-2) unstable; urgency=low
+
+ * fix missing dependencies on Java libraries, closes: #575151
+ * update build.source to brand build as Debian's at upstream request
+
+ -- Bdale Garbee <bdale@gag.com> Tue, 23 Mar 2010 16:54:38 -0600
+
+openrocket (1.0.0-1) unstable; urgency=low
+
+ * initial packaging for Debian
+ * patch startup to remove the whining about OpenJDK
+ * strip dists and lib* trees from upstream source to comply with DFSG and
+ keep orig.tar.gz size down
+ * patch build.xml and add dependencies to control to use packaged versions
+ of jcommon, jfreechart, and miglayout instead of embedding local copies,
+ and use packaged junit4 for test suite
+
+ -- Bdale Garbee <bdale@gag.com> Mon, 22 Mar 2010 17:03:11 -0600
--- /dev/null
+Source: openrocket
+Section: science
+Priority: optional
+Maintainer: Bdale Garbee <bdale@gag.com>
+Build-Depends: debhelper (>= 7.0.50~), openjdk-6-jdk, ant, ant-optional, libjcommon-java, libjfreechart-java, libmiglayout-java, junit4
+Standards-Version: 3.9.1
+Homepage: http://openrocket.sourceforge.net/
+Vcs-Git: git://git.gag.com/debian/openrocket
+
+Package: openrocket
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | sun-java6-jre, libjcommon-java, libjfreechart-java, libmiglayout-java
+Description: Model Rocket Simulator
+ OpenRocket is a free, fully featured model rocket simulator that allows
+ you to design and simulate your rockets before actually building and
+ flying them.
+ .
+ OpenRocket features a full six-degree-of-freedom simulation, realistic
+ wind modeling, a multitude of different components including free-form
+ and canted fins, clustering and staging.
--- /dev/null
+This work was packaged for Debian by:
+
+ Bdale Garbee <bdale@gag.com> on Sat, 13 Mar 2010 15:25:12 -0700
+
+It was downloaded from:
+
+ http://openrocket.sourceforge.net/
+
+Upstream Author(s):
+
+ Sampo Niskanen <sampo.niskanen@iki.fi>
+
+Copyright:
+
+ Copyright (C) 2007-2010 Sampo Niskanen
+
+License:
+
+ GPL version 3 with additional permission under section 7:
+
+ The licensors grant additional permission to package this Program, or
+ any covered work, along with any non-compilable data files (such as
+ thrust curves or component databases) and convey the resulting work.
+
+The Debian packaging is:
+
+ Copyright (C) 2010 Bdale Garbee <bdale@gag.com>
+
+and is also licensed under the GPL version 3,
+see "/usr/share/common-licenses/GPL-3".
+
+The source distribution and binary packages also contain rocket motor
+performance data files from thrustcurve.org. These carry various copyright
+assertions, but all are made available for public use with no distribution
+restrictions.
--- /dev/null
+usr/bin
+usr/share/applications
+usr/share/java
+usr/share/pixmaps
--- /dev/null
+fileformat.txt
+README.TXT
+TODO
--- /dev/null
+# Configuration file for git-buildpackage and friends
+
+[DEFAULT]
+# the default build command:
+#builder = debuild -i\.git/ -I.git
+# the default clean command:
+#cleaner = debuild clean
+# the default branch for upstream sources:
+upstream-branch = upstream
+# the default branch for the debian patch:
+debian-branch = debian
+# the default tag formats used:
+#upstream-tag = upstream/%(version)s
+#debian-tag = debian/%(version)s
+# use pristine-tar:
+pristine-tar = True
+
+# Options only affecting git-buildpackage
+[git-buildpackage]
+#upstream-branch = dfsgclean
+# uncomment this to automatically GPG sign tags
+#sign-tags = True
+# keyid to GPG sign tags with
+#keyid = 0xdeadbeef
+# push to a remote repository after a successful tag:
+posttag = git push --mirror
+# use this for more svn-buildpackage like behaviour:
+export-dir = ../build-area/openrocket/
+#tarball-dir = ../tarballs/
+
+# Options only affecting git-import-orig
+[git-import-orig]
+#upstream-branch = newupstream
+#debian-branch = dfsgclean
+#filter = .svn
+
+# Options only affecting git-import-dsc
+[git-import-dsc]
+#upstream-branch = svn-upstream
+#filter = [ 'CVS', '.cvsignore' ]
+
+# Options only affecting git-dch
+[git-dch]
+#git-log = --no-merges
+#snapshot-number = snapshot + 1
+
--- /dev/null
+?package(openrocket): \
+ needs="X11" \
+ section="Applications/Editors" \
+ title="openrocket" \
+ command="/usr/bin/openrocket" \
+ icon="/usr/share/pixmaps/openrocket.png"
--- /dev/null
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH OPENROCKET 1 "March 13, 2010"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+openrocket \- model rocket design and simulation
+.SH SYNOPSIS
+.B openrocket
+.SH DESCRIPTION
+\fBopenrocket\fP is a free, fully featured model rocket simulator that allows
+you to design and simulate your rockets before actually building and
+flying them.
+
+\fBopenrocket\fP features a full six-degree-of-freedom simulation, realistic
+wind modeling, a multitude of different components including free-form
+and canted fins, clustering and staging.
+
+.SH SEE ALSO
+This program is documented fully at
+http://openrocket.sourceforge.net/documentation.html
+.SH AUTHOR
+openrocket was written by Sampo Niskanen.
+.PP
+This manual page was written by Bdale Garbee <bdale@gag.com>
+for the Debian project (and may be used by others).
--- /dev/null
+[Desktop Entry]
+Type=Application
+Name=OpenRocket
+GenericName=Rocket Design and Simulation
+Comment=Design and simulate model rockets
+Icon=/usr/share/pixmaps/openrocket.xpm
+Exec=/usr/bin/openrocket %f
+Terminal=false
+MimeType=text/plain;
+Categories=Development;Science;
--- /dev/null
+diff --git a/build.properties b/build.properties
+index 73ec3d0..e0cd5fa 100644
+--- a/build.properties
++++ b/build.properties
+@@ -8,7 +8,7 @@ build.version=1.0.0
+ # distribution (Debian, Fedora etc.), this should be changed appropriately!
+ # This is included in bug reports to identify the source of the software.
+
+-build.source=default
++build.source=Debian
+
+
+ # Whether checking for updates is enabled by default.
--- /dev/null
+diff --git a/src/net/sf/openrocket/startup/Startup.java b/src/net/sf/openrocket/startup/Startup.java
+index 0439185..3e7a71a 100644
+--- a/src/net/sf/openrocket/startup/Startup.java
++++ b/src/net/sf/openrocket/startup/Startup.java
+@@ -29,7 +29,8 @@ public class Startup {
+
+ checkVersion();
+ checkHead();
+- checkOpenJDK();
++ // seems to work to me .. let's not hassle users .. Bdale
++ // checkOpenJDK();
+
+ // Load and execute START_CLASS
+ try {
--- /dev/null
+debian-build.source.diff
+openjdk-is-ok.diff
+use-system-libs.diff
--- /dev/null
+diff --git a/build.xml b/build.xml
+index 58155ea..8c4421b 100644
+--- a/build.xml
++++ b/build.xml
+@@ -13,7 +13,6 @@
+
+ <property name="classes.dir" value="${dist.dir}"/> <!-- Directory for classes -->
+ <property name="jar.dir" value="${build.dir}/jar"/> <!-- Directory for built jar's -->
+- <property name="lib.dir" value="lib"/> <!-- Library source directory -->
+
+ <property name="pkgname" value="${ant.project.name}-${build.version}"/>
+
+@@ -28,7 +27,10 @@
+
+ <!-- Classpath definitions -->
+ <path id="classpath">
+- <fileset dir="${lib.dir}" includes="**/*.jar"/>
++ <!-- update manifest class-path definition below too when making changes here -->
++ <pathelement location="/usr/share/java/jcommon.jar"/>
++ <pathelement location="/usr/share/java/jfreechart.jar"/>
++ <pathelement location="/usr/share/java/miglayout.jar"/>
+ </path>
+
+ <path id="test-classpath">
+@@ -37,8 +39,7 @@
+ <pathelement location="${build-test.dir}"/>
+ <pathelement location="${classes.dir}"/>
+ <pathelement location="${src-test.dir}"/>
+-<!-- <pathelement location="${ant.library.dir}/junit4.jar"/> -->
+- <pathelement location="lib-test/junit-4.7.jar"/>
++ <pathelement location="/usr/share/java/junit4.jar"/>
+ </path>
+
+
+@@ -72,10 +73,8 @@
+ <manifest>
+ <attribute name="Main-Class" value="${main-class}"/>
+ <attribute name="SplashScreen-Image" value="pix/splashscreen.png"/>
++ <attribute name="Class-Path" value="/usr/share/java/jcommon.jar /usr/share/java/jfreechart.jar /usr/share/java/miglayout.jar"/>
+ </manifest>
+- <zipfileset src="lib/miglayout15-swing.jar" />
+- <zipfileset src="lib/jcommon-1.0.16.jar" />
+- <zipfileset src="lib/jfreechart-1.0.13.jar" />
+ </jar>
+ </target>
+
+@@ -91,7 +90,7 @@
+ <fileset dir="." includes="*">
+ <type type="file"/>
+ </fileset>
+- <fileset dir="." includes="datafiles/ lib/ lib-test/ pix/ src/ test/"/>
++ <fileset dir="." includes="datafiles/ pix/ src/ test/"/>
+ </copy>
+ <zip destfile="${dist.src}" basedir="${build.dir}" includes="${pkgname}/"/>
+ <delete dir="${build.dir}/${pkgname}"/>
+@@ -215,4 +214,4 @@ ${nonascii}</fail>
+ </echo>
+ </target>
+
+-</project>
+\ No newline at end of file
++</project>
--- /dev/null
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+ dh $@
+
+override_dh_auto_build:
+ ant dist-bin
+
+override_dh_auto_install:
+ cp build/jar/* `pwd`/debian/openrocket/usr/share/java/
+ printf '#!/bin/sh\njava -jar /usr/share/java/%s\n' \
+ "`/bin/ls build/jar`" > \
+ `pwd`/debian/openrocket/usr/bin/openrocket
+
+override_dh_installman:
+ dh_installman debian/openrocket.1
+
+override_dh_install:
+ install -o root -g root -m 644 pix/icon/icon-032.png \
+ debian/openrocket/usr/share/pixmaps/openrocket.png
+ install -o root -g root -m 644 debian/openrocket.desktop \
+ debian/openrocket/usr/share/applications
--- /dev/null
+3.0 (quilt)
projects / debian / openrocket / commitdiff