Dear Carlo,
As an alternative to the patch from Graham Inggs, this bug (and a few others)
could all be fixed by updating to the 1.3.0 release.
I attach a diff that would update to the current upstream release as well as
fix
a few other bits and pieces within the packaging.
Thoughts?
(BTW I see it's been a long time since you uploaded this package -- would you
be interested co-maintaining it along with the Debian Science team?)
regards
Stuart
--
Stuart Prescott http://www.nanonanonano.net/ stu...@nanonanonano.net
Debian Developer http://www.debian.org/ stu...@debian.org
GPG fingerprint 90E2 D2C1 AD14 6A1B 7EBB 891D BBC1 7EBB 1396 F2F7
--- fityk-1.2.1/debian/changelog 2014-01-02 09:44:24.000000000 +1100
+++ fityk-1.3.0/debian/changelog 2016-11-06 16:20:37.000000000 +1100
@@ -1,3 +1,24 @@
+fityk (1.3.0-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * New upstream release (Closes: #747161):
+ - Builds successfully with GCC 6 (Closes: #811800).
+ * Update build system to suit new upstream:
+ - Remove no-longer-needed compiler/linker FLAGS setting (Closes: #735777)
+ - Update build-dependencies on lua
+ - Add build-dependency on
+ - 'swig' to build bindings
+ - 'check' to run tests
+ - 'texlive-latex-*', 'sphinx', 'dvipng' to build documentation
+ * Switch to debhelper compat level 10, allowing debhelper to do the necessary
+ autoreconf automatically (Closes: #744571)
+ * Move d/upstream to d/upstream/metadata
+ * Fix watch file to correctly find new releases.
+ * Bump Standards-Version to 3.9.8 (no changes required).
+ * Drop no-longer-needed menu file as per #741573.
+
+ -- Stuart Prescott <stu...@debian.org> Sun, 06 Nov 2016 16:20:37 +1100
+
fityk (1.2.1-0.1) unstable; urgency=low
* Non-maintainer upload.
--- fityk-1.2.1/debian/compat 2010-05-09 05:47:59.000000000 +1000
+++ fityk-1.3.0/debian/compat 2016-11-06 16:20:37.000000000 +1100
@@ -1 +1 @@
-7
+10
--- fityk-1.2.1/debian/control 2014-01-02 04:40:54.000000000 +1100
+++ fityk-1.3.0/debian/control 2016-11-06 16:20:37.000000000 +1100
@@ -2,17 +2,23 @@
Section: science
Priority: optional
Maintainer: Carlo Segre <se...@debian.org>
-Build-Depends: autotools-dev (>> 20100122.1~),
- debhelper (>> 7),
+Build-Depends: catch,
+ debhelper (>> 10),
+ dvipng,
libboost-dev,
libbz2-dev,
- liblua5.1-0-dev,
+ liblua5.2-dev,
libreadline-dev,
libwxgtk3.0-dev,
libxy-dev,
+ lua5.2,
+ python3-sphinx,
+ swig,
+ texlive-latex-extra,
+ texlive-latex-recommended,
zlib1g-dev
Homepage: http://fityk.nieto.pl/
-Standards-Version: 3.9.5
+Standards-Version: 3.9.8
Package: fityk
Architecture: any
--- fityk-1.2.1/debian/docs 2010-05-09 04:58:55.000000000 +1000
+++ fityk-1.3.0/debian/docs 2016-11-06 16:20:37.000000000 +1100
@@ -1,3 +1,3 @@
-README
+README.md
debian/README.Debian
TODO
--- fityk-1.2.1/debian/menu 2010-05-09 04:58:55.000000000 +1000
+++ fityk-1.3.0/debian/menu 1970-01-01 10:00:00.000000000 +1000
@@ -1,6 +0,0 @@
-?package(fityk):needs="X11" \
- section="Applications/Science/Data Analysis" \
- title="fityk" \
- command="/usr/bin/fityk" \
- icon="/usr/share/pixmaps/fityk.xpm"
-
--- fityk-1.2.1/debian/rules 2014-01-02 04:38:10.000000000 +1100
+++ fityk-1.3.0/debian/rules 2016-11-06 16:20:37.000000000 +1100
@@ -1,20 +1,16 @@
#!/usr/bin/make -f
-CPPFLAGS ?= $(shell dpkg-buildflags --get CPPFLAGS) -I/usr/include/lua5.1
-CFLAGS ?= $(shell dpkg-buildflags --get CFLAGS)
-CXXFLAGS ?= $(shell dpkg-buildflags --get CXXFLAGS)
-LDFLAGS ?= -lstdc++ $(shell dpkg-buildflags --get LDFLAGS) # -Wl,--as-needed
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
- dh $@ --with autotools_dev --parallel
+ dh $@ --buildsystem=autoconf --parallel
override_dh_auto_configure:
- dh_auto_configure -- --disable-shared --enable-static \
- --disable-xyconvert --with-lua-suffix=5.1 \
- CPPFLAGS="$(CPPFLAGS)" \
- CFLAGS="$(CFLAGS)" \
- CXXFLAGS="$(CXXFLAGS)" \
- LDFLAGS="$(LDFLAGS)"
+ dh_auto_configure -- --disable-shared --enable-static
+
+override_dh_auto_build:
+ dh_auto_build
+ make -C doc html
override_dh_auto_install:
dh_auto_install
--- fityk-1.2.1/debian/watch 2011-03-24 18:00:05.000000000 +1100
+++ fityk-1.3.0/debian/watch 2016-11-06 16:20:37.000000000 +1100
@@ -1,3 +1,3 @@
version=3
-https://github.com/wojdyr/fityk/downloads \
- /downloads/wojdyr/fityk/fityk-(.*)\.tar\.bz2
+opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/fityk-$1\.tar\.gz/ \
+ https://github.com/wojdyr/fityk/tags .*/v?(\d\S+)\.tar\.gz
