[fityk] 36/45: Update build system for new upstream version

Stuart Prescott stuart at debian.org
Sun Nov 6 23:35:33 UTC 2016


This is an automated email from the git hooks/post-receive script.

stuart pushed a commit to branch master
in repository fityk.

commit ee19df1ba1a2621b0327b7841e369e30490ac0e5
Author: Stuart Prescott <stuart at debian.org>
Date:   Sun Nov 6 16:27:28 2016 +1100

    Update build system for new upstream version
---
 debian/compat  |  2 +-
 debian/control | 12 +++++++++---
 debian/docs    |  2 +-
 debian/rules   | 18 +++++++-----------
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/debian/compat b/debian/compat
index 7f8f011..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+10
diff --git a/debian/control b/debian/control
index 02f7eca..a032e44 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,20 @@ Source: fityk
 Section: science
 Priority: optional
 Maintainer: Carlo Segre <segre at 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
diff --git a/debian/docs b/debian/docs
index 9ee92c3..3c90180 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,3 @@
-README
+README.md
 debian/README.Debian
 TODO
diff --git a/debian/rules b/debian/rules
index e4d1030..1055e8d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fityk.git



More information about the debian-science-commits mailing list