Package: nautic Version: 1.5-1 Severity: normal Tags: patch Dear maintainer,
I've uploaded an NMU for nautic (versioned as 1.5-1.1), fixing the four RC bugs, the lintian errors and warnings, and some typos. I dropped "DM-Upload-Allowed" from debian/control as it is obsolete and no longer has any effect - the replacement mechanism is detailed here: https://lists.debian.org/debian-devel-announce/2012/09/msg00008.html There's a minor visual issue with the heights of a few controls in the rebuilt version - I believe this is a wxwidgets3 bug, which is already reported upstream. Once there's a fix, I'll apply it to the package. It doesn't really affect usability - just some of the controls aren't quite tall enough. Cheers, Olly
diff -Nru nautic-1.5/debian/changelog nautic-1.5/debian/changelog --- nautic-1.5/debian/changelog 2012-10-21 20:11:27.000000000 -0300 +++ nautic-1.5/debian/changelog 2014-09-02 10:11:27.000000000 -0300 @@ -1,3 +1,28 @@ +nautic (1.5-1.1) unstable; urgency=medium + + * Non-maintainer upload with maintainer's consent. + + [ Hideki Yamane ] + * debian/rules + - Just use dh-autoreconf to fix FTBFS (Closes: #662221, #713547) + * debian/control + - add "Build-Depends: dh-autoreconf" + + [ Olly Betts ] + * Update to use wxWidgets 3.0 (Closes: #750972): + - New patch: wx3.0-compat.patch + * Fix a buffer overrun (Closes: #750974): + - New patch: fix-buffer-overrun.patch + * Update to use dh compat level 9 to enable hardening flags. + * "Standards-Version: 3.9.5" - only change is to drop obsolete + "DM-Upload-Allowed: yes". + * Fix typo in long description. + * Fix typo in "About" dialog spotted by lintian (new patch typos.patch). + * Override lintian errors about symlinks pointing outside the source + tree - dh_autoreconf replaces these with files. + + -- Olly Betts <o...@survex.com> Tue, 02 Sep 2014 13:11:15 +0000 + nautic (1.5-1) unstable; urgency=low * new issue with new view and major changes diff -Nru nautic-1.5/debian/compat nautic-1.5/debian/compat --- nautic-1.5/debian/compat 2011-07-02 10:04:00.000000000 -0300 +++ nautic-1.5/debian/compat 2014-06-09 02:04:37.000000000 -0300 @@ -1 +1 @@ -7 +9 diff -Nru nautic-1.5/debian/control nautic-1.5/debian/control --- nautic-1.5/debian/control 2012-10-21 20:14:06.000000000 -0300 +++ nautic-1.5/debian/control 2014-06-09 02:04:30.000000000 -0300 @@ -2,12 +2,11 @@ Section: science Priority: optional Maintainer: Enas Giovanni <gio.e...@alice.it> -DM-Upload-Allowed: yes -Build-Depends: debhelper (>= 7.0.50~), - autoconf(>= 2.13), automake, autotools-dev, - libglib2.0-0,wx-common, - libwxgtk2.8-dev,libwxbase2.8-dev -Standards-Version: 3.9.4 +Build-Depends: debhelper (>= 9), + dh-autoreconf, + libglib2.0-0, + libwxgtk3.0-dev +Standards-Version: 3.9.5 Homepage: https://sourceforge.net/projects/nauticalmanac/ Package: nautic @@ -16,7 +15,7 @@ Description: computation of observer position in astro-navigation Nautical ephemeris are included until 2030 with no relevant error for all navigational bodies, 56 stars, Sun, Moon and 4 major planets. - The local meridan time can be computed directly from time UT: sextant + The local meridian time can be computed directly from time UT: sextant altitude correction is computed automatically after inserting the value of height of eye with the correction tables of the Admiralty Nautical Almanac. diff -Nru nautic-1.5/debian/patches/fix-buffer-overrun.patch nautic-1.5/debian/patches/fix-buffer-overrun.patch --- nautic-1.5/debian/patches/fix-buffer-overrun.patch 1969-12-31 21:00:00.000000000 -0300 +++ nautic-1.5/debian/patches/fix-buffer-overrun.patch 2014-06-09 02:46:01.000000000 -0300 @@ -0,0 +1,17 @@ +Description: Fix buffer overrrun + The loops which access moon_alt assume it has 514 elements, not 504. +Author: Olly Betts <o...@survex.com> +Bug-Debian: https://bugs.debian.org/750974 +Last-Update: 2014-06-09 + +--- nautic-1.5.orig/src/h_correction.cpp ++++ nautic-1.5/src/h_correction.cpp +@@ -79,7 +79,7 @@ static double mean_alt[]= { + 9,14,19,24,29,34,39,44,49,54,59,64,69,74,79,84,89, + }; + +-static double moon_alt[504]; ++static double moon_alt[514]; + + static double moon_refrac[] = { 0.0, 0.0, + 66.9, 67.2, 67.4, 67.6, 67.8, 68.0, 68.2, 68.4, 68.6, 68.7, 68.9, 69.0, diff -Nru nautic-1.5/debian/patches/series nautic-1.5/debian/patches/series --- nautic-1.5/debian/patches/series 1969-12-31 21:00:00.000000000 -0300 +++ nautic-1.5/debian/patches/series 2014-06-09 02:09:42.000000000 -0300 @@ -0,0 +1,3 @@ +wx3.0-compat.patch +fix-buffer-overrun.patch +typos.patch diff -Nru nautic-1.5/debian/patches/typos.patch nautic-1.5/debian/patches/typos.patch --- nautic-1.5/debian/patches/typos.patch 1969-12-31 21:00:00.000000000 -0300 +++ nautic-1.5/debian/patches/typos.patch 2014-06-09 02:10:08.000000000 -0300 @@ -0,0 +1,15 @@ +Description: Fix typo spotted by lintian +Author: Olly Betts <o...@survex.com> +Last-Update: 2014-06-09 + +--- nautic-1.5.orig/src/about.cpp ++++ nautic-1.5/src/about.cpp +@@ -41,7 +41,7 @@ void AboutDialog::OnPaint(wxPaintEvent& + wxPen pen; + pen.SetColour(bk); + dc.SetPen(pen); +- dc.DrawText(_("This programm was designed and implemented by"),20,20); ++ dc.DrawText(_("This program was designed and implemented by"),20,20); + dc.DrawText(_("-Giovanni Enas-"),130,40); + dc.DrawText(_("with the aid of SOFA libraries, refering to the algorithms"),10,60); + dc.DrawText(_("and solutions of -Steve Moshier's Ephemeris Program-"),10,75); diff -Nru nautic-1.5/debian/patches/wx3.0-compat.patch nautic-1.5/debian/patches/wx3.0-compat.patch --- nautic-1.5/debian/patches/wx3.0-compat.patch 1969-12-31 21:00:00.000000000 -0300 +++ nautic-1.5/debian/patches/wx3.0-compat.patch 2014-06-09 02:41:29.000000000 -0300 @@ -0,0 +1,17 @@ +Description: Fix to build with wxWidgets 3.0 + Should still build with wxWidgets 2.8, but not tested. +Author: Olly Betts <o...@survex.com> +Bug-Debian: https://bugs.debian.org/750972 +Last-Update: 2014-03-21 + +--- nautic-1.5.orig/main.h ++++ nautic-1.5/main.h +@@ -25,7 +25,7 @@ + #define __main__ + + // main wxWidgets header file +-#include <wx-2.8/wx/wx.h> ++#include <wx/wx.h> + #include <wx/defs.h> + #include <wx/file.h> + #include <wx/dir.h> diff -Nru nautic-1.5/debian/rules nautic-1.5/debian/rules --- nautic-1.5/debian/rules 2012-03-04 17:23:25.000000000 -0300 +++ nautic-1.5/debian/rules 2014-06-09 02:19:50.000000000 -0300 @@ -9,16 +9,15 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export DEB_CPPFLAGS_MAINT_APPEND=-DNDEBUG + %: - dh $@ + dh $@ --with autoreconf override_dh_clean: dh_clean rm -f config.guess config.sub config.log config.status + rm -f missing install-sh depcomp $(RM) ltmain.sh Makefile.in configure $(RM) aclocal.m4 data/Makefile.in icon/Makefile.in $(RM) info/Makefile.in man/Makefile.in src/Makefile.in - -override_dh_auto_configure: - autoreconf -fs - dh_auto_configure diff -Nru nautic-1.5/debian/source/lintian-overrides nautic-1.5/debian/source/lintian-overrides --- nautic-1.5/debian/source/lintian-overrides 1969-12-31 21:00:00.000000000 -0300 +++ nautic-1.5/debian/source/lintian-overrides 2014-06-09 02:08:06.000000000 -0300 @@ -0,0 +1,5 @@ +# These symlinks pointing outside the source tree are replaced with files by +# dh_autoreconf. +nautic source: source-contains-unsafe-symlink depcomp +nautic source: source-contains-unsafe-symlink install-sh +nautic source: source-contains-unsafe-symlink missing
