aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog50
-rwxr-xr-xdebian/config7
-rw-r--r--debian/control19
-rw-r--r--debian/copyright47
-rw-r--r--debian/dirs4
-rw-r--r--debian/docs5
-rw-r--r--debian/init.d52
-rw-r--r--debian/postinst5
-rwxr-xr-xdebian/rules49
-rw-r--r--debian/templates7
-rw-r--r--debian/watch2
11 files changed, 138 insertions, 109 deletions
diff --git a/debian/changelog b/debian/changelog
index ab55325..1f8ff98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,50 @@
-lcd4linux (0.9.11-1) unstable; urgency=low
+lcd4linux (0.10.0+cvs20060825-1) unstable; urgency=medium
- * Initial Release.
+ * New Maintainer!
+ * Dropping old maintainer in agreement with nobse@debian.org.
+ Thanks for your work so far, nobse!
+ * urgency medium because of release critical bugs
+ * new upstream snapshot
+ * now supporting USB2LCD
+ * don't update config.{sub,guess} in clean target automatically
+ * new target ``update-config-sub-guess'' to update config.{sub,guess}
+ * Acking NMU, Thanks Steinar! (Closes: #374682)
+ * Bug fix: "FTBFS: undefined reference to many X functions", thanks to
+ Eric Dorland. The problem was in driver.m4 (Closes: #381606).
+ * Bug fix: "Please stop Build-Depending on automake", thanks to Eric
+ Dorland (Closes: #381812).
+ * Don't ship /etc/lcd4linux.conf anymore. Please install and customize
+ it yourself using /usr/share/doc/lcd4linux.conf.sample as template
- -- Samuel Mimram <samuel.mimram@ens-lyon.org> Wed, 10 Dec 2003 11:48:10 +0100
+ -- Reinhard Tartler <siretart@tauware.de> Sun, 27 Aug 2006 11:12:18 +0200
+
+lcd4linux (0.10.0+cvs20051015-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build-depend on libxt-dev, to make sure configure detects X; fixes FTBFS.
+ (Closes: #374682)
+
+ -- Steinar H. Gunderson <sesse@debian.org> Thu, 6 Jul 2006 18:10:58 +0200
+
+lcd4linux (0.10.0+cvs20051015-3) unstable; urgency=low
+
+ * Use libgd2-noxpm-dev instead libgd2-xpm-dev in build-dependencies.
+ (closes: #335834)
+ * Built against libmysqlclient15-dev instead libmysqlclient14-dev.
+ (closes: #343770)
+
+ -- Norbert Tretkowski <nobse@debian.org> Tue, 21 Feb 2006 22:42:57 +0100
+
+lcd4linux (0.10.0+cvs20051015-2) unstable; urgency=low
+
+ * Added libmysqlclient-dev, python-dev, libx11-dev, libncurses5-dev, libusb-dev
+ and libgd2-xpm-dev to build-dependencies.
+
+ -- Norbert Tretkowski <nobse@debian.org> Mon, 24 Oct 2005 21:09:48 +0200
+
+lcd4linux (0.10.0+cvs20051015-1) unstable; urgency=low
+
+ * Initial release. (closes: #334114)
+
+ -- Norbert Tretkowski <nobse@debian.org> Sun, 16 Oct 2005 20:20:42 +0200
diff --git a/debian/config b/debian/config
deleted file mode 100755
index d84a76e..0000000
--- a/debian/config
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-db_input high lcd4linux/conf
-db_go
diff --git a/debian/control b/debian/control
index 2df0149..99c878a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,13 @@
Source: lcd4linux
Section: utils
-Priority: extra
-Maintainer: Samuel Mimram <samuel.mimram@ens-lyon.org>
-Build-Depends: debhelper (>= 4.0.0), xlibs-dev
-Standards-Version: 3.6.0
+Priority: optional
+Maintainer: Reinhard Tartler <siretart@tauware.de>
+Build-Depends: debhelper (>= 4.0.0), libmysqlclient15-dev, python-dev, libx11-dev, libncurses5-dev, libusb-dev, libgd2-noxpm-dev, libxt-dev
+Standards-Version: 3.6.2
Package: lcd4linux
Architecture: any
-Depends: xlibs, ${shlibs:Depends}
-Description: Display informations on an external liquid crystal display
- Grab informations from the kernel and some subsystems and display it on an
- external liquid crystal display.
- .
- The use of special sequences (tokens) gives you full control of the layout,
- and therefore lcd4linux is completely independent from the display size.
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Grabs information and displays it on an external lcd
+ Small program that grabs information from the kernel and some subsystems
+ and displays it on an external liquid crystal display.
diff --git a/debian/copyright b/debian/copyright
index 4202cf9..939c9e4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,39 +1,24 @@
-This package was debianized by Samuel Mimram <samuel.mimram@ens-lyon.org> on
-Wed, 10 Dec 2003 11:48:10 +0100.
+This package was debianized by Norbert Tretkowski <nobse@debian.org> on
+Sun, 16 Oct 2005 20:20:42 +0200.
-It was downloaded from http://lcd4linux.sourceforge.net/
-
-Upstream Author: Michael Reinelt <reinelt@eunet.at>
-
-Copyright: 1992, 1999-2004
-The LCD4Linux Development Team <lcd4linux-devel@lists.sourceforge.net>
-Michael Reinelt <reinelt@eunet.at>
-Herbert Rosmanith <herp@wildsau.idv.uni-linz.ac.at>
-Leopold Tötsch <lt@toetsch.at>
-Axel Ehnert <axel@ehnert.net>
-Andrew Ip <aip@cwlinux.com>
-Robin Adams, Adams IT Services <info@usblcd.de>
-Xavier Vello <xavier66@free.fr>
-Martin Hejl (martin@hejl.de)
-Jesse Brook Kovach <jkovach@wam.umd.edu>
-Nico Wallmeier <nico.wallmeier@post.rwth-aachen.de>
-Luis Correia <lfcorreia@users.sf.net>
-Patrick Schemitz <schemitz@ekp.physik.uni-karlsruhe.de>
-Andy Baxter <andy@earthsong.free-online.co.uk>
-Thomas Siedentopf <thom-s@gmx.net>
-Markus Keil <markus_keil@t-online.de>
-Samuel Mimram <samuel.mimram@ens-lyon.fr>
-Mark Morley <morley@Camosun.BC.CA>
+It was downloaded from http://ssl.bulix.org/projects/lcd4linux/
+Copyright Holder: Michael Reinelt <reinelt@eunet.at>
This program is 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; version 2 dated June, 1991.
-
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in '/usr/share/common-licenses/GPL'.
+
+You should have received a copy of the GNU General Public License with
+the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+if not, write to the Free Software Foundation, Inc., 51 Franklin St,
+Fifth Floor, Boston, MA 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU General Public
+License, version 2, can be found in /usr/share/common-licenses/GPL-2.
diff --git a/debian/dirs b/debian/dirs
index d1dc25f..44ac6eb 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,4 +1,2 @@
-usr/bin
-usr/lib
etc
-etc/init.d
+usr/sbin
diff --git a/debian/docs b/debian/docs
index ff25d8a..304ef8c 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,9 +1,6 @@
FAQ
NEWS
README
-README.Drivers
README.KDE
-README.Rows
-README.Tokens
TODO
-lcd4linux.conf.sample
+lcd4linux.conf.sample \ No newline at end of file
diff --git a/debian/init.d b/debian/init.d
index 207e038..b18176b 100644
--- a/debian/init.d
+++ b/debian/init.d
@@ -1,45 +1,73 @@
#! /bin/sh
#
-# lcd4linux
+# skeleton example file to build /etc/init.d/ scripts.
+# This file should be used to construct scripts for /etc/init.d.
#
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/lcd4linux
+# Written by Miquel van Smoorenburg <miquels@cistron.nl>.
+# Modified for Debian
+# by Ian Murdock <imurdock@gnu.ai.mit.edu>.
+#
+# Version: @(#)skeleton 1.9 26-Feb-2001 miquels@cistron.nl
+#
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/lcd4linux
NAME=lcd4linux
DESC=lcd4linux
-test -f $DAEMON || exit 0
+test -x $DAEMON || exit 0
+
+# Include lcd4linux defaults if available
+if [ -f /etc/default/lcd4linux ] ; then
+ . /etc/default/lcd4linux
+fi
set -e
case "$1" in
start)
echo -n "Starting $DESC: "
+ chmod 600 /etc/lcd4linux.conf
start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
- --exec $DAEMON
+ --exec $DAEMON -- $DAEMON_OPTS
echo "$NAME."
;;
stop)
echo -n "Stopping $DESC: "
- start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/$NAME.pid \
+ start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
--exec $DAEMON
echo "$NAME."
;;
- reload)
- start-stop-daemon --stop --signal 1 --quiet --pidfile \
- /var/run/$NAME.pid --exec $DAEMON
- ;;
+ #reload)
+ #
+ # If the daemon can reload its config files on the fly
+ # for example by sending it SIGHUP, do it here.
+ #
+ # If the daemon responds to changes in its config file
+ # directly anyway, make this a do-nothing entry.
+ #
+ # echo "Reloading $DESC configuration files."
+ # start-stop-daemon --stop --signal 1 --quiet --pidfile \
+ # /var/run/$NAME.pid --exec $DAEMON
+ #;;
restart|force-reload)
+ #
+ # If the "reload" option is implemented, move the "force-reload"
+ # option to the "reload" entry above. If not, "force-reload" is
+ # just the same as "restart".
+ #
echo -n "Restarting $DESC: "
start-stop-daemon --stop --quiet --pidfile \
/var/run/$NAME.pid --exec $DAEMON
sleep 1
start-stop-daemon --start --quiet --pidfile \
- /var/run/$NAME.pid --exec $DAEMON
+ /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
echo "$NAME."
;;
*)
N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+ # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+ echo "Usage: $N {start|stop|restart|force-reload}" >&2
exit 1
;;
esac
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index 284d07d..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh -e
-
-. /usr/share/debconf/confmodule
-
-#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 4edc889..c2121c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,20 @@
#!/usr/bin/make -f
# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DESTDIR=$(CURDIR)/debian/lcd4linux
-
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# FOR AUTOCONF 2.52 AND NEWER ONLY
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+ confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
CFLAGS = -Wall -g
@@ -21,29 +23,35 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
else
CFLAGS += -O2
endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
config.status: configure
dh_testdir
- CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr
+ ./configure $(confflags) \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ --bindir=/usr/sbin \
+ --with-python
+
+# call this target to update config.sub and config.guess
+# need autotools-dev installed
+update-config-sub-guess:
+ -test -r /usr/share/misc/config.sub && \
+ cp -f /usr/share/misc/config.sub config.sub
+ -test -r /usr/share/misc/config.guess && \
+ cp -f /usr/share/misc/config.guess config.guess
build: build-stamp
-
build-stamp: config.status
dh_testdir
$(MAKE)
- #/usr/bin/docbook-to-man debian/lcd4linux.sgml > lcd4linux.1
touch build-stamp
clean:
dh_testdir
dh_testroot
-
rm -f build-stamp
-$(MAKE) distclean
-
dh_clean
install: build
@@ -51,31 +59,24 @@ install: build
dh_testroot
dh_clean -k
dh_installdirs
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/lcd4linux
- $(MAKE) install DESTDIR=$(DESTDIR)
- mkdir -p $(DESTDIR)/etc
- cp lcd4linux.conf.sample $(DESTDIR)/etc/lcd4linux.conf
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+binary-indep:
+# No arch independent things to do here...
-# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
dh_installchangelogs ChangeLog
dh_installdocs
-# dh_installexamples
+ dh_installexamples
dh_install
- dh_installdebconf
dh_installinit
-# dh_installman
+ dh_installman
dh_link
dh_strip
dh_compress
dh_fixperms
- dh_makeshlibs
dh_installdeb
dh_shlibdeps
dh_gencontrol
diff --git a/debian/templates b/debian/templates
deleted file mode 100644
index 239b075..0000000
--- a/debian/templates
+++ /dev/null
@@ -1,7 +0,0 @@
-Template: lcd4linux/conf
-Type: note
-Description: You must configure lcd4linux
- By default, lcd4linux is not configured. You MUST configure it by editing
- the /etc/lcd4linux.conf file, which holds all configuration.
- .
- Then, restart lcd4linux with /etc/init.d/lcd4linux restart
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 932ab07..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=2
-http://prdownloads.sourceforge.net/lcd4linux/lcd4linux-(.*[0-9])\.tgz debian uupdate