diff -Nru lcdproc-0.5.7/debian/autogen.sh lcdproc-0.5.7/debian/autogen.sh --- lcdproc-0.5.7/debian/autogen.sh 2015-05-17 15:43:14.000000000 +0000 +++ lcdproc-0.5.7/debian/autogen.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -#!/bin/sh -# -# autogen.sh glue for hplip -# -# HPLIP used to have five or so different autotools trees. Upstream -# has reduced it to two. Still, this script is capable of cleaning -# just about any possible mess of autoconf files. -# -# BE CAREFUL with trees that are not completely automake-generated, -# this script deletes all Makefile.in files it can find. -# -# Requires: automake 1.9, autoconf 2.57+ -# Conflicts: autoconf 2.13 -set -e - -# Refresh GNU autotools toolchain. -echo Cleaning autotools files... -find -type d -name autom4te.cache -print0 | xargs -0 rm -rf \; -find -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \ - -o -name depcomp -o -name ltmain.sh -o -name configure \ - -o -name config.sub -o -name config.guess \ - -o -name Makefile.in \) -print0 | xargs -0 rm -f - -echo Running autoreconf... -autoreconf --force --install - -# For the Debian package build -test -d debian && { - # link these in Debian builds - rm -f config.sub config.guess - ln -s /usr/share/misc/config.sub . - ln -s /usr/share/misc/config.guess . - - # refresh list of executable scripts, to avoid possible breakage if - # upstream tarball does not include the file or if it is mispackaged - # for whatever reason. - [ "$1" = "updateexec" ] && { - echo Generating list of executable files... - rm -f debian/executable.files - find -type f -perm +111 ! -name '.*' -fprint debian/executable.files - } - - # Remove any files in upstream tarball that we don't have in the Debian - # package (because diff cannot remove files) - version=`dpkg-parsechangelog | awk '/Version:/ { print $2 }' | sed -e 's/-[^-]\+$//'` - source=`dpkg-parsechangelog | awk '/Source:/ { print $2 }' | tr -d ' '` - if test -r ../${source}_${version}.orig.tar.gz ; then - echo Generating list of files that should be removed... - rm -f debian/deletable.files - touch debian/deletable.files - [ -e debian/tmp ] && rm -rf debian/tmp - mkdir debian/tmp - ( cd debian/tmp ; tar -zxf ../../../${source}_${version}.orig.tar.gz ) - find debian/tmp/ -type f ! -name '.*' -print0 | xargs -0 -ri echo '{}' | \ - while read -r i ; do - if test -e "${i}" ; then - filename=$(echo "${i}" | sed -e 's#.*debian/tmp/[^/]\+/##') - test -e "${filename}" || echo "${filename}" >>debian/deletable.files - fi - done - rm -fr debian/tmp - else - echo Emptying list of files that should be deleted... - rm -f debian/deletable.files - touch debian/deletable.files - fi -} - -exit 0 diff -Nru lcdproc-0.5.7/debian/changelog lcdproc-0.5.7/debian/changelog --- lcdproc-0.5.7/debian/changelog 2015-05-17 15:43:14.000000000 +0000 +++ lcdproc-0.5.7/debian/changelog 2015-12-29 18:44:49.000000000 +0000 @@ -1,3 +1,13 @@ +lcdproc (0.5.7-4) unstable; urgency=medium + + * copyright: fixed typo that trigger lintian errors + * Remove autogen hack and and use dh-autoreconf (Closes: #808928) + (Tx Andreas) + * rules: removed obsolete dh_installinit params + * Ship a systemd service file using dh-systemd + + -- Dominique Dumont Tue, 29 Dec 2015 19:26:08 +0100 + lcdproc (0.5.7-3) unstable; urgency=medium * control: diff -Nru lcdproc-0.5.7/debian/control lcdproc-0.5.7/debian/control --- lcdproc-0.5.7/debian/control 2015-05-17 15:43:14.000000000 +0000 +++ lcdproc-0.5.7/debian/control 2015-12-29 18:44:49.000000000 +0000 @@ -7,6 +7,8 @@ autotools-dev, cme, debhelper (>= 9), + dh-autoreconf, + dh-systemd, libftdi-dev, libg15-dev, libg15daemon-client-dev, diff -Nru lcdproc-0.5.7/debian/copyright lcdproc-0.5.7/debian/copyright --- lcdproc-0.5.7/debian/copyright 2015-05-17 15:43:14.000000000 +0000 +++ lcdproc-0.5.7/debian/copyright 2015-12-29 18:44:49.000000000 +0000 @@ -4,7 +4,7 @@ Source: http://www.lcdproc.org/ Files-Excluded: */Makefile.in aclocal.m4 config.* configure -Files: .* +Files: * Copyright: 2009-2013 Markus Dolze 1999-2011 William Ferrell 1999-2011 Scott Scriven, Joris Robijn, F5 Networks, Inc., Peter Marschall and others, as specified in the corresponding source modules. @@ -19,10 +19,6 @@ 2011-2014 Dominique Dumont License: GPL-2 -Files: debian/autogen.sh -Copyright: 2001 Henrique de Moraes Holschuh -License: GPL-2 - License: GPL-2 On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2. diff -Nru lcdproc-0.5.7/debian/lcdproc.LCDd.service lcdproc-0.5.7/debian/lcdproc.LCDd.service --- lcdproc-0.5.7/debian/lcdproc.LCDd.service 1970-01-01 00:00:00.000000000 +0000 +++ lcdproc-0.5.7/debian/lcdproc.LCDd.service 2015-12-29 18:44:49.000000000 +0000 @@ -0,0 +1,10 @@ +[Unit] +Description=LCD display daemon +Documentation=man:LCDd(8) http://www.lcdproc.org/ + +[Service] +User=root +ExecStart=/usr/sbin/LCDd -s 1 -f -c /etc/LCDd.conf + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff -Nru lcdproc-0.5.7/debian/NEWS lcdproc-0.5.7/debian/NEWS --- lcdproc-0.5.7/debian/NEWS 2015-05-17 15:43:14.000000000 +0000 +++ lcdproc-0.5.7/debian/NEWS 2015-12-29 18:44:49.000000000 +0000 @@ -18,17 +18,3 @@ svga support is now removed from Debian version of lcdproc. -- Dominique Dumont Sat, 17 Aug 2013 15:16:12 +0200 -lcdproc (0.5.6-1) unstable; urgency=low - - cme is now used during package to merge the updates of upstream - LCDd.conf with the modifications done on the local - LCDd.conf. Package upgrade is no longer interrupted to ask - question to user. - - People wanting to manage LCDd.conf themselves will be offered the - choice to allow or deny automatic configuration merge during - preconfiguration. - - For more details, see: https://tinyurl.com/lcdproc-config-upgrade - - -- Dominique Dumont Fri, 28 Mar 2014 13:12:36 +0100 diff -Nru lcdproc-0.5.7/debian/rules lcdproc-0.5.7/debian/rules --- lcdproc-0.5.7/debian/rules 2015-05-17 15:43:14.000000000 +0000 +++ lcdproc-0.5.7/debian/rules 2015-12-29 18:44:49.000000000 +0000 @@ -15,17 +15,15 @@ # --with autotools_dev will update/restore config.sub and config.guess %: - dh $@ --verbose --with autotools_dev --with cme_upgrade + dh $@ --verbose --with autotools_dev --with autoreconf --with=systemd \ + --with cme_upgrade override_dh_auto_configure: -# from /usr/share/doc/autotools-dev/examples/rules.gz perl -pi -e 's!DriverPath.*!DriverPath=/usr/lib/$(DEB_BUILD_MULTIARCH)/lcdproc/!;' LCDd.conf # live patch to use date of last changelog entry as build date DEBBUILDDATE=$$(perl -ne 'if (/ --.*?>\s+(.*)/) {print "$$1\n"; exit}' debian/changelog ) && \ export DEBBUILDDATE && \ perl -pi -e 's!__DATE__!"$$ENV{DEBBUILDDATE}"!;' clients/lcdproc/main.c server/main.c - chmod +x debian/autogen.sh - debian/autogen.sh # Add here commands to configure the package. dh_auto_configure -- \ --enable-stat-nfs \ @@ -45,7 +43,7 @@ dh_strip --dbg-package=lcdproc-dbg override_dh_installinit: - dh_installinit --name=LCDd -- start 60 2 3 4 5 . stop 60 0 1 6 . + dh_installinit --name=LCDd override_dh_install: dh_install $(foreach lib,$(EXTRADRIVERS),--exclude=$(lib)) --exclude LCDd.conf -plcdproc