Merge branch 'upstream' into debian
authorBdale Garbee <bdale@gag.com>
Sun, 16 Sep 2012 22:28:51 +0000 (16:28 -0600)
committerBdale Garbee <bdale@gag.com>
Sun, 16 Sep 2012 22:28:51 +0000 (16:28 -0600)
17 files changed:
cleanup-script.sh [deleted file]
debian/changelog [new file with mode: 0644]
debian/compat [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/dirs [new file with mode: 0644]
debian/docs [new file with mode: 0644]
debian/gbp.conf [new file with mode: 0644]
debian/menu [new file with mode: 0644]
debian/openrocket.1 [new file with mode: 0644]
debian/openrocket.desktop [new file with mode: 0644]
debian/patches/debian-build.source.diff [new file with mode: 0644]
debian/patches/series [new file with mode: 0644]
debian/patches/skip-unittest.diff [new file with mode: 0644]
debian/patches/use-system-libs.diff [new file with mode: 0644]
debian/rules [new file with mode: 0755]
debian/source/format [new file with mode: 0644]

diff --git a/cleanup-script.sh b/cleanup-script.sh
deleted file mode 100755 (executable)
index 4bac64e..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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
diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..4ac65a8
--- /dev/null
@@ -0,0 +1,111 @@
+openrocket (12.03-1) unstable; urgency=low
+
+  * new upstream versions
+
+ -- Bdale Garbee <bdale@gag.com>  Sun, 18 Mar 2012 23:58:34 +0100
+
+openrocket (1.1.9-1) unstable; urgency=low
+
+  * new upstream version 
+
+ -- Bdale Garbee <bdale@gag.com>  Thu, 24 Nov 2011 20:56:38 -0700
+
+openrocket (1.1.8-2) unstable; urgency=low
+
+  * add runtime dependency on libitext5-java, closes: #642276
+
+ -- Bdale Garbee <bdale@gag.com>  Mon, 17 Oct 2011 22:26:22 -0400
+
+openrocket (1.1.8-1) unstable; urgency=low
+
+  * new upstream version 
+
+ -- Bdale Garbee <bdale@gag.com>  Thu, 25 Aug 2011 15:20:38 -0600
+
+openrocket (1.1.7-1) unstable; urgency=low
+
+  * new upstream version 
+
+ -- Bdale Garbee <bdale@gag.com>  Sat, 13 Aug 2011 12:31:05 -0600
+
+openrocket (1.1.6-1) unstable; urgency=low
+
+  * new upstream version 
+
+ -- Bdale Garbee <bdale@gag.com>  Fri, 22 Jul 2011 18:05:46 +0200
+
+openrocket (1.1.5-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Bdale Garbee <bdale@gag.com>  Sat, 11 Jun 2011 08:34:12 -0600
+
+openrocket (1.1.4-1) unstable; urgency=low
+
+  * new upstream version, closes: #616675
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 08 Mar 2011 21:43:26 -0700
+
+openrocket (1.1.3-3) unstable; urgency=low
+
+  * additional escape to avoid shell expansion at wrong time leading to bogus
+    error message on launch
+
+ -- Bdale Garbee <bdale@gag.com>  Mon, 27 Dec 2010 16:14:59 -0700
+
+openrocket (1.1.3-2) unstable; urgency=low
+
+  * add Vcs-Browser entry to control file
+  * modify wrapper to allow arguments to be passed, closes: #606176
+
+ -- Bdale Garbee <bdale@gag.com>  Mon, 27 Dec 2010 05:15:51 -0700
+
+openrocket (1.1.3-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Bdale Garbee <bdale@gag.com>  Wed, 06 Oct 2010 15:46:51 -0600
+
+openrocket (1.1.2-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 07 Sep 2010 21:05:32 -0600
+
+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
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7f8f011
--- /dev/null
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..27662e7
--- /dev/null
@@ -0,0 +1,21 @@
+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, libitext5-java, netpbm
+Standards-Version: 3.9.3
+Homepage: http://openrocket.sourceforge.net/
+Vcs-Git: git://git.gag.com/debian/openrocket
+Vcs-Browser: http://git.gag.com/?p=debian/openrocket
+
+Package: openrocket
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | sun-java6-jre, libjcommon-java, libjfreechart-java, libmiglayout-java, libitext5-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. 
diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..1b0af63
--- /dev/null
@@ -0,0 +1,35 @@
+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:
+
+    Sampo Niskanen <sampo.niskanen@iki.fi>
+
+Copyright:
+
+    Copyright (C) 2007-2011 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.
diff --git a/debian/dirs b/debian/dirs
new file mode 100644 (file)
index 0000000..93fa661
--- /dev/null
@@ -0,0 +1,4 @@
+usr/bin
+usr/share/applications
+usr/share/java
+usr/share/pixmaps
diff --git a/debian/docs b/debian/docs
new file mode 100644 (file)
index 0000000..06ad6c0
--- /dev/null
@@ -0,0 +1,3 @@
+core/fileformat.txt
+core/README.TXT
+core/TODO
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644 (file)
index 0000000..15b1cba
--- /dev/null
@@ -0,0 +1,46 @@
+# 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
+
diff --git a/debian/menu b/debian/menu
new file mode 100644 (file)
index 0000000..46fa39a
--- /dev/null
@@ -0,0 +1,6 @@
+?package(openrocket): \
+       needs="X11" \
+       section="Applications/Editors" \
+       title="openrocket" \
+       command="/usr/bin/openrocket" \
+       icon="/usr/share/pixmaps/openrocket.png"
diff --git a/debian/openrocket.1 b/debian/openrocket.1
new file mode 100644 (file)
index 0000000..02ebce5
--- /dev/null
@@ -0,0 +1,38 @@
+.\"                                      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).
diff --git a/debian/openrocket.desktop b/debian/openrocket.desktop
new file mode 100644 (file)
index 0000000..bbbc7e8
--- /dev/null
@@ -0,0 +1,10 @@
+[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;
diff --git a/debian/patches/debian-build.source.diff b/debian/patches/debian-build.source.diff
new file mode 100644 (file)
index 0000000..cd65067
--- /dev/null
@@ -0,0 +1,16 @@
+diff --git a/core/resources/build.properties b/core/resources/build.properties
+index d12cc3a..4897a42 100644
+--- a/core/resources/build.properties
++++ b/core/resources/build.properties
+@@ -8,9 +8,9 @@ build.version=12.03
+ # 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.
+-build.checkupdates=true
++build.checkupdates=false
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..2a882d4
--- /dev/null
@@ -0,0 +1,3 @@
+debian-build.source.diff
+use-system-libs.diff
+skip-unittest.diff
diff --git a/debian/patches/skip-unittest.diff b/debian/patches/skip-unittest.diff
new file mode 100644 (file)
index 0000000..212500f
--- /dev/null
@@ -0,0 +1,13 @@
+diff --git a/core/build.xml b/core/build.xml
+index 30f62d2..eab61f8 100644
+--- a/core/build.xml
++++ b/core/build.xml
+@@ -114,7 +114,7 @@
+       
+       
+       <!-- DIST-BIN -->
+-      <target name="dist-bin" depends="check,clean,unittest,jar">
++      <target name="dist-bin" depends="check,clean,jar">
+               <move file="${jar.file}" tofile="${dist.bin}"/>
+       </target>
diff --git a/debian/patches/use-system-libs.diff b/debian/patches/use-system-libs.diff
new file mode 100644 (file)
index 0000000..0ea303c
--- /dev/null
@@ -0,0 +1,64 @@
+diff --git a/core/build.xml b/core/build.xml
+index 0e57a6b..0a3c045 100644
+--- a/core/build.xml
++++ b/core/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}"/>
+       
+@@ -27,7 +26,12 @@
+       
+       <!-- 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/itext5.jar"/>
++              <pathelement location="/usr/share/java/jcommon.jar"/>
++              <pathelement location="/usr/share/java/jfreechart.jar"/>
++              <pathelement location="/usr/share/java/jmock2.jar"/>
++              <pathelement location="/usr/share/java/miglayout.jar"/>
+       </path>
+       
+       <path id="test-classpath">
+@@ -36,7 +40,7 @@
+               <pathelement location="${build-test.dir}"/>
+               <pathelement location="${classes.dir}"/>
+               <pathelement location="${src-test.dir}"/>
+-              <fileset dir="lib-test/" includes="*.jar"/>
++              <pathelement location="/usr/share/java/junit4.jar"/>
+       </path>
+       
+@@ -68,11 +72,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 /usr/share/java/itext5.jar"/>
+                       </manifest>
+-                      <zipfileset src="lib/miglayout15-swing.jar" />
+-                      <zipfileset src="lib/jcommon-1.0.16.jar" />
+-                      <zipfileset src="lib/jfreechart-1.0.13.jar" />
+-                      <zipfileset src="lib/iText-5.0.2.jar" />
+               </jar>
+       </target>
+       
+@@ -88,7 +89,7 @@
+                       <fileset dir="." includes="*" excludes="*.log">
+                               <type type="file"/>
+                       </fileset>
+-                      <fileset dir="." includes="resources/ lib/ lib-test/ src/ test/"/>
++                      <fileset dir="." includes="resources/ src/ test/"/>
+               </copy>
+               <zip destfile="${dist.src}" basedir="${build.dir}" includes="${pkgname}/"/>
+               <delete dir="${build.dir}/${pkgname}"/>
+@@ -212,4 +213,4 @@ ${nonascii}</fail>
+               </echo>
+       </target>
+     
+-</project>
+\ No newline at end of file
++</project>
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..4b02b07
--- /dev/null
@@ -0,0 +1,33 @@
+#!/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 -f core/build.xml dist-bin
+
+override_dh_auto_install:
+       cp core/build/jar/* `pwd`/debian/openrocket/usr/share/java/
+       printf '#!/bin/sh\nexec java -jar /usr/share/java/%s "$$@"\n' \
+               "`/bin/ls core/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 core/resources/pix/icon/icon-032.png \
+               debian/openrocket/usr/share/pixmaps/openrocket.png
+       pngtopnm < core/resources/pix/icon/icon-032.png | ppmtoxpm > \
+               debian/openrocket/usr/share/pixmaps/openrocket.xpm
+       install -o root -g root -m 644 debian/openrocket.desktop \
+               debian/openrocket/usr/share/applications
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)