X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=debian%2Fchangelog;h=93afb97398df020eb56f77ba36084198495b5793;hp=7dc489e2c37fafa148c7f8be45d786597961bfec;hb=4b49778f44b9149451ba36e5f1bd7830c74c8fee;hpb=4ff226fc6afb090a5211f3c0c12650207609ba90;ds=sidebyside

diff --git a/debian/changelog b/debian/changelog
index 7dc489e..93afb97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,64 @@
+ctsim (6.0.0-2) unstable; urgency=low
+
+  * Merge patches and packaging changes kindly make by Debian Med Team
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Wed, 21 Mar 2018 00:55:11 -0600
+
 ctsim (6.0.0-1) unstable; urgency=low
 
-  * New upstream, supports wxgtk3.0
+  * New upstream, supports OpenMP parallelism and migrated to wxgtk3.0 and libpng1.6
   * debian/control: Update for wxgtk3
 
  -- Kevin M. Rosenberg <kmr@debian.org>  Tue, 20 Mar 2018 22:40:50 -0600
 
-ctsim (5.2.1-1) unstable; urgency=low
+ctsim (5.2.0-4) unstable; urgency=medium
 
-  * New upstream
-  * debian/control: Change Build-Depends to libpng-dev from libpng12-dev
-  (closes:662293)
+  * Fix watch file
+  * Remove redundant README.Debian
+  * hardening=+all
+  * debhelper 10
+  * Remove empty postinst script
+
+ -- Andreas Tille <tille@debian.org>  Tue, 06 Dec 2016 10:17:38 +0100
 
- -- Kevin M. Rosenberg <kmr@debian.org>  Fri, 21 Dec 2012 14:31:30 -0700
+ctsim (5.2.0-3) unstable; urgency=medium
+
+  * cme fix dpkg-control
+  * DEP3 header for libpng16 patch
+  * Fix d/rules (thanks to Chris Lamb <lamby@debian.org> for the patch)
+    Closes: 834574
+  * Remove menu file
+  * hardening=+all,-pie
+
+ -- Andreas Tille <tille@debian.org>  Wed, 17 Aug 2016 13:36:53 +0200
+
+ctsim (5.2.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "FTBFS with libpng16" (Closes: #809897)
+
+ -- Tobias Frost <tobi@debian.org>  Sun, 24 Jan 2016 12:58:10 +0100
+
+ctsim (5.2.0-2) unstable; urgency=medium
+
+  [ Olly Betts ]
+  * Update to use wxWidgets 3.0 (new patch: wx3.0-compat.patch)
+    Closes: #751552
+
+  [ Andreas Tille ]
+  * Take over the package into Debian Med team
+  * debian/control:
+     - debhelper 9
+     - Priority: optional
+     - cme fix dpkg-control
+  * Build-Depends on libpng-dev, change from libpng12-dev
+    Closes: #662293
+  * debian/copyright: DEP5
+  * debian/rules: Use dh in d/rules
+  * fix upstream Makefile issues (finally by using dh-autoreconf)
+  * spelling fix
+
+ -- Andreas Tille <tille@debian.org>  Mon, 11 Aug 2014 10:05:01 +0200
 
 ctsim (5.2.0-1.1) unstable; urgency=low