diff -Nru lbt-1.2.2/debian/changelog lbt-1.2.2/debian/changelog --- lbt-1.2.2/debian/changelog 2011-05-13 07:59:26.000000000 +0000 +++ lbt-1.2.2/debian/changelog 2016-12-06 19:25:48.000000000 +0000 @@ -1,3 +1,23 @@ +lbt (1.2.2-6) unstable; urgency=medium + + * added debian/watch + * debian/copyright: convert to machine-readable format 1.0 + * install docs in /usr/share/docs/lbt: + - added debian/lbt.docs + - changed file location in lbt.doc-base + - dropped debian/lbt.dirs which is no longer useful + * debian/rules: rewrite, using dh + * debhelper compat level 10: + - bump debian/compat + - bump build-dependency on debhelper + * standards-version 3.9.8 (no change) + * added Vcs-{Git,Browser}fields + * patch compiler-flags: honour CFLAGS and CXXFLAGS values passed to + Makefile, use CPPFLAGS + * add as-installed package test, using an example from the lbt manpage + + -- Ralf Treinen Tue, 06 Dec 2016 20:25:48 +0100 + lbt (1.2.2-5) unstable; urgency=low * debian-control: diff -Nru lbt-1.2.2/debian/compat lbt-1.2.2/debian/compat --- lbt-1.2.2/debian/compat 2011-05-13 07:59:26.000000000 +0000 +++ lbt-1.2.2/debian/compat 2016-12-06 19:25:48.000000000 +0000 @@ -1 +1 @@ -7 +10 diff -Nru lbt-1.2.2/debian/control lbt-1.2.2/debian/control --- lbt-1.2.2/debian/control 2011-05-13 07:59:26.000000000 +0000 +++ lbt-1.2.2/debian/control 2016-12-06 19:25:48.000000000 +0000 @@ -3,9 +3,11 @@ Priority: extra Maintainer: Debian Science Maintainers Uploaders: Ralf Treinen -Build-Depends: debhelper (>= 7.0) -Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 10.0) +Standards-Version: 3.9.8 Homepage: http://www.tcs.hut.fi/Software/maria/tools/lbt/ +Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/lbt.git +Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/lbt.git Package: lbt Architecture: any diff -Nru lbt-1.2.2/debian/copyright lbt-1.2.2/debian/copyright --- lbt-1.2.2/debian/copyright 2011-05-13 07:59:26.000000000 +0000 +++ lbt-1.2.2/debian/copyright 2016-12-06 19:25:48.000000000 +0000 @@ -1,17 +1,25 @@ -This package was debianized by Ralf Treinen on -Sun, 4 Aug 2002 13:36:02 +0200. - -It was downloaded from http://www.tcs.hut.fi/maria/src/ - -Upstream Authors: Marko Mäkelä +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: LBT +Source: http://www.tcs.hut.fi/Software/maria/src/ +Upstream-Contact: Marko Mäkelä Mauno Rönkkö Heikki Tauriainen - -Copyright (c) 1998 Mauno Rönkkö -Licence: +Files: * +Copyright: Copyright (c) 1998 Mauno Rönkkö +License: GPL-2+ + +Files: debian/* +Copyright: Copyright (c) 2002-2016 Ralf Treinen +License: GPL-2+ -You are free to distribute this software under the terms of -the GNU General Public License, version 2. -On Debian systems, the complete text of the GNU General Public -License can be found in the /usr/share/common-licenses/GPL-2 file. +License: GPL-2+ + This product contains free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. These terms also + apply to any hardware schemas and any other information presented in + the www-pages below. + . + On Debian systems, the complete text of the GNU General Public + License can be found in the /usr/share/common-licenses/GPL-2 file. diff -Nru lbt-1.2.2/debian/gbp.conf lbt-1.2.2/debian/gbp.conf --- lbt-1.2.2/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ lbt-1.2.2/debian/gbp.conf 2016-12-06 19:25:48.000000000 +0000 @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True diff -Nru lbt-1.2.2/debian/lbt.dirs lbt-1.2.2/debian/lbt.dirs --- lbt-1.2.2/debian/lbt.dirs 2011-05-13 07:59:26.000000000 +0000 +++ lbt-1.2.2/debian/lbt.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/bin -usr/share/doc/lbt/html diff -Nru lbt-1.2.2/debian/lbt.doc-base lbt-1.2.2/debian/lbt.doc-base --- lbt-1.2.2/debian/lbt.doc-base 2011-05-13 07:59:26.000000000 +0000 +++ lbt-1.2.2/debian/lbt.doc-base 2016-12-06 19:25:48.000000000 +0000 @@ -5,5 +5,5 @@ Section: Science/Mathematics Format: HTML -Index: /usr/share/doc/lbt/html/index.html -Files: /usr/share/doc/lbt/html/*.html +Index: /usr/share/doc/lbt/index.html +Files: /usr/share/doc/lbt/*.html diff -Nru lbt-1.2.2/debian/lbt.docs lbt-1.2.2/debian/lbt.docs --- lbt-1.2.2/debian/lbt.docs 1970-01-01 00:00:00.000000000 +0000 +++ lbt-1.2.2/debian/lbt.docs 2016-12-06 19:25:48.000000000 +0000 @@ -0,0 +1,2 @@ +doc/*.html +doc/*.png diff -Nru lbt-1.2.2/debian/patches/compiler-flags lbt-1.2.2/debian/patches/compiler-flags --- lbt-1.2.2/debian/patches/compiler-flags 1970-01-01 00:00:00.000000000 +0000 +++ lbt-1.2.2/debian/patches/compiler-flags 2016-12-06 19:25:48.000000000 +0000 @@ -0,0 +1,32 @@ +Author: Ralf Treinen +Description: honour given CFLAGS and CXXFLAGS values, use CPPFLAGS + +Index: lbt/Makefile +=================================================================== +--- lbt.orig/Makefile 2016-12-06 09:08:11.747876678 +0100 ++++ lbt/Makefile 2016-12-06 09:08:29.035953814 +0100 +@@ -18,10 +18,10 @@ + + # GCC (tested with 2.95.4 and 3.0.2) + CXX=g++ +-CXXFLAGS=$(CFLAGS) -fno-exceptions -fno-rtti ++CXXFLAGS+=$(CFLAGS) -fno-exceptions -fno-rtti + LDFLAGS= + CC=gcc +-CFLAGS=-O3 -fomit-frame-pointer ++CFLAGS+=-O3 -fomit-frame-pointer + + ## Compaq C++ V6.3-011 for Digital UNIX V4.0G (Rev. 1530) + #CXX=cxx +@@ -60,9 +60,9 @@ + $(CC) -o $@ $(L2DOBJS) $(LDFLAGS) + + .C.o: +- $(CXX) $(CXXFLAGS) -c $< -o $@ ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@ + .c.o: +- $(CC) $(CFLAGS) -c $< -o $@ ++ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ + + .phony: all clean reallyclean install installman + .SUFFIXES: diff -Nru lbt-1.2.2/debian/patches/series lbt-1.2.2/debian/patches/series --- lbt-1.2.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ lbt-1.2.2/debian/patches/series 2016-12-06 19:25:48.000000000 +0000 @@ -0,0 +1 @@ +compiler-flags diff -Nru lbt-1.2.2/debian/rules lbt-1.2.2/debian/rules --- lbt-1.2.2/debian/rules 2011-05-13 07:59:26.000000000 +0000 +++ lbt-1.2.2/debian/rules 2016-12-06 19:25:48.000000000 +0000 @@ -1,66 +1,4 @@ #!/usr/bin/make -f -# debian/rules for lbt -#export DH_VERBOSE=1 - -# workaround for gcc-4.0 bug on m68k -export DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH) -ifeq ($(DEB_HOST_ARCH),m68k) - OPTFLAGS = -O2 -else - OPTFLAGS = -O3 -endif - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - OPTFLAGS = -O0 -endif -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - OPTFLAGS += -g -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -build: build-stamp - -build-stamp: - dh_testdir - $(MAKE) CFLAGS=${OPTFLAGS} - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - [ ! -f Makefile ] || $(MAKE) reallyclean - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - $(MAKE) install DESTDIR=$(CURDIR)/debian/lbt - cd $(CURDIR)/debian/lbt/usr/share/doc/lbt && mv *.html *.png html - -binary-indep: build install - -binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs - dh_installexamples - dh_installman - dh_installchangelogs - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +%: + dh $@ diff -Nru lbt-1.2.2/debian/tests/control lbt-1.2.2/debian/tests/control --- lbt-1.2.2/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ lbt-1.2.2/debian/tests/control 2016-12-06 19:25:48.000000000 +0000 @@ -0,0 +1 @@ +Tests: upstream diff -Nru lbt-1.2.2/debian/tests/expected-output lbt-1.2.2/debian/tests/expected-output --- lbt-1.2.2/debian/tests/expected-output 1970-01-01 00:00:00.000000000 +0000 +++ lbt-1.2.2/debian/tests/expected-output 2016-12-06 19:25:48.000000000 +0000 @@ -0,0 +1,15 @@ +4 1 +0 1 -1 +1 ! p0 +3 t +-1 +1 0 0 -1 +2 t +-1 +2 0 0 -1 +2 t +-1 +3 0 -1 +1 ! p0 +3 t +-1 diff -Nru lbt-1.2.2/debian/tests/upstream lbt-1.2.2/debian/tests/upstream --- lbt-1.2.2/debian/tests/upstream 1970-01-01 00:00:00.000000000 +0000 +++ lbt-1.2.2/debian/tests/upstream 2016-12-06 19:25:48.000000000 +0000 @@ -0,0 +1,6 @@ +#!/bin/sh +# test from the lbt manpage + +set -e + +echo '! G p0' | lbt | diff -q - debian/tests/expected-output diff -Nru lbt-1.2.2/debian/watch lbt-1.2.2/debian/watch --- lbt-1.2.2/debian/watch 1970-01-01 00:00:00.000000000 +0000 +++ lbt-1.2.2/debian/watch 2016-12-06 19:25:48.000000000 +0000 @@ -0,0 +1,2 @@ +version=4 +http://www.tcs.hut.fi/Software/maria/src/ lbt-([\d\.]+)\.tar\.gz \ No newline at end of file