vdr/vdradmin/debian vdradmind.conf vdradmin.default vdradmin.init vdradmin.install changelog control dirs rules init.d vdradmin-default
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Thu, 27 May 2004 14:56:53 +0000
Update of /cvsroot/pkg-vdr-dvb/vdr/vdradmin/debian
In directory haydn:/tmp/cvs-serv17571/vdr/vdradmin/debian
Modified Files:
changelog control dirs rules
Added Files:
vdradmind.conf vdradmin.default vdradmin.init vdradmin.install
Removed Files:
init.d vdradmin-default
Log Message:
use dpatch, cleanup...
--- NEW FILE: vdradmin.install ---
lib/ usr/share/vdradmin/
template/ usr/share/vdradmin/
vdradmind.pl usr/bin/
debian/vdradmind.conf etc/vdradmin/
Index: changelog
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdradmin/debian/changelog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- changelog 26 May 2004 23:51:23 -0000 1.5
+++ changelog 27 May 2004 14:56:51 -0000 1.6
@@ -3,6 +3,8 @@
* Thomas Schmidt:
- New upstream version
- Added a correct watch-file
+ - Use dpatch
+ - Cleaned up debian/rules (use dh_install...)
-- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Thu, 27 May 2004 01:11:07 +0200
--- NEW FILE: vdradmin.init ---
#! /bin/sh
#
#
# Init-script for vdradmin, created by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
#
#
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/bin/vdradmind.pl
NAME=vdradmin
DESC="VDR Webadministration interface"
test -x $DAEMON || exit 0
# Include vdradmin defaults if available
if [ -f /etc/default/vdradmin ] ; then
. /etc/default/vdradmin
fi
test "$ENABLED" != "0" || exit 0
set -e
case "$1" in
start)
echo -n "Starting $DESC: "
$DAEMON $DAEMON_OPTS > /dev/null 2>&1
echo "$NAME."
;;
stop)
echo -n "Stopping $DESC: "
$DAEMON --kill > /dev/null 2>&1
echo "$NAME."
;;
restart|force-reload)
echo -n "Restarting $DESC: "
$DAEMON --kill > /dev/null 2>&1
sleep 1
$DAEMON $DAEMON_OPTS > /dev/null 2>&1
echo "$NAME."
;;
*)
N=/etc/init.d/$NAME
echo "Usage: $N {start|stop|restart|force-reload}" >&2
exit 1
;;
esac
exit 0
Index: rules
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdradmin/debian/rules,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- rules 21 Apr 2004 19:56:21 -0000 1.1.1.1
+++ rules 27 May 2004 14:56:51 -0000 1.2
@@ -6,8 +6,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
-
+# include dpatch stuff
+include /usr/share/dpatch/dpatch.make
CFLAGS = -Wall -g
@@ -20,13 +20,14 @@
INSTALL_PROGRAM += -s
endif
-clean:
+clean: clean-patched unpatch
+
+clean-patched:
dh_testdir
dh_testroot
dh_clean --exclude ./template/Deutsch/tv.html.orig
-build:
- # nothing to do
+build: patch-stamp
install:
dh_testdir
@@ -34,13 +35,6 @@
dh_clean -k --exclude ./template/Deutsch/tv.html.orig
dh_installdirs
- # Add here commands to install the package into debian/vdradmin.
- cp -a $(CURDIR)/lib $(CURDIR)/debian/vdradmin/usr/share/vdradmin/
- cp -a $(CURDIR)/template $(CURDIR)/debian/vdradmin/usr/share/vdradmin/
- cp $(CURDIR)/vdradmind.pl $(CURDIR)/debian/vdradmin/usr/bin/
- cp $(CURDIR)/vdradmind.conf $(CURDIR)/debian/vdradmin/etc/vdradmin/
- cp $(CURDIR)/debian/vdradmin-default $(CURDIR)/debian/vdradmin/etc/default/vdradmin
-
# Build architecture-independent files here.
binary-indep: install
dh_testdir
@@ -48,15 +42,13 @@
dh_installchangelogs
dh_installdocs
dh_installexamples
-# dh_install
-# dh_installdebconf
+ dh_install
dh_installinit
dh_installman
dh_link
dh_compress
dh_fixperms
dh_perl
-# dh_makeshlibs
dh_installdeb
dh_shlibdeps
dh_gencontrol
@@ -64,4 +56,4 @@
dh_builddeb
binary: binary-indep
-.PHONY: build clean binary-indep install
+.PHONY: build clean binary-indep install patch unpatch
Index: control
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdradmin/debian/control,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- control 22 May 2004 22:05:14 -0000 1.3
+++ control 27 May 2004 14:56:51 -0000 1.4
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
Uploaders: Andreas Mueller <amu@tr.debian.net>
-Build-Depends-Indep: debhelper (>= 4.0.0)
+Build-Depends-Indep: debhelper (>= 4.0.0), dpatch
Standards-Version: 3.6.1
Package: vdradmin
--- init.d DELETED ---
--- NEW FILE: vdradmin.default ---
# Defaults for vdradmin initscript
# sourced by /etc/init.d/vdradmin
# installed at /etc/default/vdradmin by the maintainer scripts
#
# This is a POSIX shell fragment
#
# Should vdradmin's init-script be enabled?
#############################################################
# ATTENTION! YOU SHOULD MODIFY /etc/vdradmin/vdradmind.conf #
# before enabling this, because the default config uses a #
# really simple default username/password (linvdr/linvdr) #
#############################################################
ENABLED="0"
# Additional options that are passed to the Daemon.
DAEMON_OPTS=""
--- NEW FILE: vdradmind.conf ---
VDR_HOST = localhost
LOGLEVEL = 17
TM_PRIORITY = 99
AT_PRIORITY = 99
TM_LIFETIME = 99
AT_TIMEOUT = 10
AT_FUNC = 0
GUEST_ACCOUNT = 0
CACHE_TIMEOUT = 5
SERVERPORT = 8001
PASSWORD = linvdr
AT_LIFETIME = 99
MOD_GZIP = 1
TM_MARGIN_END = 10
USERNAME = linvdr
LOGFILE = vdradmind.log
RECORDINGS = 1
LANGUAGE = English
CACHE_LASTUPDATE = 0
TM_MARGIN_BEGIN = 10
LOGINPAGE = 0
VDR_PORT = 2001
--- vdradmin-default DELETED ---
Index: dirs
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdradmin/debian/dirs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- dirs 21 Apr 2004 19:56:21 -0000 1.1.1.1
+++ dirs 27 May 2004 14:56:51 -0000 1.2
@@ -1,4 +1,3 @@
-etc/default
etc/vdradmin
usr/bin
usr/share/vdradmin/lib