Merge branch 'upstream' into debian

[debian/openrocket] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index e136c25ed689b2eb7b52b1d1985b94db21f343dc..5adcbc813275f07d1f4acfd2f5c2ff889067a8e4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+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