r1806 - in vdr/vdr-plugin-remote/trunk/debian: . patches po
Thomas Günther
tom-guest at costa.debian.org
Tue Jan 24 22:14:24 UTC 2006
Author: tom-guest
Date: 2006-01-24 22:14:23 +0000 (Tue, 24 Jan 2006)
New Revision: 1806
Added:
vdr/vdr-plugin-remote/trunk/debian/compat
vdr/vdr-plugin-remote/trunk/debian/patches/
vdr/vdr-plugin-remote/trunk/debian/patches/00list
vdr/vdr-plugin-remote/trunk/debian/patches/91_remote-0.3.4-fix-mplayer-crash.dpatch
Removed:
vdr/vdr-plugin-remote/trunk/debian/postrm
Modified:
vdr/vdr-plugin-remote/trunk/debian/changelog
vdr/vdr-plugin-remote/trunk/debian/config
vdr/vdr-plugin-remote/trunk/debian/control
vdr/vdr-plugin-remote/trunk/debian/copyright
vdr/vdr-plugin-remote/trunk/debian/install
vdr/vdr-plugin-remote/trunk/debian/po/cs.po
vdr/vdr-plugin-remote/trunk/debian/po/de.po
vdr/vdr-plugin-remote/trunk/debian/po/fr.po
vdr/vdr-plugin-remote/trunk/debian/po/sv.po
vdr/vdr-plugin-remote/trunk/debian/po/templates.pot
vdr/vdr-plugin-remote/trunk/debian/postinst
vdr/vdr-plugin-remote/trunk/debian/rules
vdr/vdr-plugin-remote/trunk/debian/templates
Log:
Added 91_remote-0.3.4-fix-mplayer-crash.dpatch, Added debconf note error-evdev
Modified: vdr/vdr-plugin-remote/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-remote/trunk/debian/changelog 2006-01-22 11:58:11 UTC (rev 1805)
+++ vdr/vdr-plugin-remote/trunk/debian/changelog 2006-01-24 22:14:23 UTC (rev 1806)
@@ -2,6 +2,13 @@
* Thomas Schmidt <tschmidt at debian.org>
- Build-Depend on vdr-dev (>=1.3.39-1)
+ * Thomas Günther <tom at toms-cafe.de>
+ - Added 91_remote-0.3.4-fix-mplayer-crash.dpatch
+ - Added dpatch to Build-Depends
+ - Removed debian/postrm (it's automatically included by dh_installdebconf)
+ - Added debconf note error-evdev
+ - Using debian/compat now
+ - Shortened debian/copyright
-- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Sun, 22 Jan 2006 12:48:56 +0100
Added: vdr/vdr-plugin-remote/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-remote/trunk/debian/compat 2006-01-22 11:58:11 UTC (rev 1805)
+++ vdr/vdr-plugin-remote/trunk/debian/compat 2006-01-24 22:14:23 UTC (rev 1806)
@@ -0,0 +1 @@
+4
Modified: vdr/vdr-plugin-remote/trunk/debian/config
===================================================================
--- vdr/vdr-plugin-remote/trunk/debian/config 2006-01-22 11:58:11 UTC (rev 1805)
+++ vdr/vdr-plugin-remote/trunk/debian/config 2006-01-24 22:14:23 UTC (rev 1806)
@@ -1,13 +1,13 @@
#!/bin/sh
-if ! cat /proc/bus/input/handlers 2>/dev/null | grep -q evdev
+if ! cat /proc/bus/input/handlers 2>/dev/null | grep -q evdev
then
- if ! lsmod | grep -q ^evdev
- then
- . /usr/share/debconf/confmodule
+ if ! lsmod | grep -q ^evdev
+ then
+ . /usr/share/debconf/confmodule
- # ask module install question:
- db_input high vdr-plugin-remote/install_evdev || false
- db_go
- fi
+ # ask module install question:
+ db_input high vdr-plugin-remote/install_evdev || false
+ db_go
+ fi
fi
Modified: vdr/vdr-plugin-remote/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-remote/trunk/debian/control 2006-01-22 11:58:11 UTC (rev 1805)
+++ vdr/vdr-plugin-remote/trunk/debian/control 2006-01-24 22:14:23 UTC (rev 1806)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Uploaders: Peter Siering <ps at ctmagazin.de>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>= 4.1.16), vdr-dev (>=1.3.39-1)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>=1.3.39-1), dpatch
Standards-Version: 3.6.2
Package: vdr-plugin-remote
Modified: vdr/vdr-plugin-remote/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-remote/trunk/debian/copyright 2006-01-22 11:58:11 UTC (rev 1805)
+++ vdr/vdr-plugin-remote/trunk/debian/copyright 2006-01-24 22:14:23 UTC (rev 1806)
@@ -1,26 +1,11 @@
This package was debianized by Peter Siering <ps at ctmagazin.de> on
Mon, 15 Sep 2003 22:00:00 +0200.
-It was downloaded from http://endriss.escape.bei.t-online.de/vdr
+It was downloaded from http://www.escape-edv.de/endriss/vdr
Upstream Author: Oliver Endriss <o.endriss at gmx.de>
Copyright:
- 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; 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
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
- see /usr/share/common-licenses/GPL
-
+It may be redistributed under the terms of the GNU GPL, Version 2
+found on Debian systems in the file /usr/share/common-licenses/GPL .
Modified: vdr/vdr-plugin-remote/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-remote/trunk/debian/install 2006-01-22 11:58:11 UTC (rev 1805)
+++ vdr/vdr-plugin-remote/trunk/debian/install 2006-01-24 22:14:23 UTC (rev 1806)
@@ -1,2 +1,2 @@
-libvdr-remote.so.* usr/lib/vdr/plugins/
-debian/plugin.remote.conf etc/vdr/plugins/
+libvdr-remote.so.* usr/lib/vdr/plugins/
+debian/plugin.remote.conf etc/vdr/plugins/
Added: vdr/vdr-plugin-remote/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-remote/trunk/debian/patches/00list 2006-01-22 11:58:11 UTC (rev 1805)
+++ vdr/vdr-plugin-remote/trunk/debian/patches/00list 2006-01-24 22:14:23 UTC (rev 1806)
@@ -0,0 +1 @@
+91_remote-0.3.4-fix-mplayer-crash
Added: vdr/vdr-plugin-remote/trunk/debian/patches/91_remote-0.3.4-fix-mplayer-crash.dpatch
===================================================================
--- vdr/vdr-plugin-remote/trunk/debian/patches/91_remote-0.3.4-fix-mplayer-crash.dpatch 2006-01-22 11:58:11 UTC (rev 1805)
+++ vdr/vdr-plugin-remote/trunk/debian/patches/91_remote-0.3.4-fix-mplayer-crash.dpatch 2006-01-24 22:14:23 UTC (rev 1806)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 91_remote-0.3.4-fix-mplayer-crash.dpatch by Thomas Günther <tom at toms-cafe.de>, maverick-me at vdrportal.de
+## http://vdrportal.de/board/thread.php?postid=414764#post414764
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes crash with mplayer plugin.
+
+ at DPATCH@
+--- remote-0.3.4/ttystatus.c Mon Jan 9 19:50:12 2006
++++ remote/ttystatus.c Tue Jan 24 00:23:23 2006
+@@ -139,6 +139,8 @@
+ void cTtyStatus::Recording(const cDevice *Device,
+ const char *Name, const char *FileName, bool On)
+ {
++ if (FileName == NULL && Name == NULL) return;
++ if (FileName == NULL) FileName = Name;
+ char *s1 = strdup(FileName);
+
+ if (s1)
+@@ -184,6 +186,8 @@
+ void cTtyStatus::Replaying(const cControl *Control,
+ const char *Name, const char *FileName, bool On)
+ {
++ if (FileName == NULL && Name == NULL) return;
++ if (FileName == NULL) FileName = Name;
+ char *s1 = strdup(FileName);
+
+ if (s1)
Modified: vdr/vdr-plugin-remote/trunk/debian/po/cs.po
===================================================================
--- vdr/vdr-plugin-remote/trunk/debian/po/cs.po 2006-01-22 11:58:11 UTC (rev 1805)
+++ vdr/vdr-plugin-remote/trunk/debian/po/cs.po 2006-01-24 22:14:23 UTC (rev 1806)
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: vdr-plugin-remote\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-13 12:54+0100\n"
+"POT-Creation-Date: 2006-01-21 18:09+0100\n"
"PO-Revision-Date: 2005-06-18 13:36+0200\n"
"Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -24,14 +24,14 @@
"Content-Transfer-Encoding: 8bit\n"
#. Type: boolean
-#. description
-#: ../templates:3
+#. Description
+#: ../templates:4
msgid "Try to automatically load the evdev module?"
msgstr "Pokusit se o automatické nahránà modulu evdev?"
#. Type: boolean
-#. description
-#: ../templates:3
+#. Description
+#: ../templates:4
msgid ""
"Enable this, if you want a setup which automatically loads the evdev module, "
"needed by the remote-plugin."
@@ -40,8 +40,8 @@
"modul evdev vyžadovaný vdr modulem remote-plugin."
#. Type: boolean
-#. description
-#: ../templates:3
+#. Description
+#: ../templates:4
msgid ""
"This script will try to load the module evdev and, if this is successful, "
"it will add a new entry for evdev to your /etc/modules."
@@ -50,8 +50,8 @@
"nový záznam do souboru /etc/modules."
#. Type: boolean
-#. description
-#: ../templates:3
+#. Description
+#: ../templates:4
msgid ""
"If this fails, your kernel maybe does not have evdev support, and you will "
"need to rebuild your kernel with the CONFIG_INPUT_EVDEV option enabled."
@@ -59,3 +59,17 @@
"Pokud nahrávánà selže, znamená to, že vaše jádro asi neobsahuje podporu pro "
"evdev a budete jej muset sestavit znovu, tentokráte s povolenou volbou "
"CONFIG_INPUT_EVDEV."
+
+#. Type: note
+#. Description
+#: ../templates:16
+msgid "Error loading evdev module"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:16
+msgid ""
+"The evdev module could not be loaded, probably your kernel has builtin-"
+"support for evdev, or your kernel is missing evdev support."
+msgstr ""
Modified: vdr/vdr-plugin-remote/trunk/debian/po/de.po
===================================================================
--- vdr/vdr-plugin-remote/trunk/debian/po/de.po 2006-01-22 11:58:11 UTC (rev 1805)
+++ vdr/vdr-plugin-remote/trunk/debian/po/de.po 2006-01-24 22:14:23 UTC (rev 1806)
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-13 12:54+0100\n"
+"POT-Creation-Date: 2006-01-21 18:09+0100\n"
"PO-Revision-Date: 2004-11-26 00:13+0100\n"
"Last-Translator: Jens Nachtigall <nachtigall at web.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -25,14 +25,14 @@
"X-Generator: KBabel 1.9.1\n"
#. Type: boolean
-#. description
-#: ../templates:3
+#. Description
+#: ../templates:4
msgid "Try to automatically load the evdev module?"
msgstr "Soll versucht werden, das Kernel-Modul evdev automatisch zu laden?"
#. Type: boolean
-#. description
-#: ../templates:3
+#. Description
+#: ../templates:4
msgid ""
"Enable this, if you want a setup which automatically loads the evdev module, "
"needed by the remote-plugin."
@@ -41,8 +41,8 @@
"benötigte Kernel-Modul evdev automatisch geladen wird."
#. Type: boolean
-#. description
-#: ../templates:3
+#. Description
+#: ../templates:4
msgid ""
"This script will try to load the module evdev and, if this is successful, "
"it will add a new entry for evdev to your /etc/modules."
@@ -51,8 +51,8 @@
"so wird das Skript für evdev einen neuen Eintrag zur /etc/modules hinzufügen."
#. Type: boolean
-#. description
-#: ../templates:3
+#. Description
+#: ../templates:4
msgid ""
"If this fails, your kernel maybe does not have evdev support, and you will "
"need to rebuild your kernel with the CONFIG_INPUT_EVDEV option enabled."
@@ -60,3 +60,17 @@
"Sollte es misslingen, so könnte das bedeuten, dass Ihr Kernel kein evdev "
"unterstützt. Sie werden Ihren Kernel dann neu bauen müssen, wobei die Option "
"CONFIG_INPUT_EVDEV gesetzt sein muss."
+
+#. Type: note
+#. Description
+#: ../templates:16
+msgid "Error loading evdev module"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:16
+msgid ""
+"The evdev module could not be loaded, probably your kernel has builtin-"
+"support for evdev, or your kernel is missing evdev support."
+msgstr ""
Modified: vdr/vdr-plugin-remote/trunk/debian/po/fr.po
===================================================================
--- vdr/vdr-plugin-remote/trunk/debian/po/fr.po 2006-01-22 11:58:11 UTC (rev 1805)
+++ vdr/vdr-plugin-remote/trunk/debian/po/fr.po 2006-01-24 22:14:23 UTC (rev 1806)
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: vdr-plugin-remote\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-13 12:54+0100\n"
+"POT-Creation-Date: 2006-01-21 18:09+0100\n"
"PO-Revision-Date: 2004-11-06 22:49+0000\n"
"Last-Translator: Yves Rütschlé <l10n at rutschle.net>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -24,14 +24,14 @@
"Content-Transfer-Encoding: 8bit\n"
#. Type: boolean
-#. description
-#: ../templates:3
+#. Description
+#: ../templates:4
msgid "Try to automatically load the evdev module?"
msgstr "Faut-il charger automatiquement le module « evdev » ?"
#. Type: boolean
-#. description
-#: ../templates:3
+#. Description
+#: ../templates:4
msgid ""
"Enable this, if you want a setup which automatically loads the evdev module, "
"needed by the remote-plugin."
@@ -40,8 +40,8 @@
"chargé automatiquement. Ce module est requis par remote-plugin."
#. Type: boolean
-#. description
-#: ../templates:3
+#. Description
+#: ../templates:4
msgid ""
"This script will try to load the module evdev and, if this is successful, "
"it will add a new entry for evdev to your /etc/modules."
@@ -50,8 +50,8 @@
"réussit, une nouvelle ligne sera ajoutée à /etc/modules."
#. Type: boolean
-#. description
-#: ../templates:3
+#. Description
+#: ../templates:4
msgid ""
"If this fails, your kernel maybe does not have evdev support, and you will "
"need to rebuild your kernel with the CONFIG_INPUT_EVDEV option enabled."
@@ -59,3 +59,17 @@
"Si le chargement échoue, cela signifie que la gestion de « evdev » n'est pas "
"incluse dans votre noyau. Vous devrez le recompiler en activant l'option "
"CONFIG_INPUT_EVDEV."
+
+#. Type: note
+#. Description
+#: ../templates:16
+msgid "Error loading evdev module"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:16
+msgid ""
+"The evdev module could not be loaded, probably your kernel has builtin-"
+"support for evdev, or your kernel is missing evdev support."
+msgstr ""
Modified: vdr/vdr-plugin-remote/trunk/debian/po/sv.po
===================================================================
--- vdr/vdr-plugin-remote/trunk/debian/po/sv.po 2006-01-22 11:58:11 UTC (rev 1805)
+++ vdr/vdr-plugin-remote/trunk/debian/po/sv.po 2006-01-24 22:14:23 UTC (rev 1806)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: vdr-plugin-remote 0.3.3-11\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-13 12:54+0100\n"
+"POT-Creation-Date: 2006-01-21 18:09+0100\n"
"PO-Revision-Date: 2005-09-29 02:50-0700\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <sv at li.org>\n"
@@ -23,14 +23,14 @@
"Content-Transfer-Encoding: 8bit\n"
#. Type: boolean
-#. description
-#: ../templates:3
+#. Description
+#: ../templates:4
msgid "Try to automatically load the evdev module?"
msgstr "Försöka att automatiskt ladda evdev-modulen?"
#. Type: boolean
-#. description
-#: ../templates:3
+#. Description
+#: ../templates:4
msgid ""
"Enable this, if you want a setup which automatically loads the evdev module, "
"needed by the remote-plugin."
@@ -39,8 +39,8 @@
"modulen som behövs av remote-pluginet."
#. Type: boolean
-#. description
-#: ../templates:3
+#. Description
+#: ../templates:4
msgid ""
"This script will try to load the module evdev and, if this is successful, "
"it will add a new entry for evdev to your /etc/modules."
@@ -49,11 +49,25 @@
"även att lägga till modulen till din /etc/modules."
#. Type: boolean
-#. description
-#: ../templates:3
+#. Description
+#: ../templates:4
msgid ""
"If this fails, your kernel maybe does not have evdev support, and you will "
"need to rebuild your kernel with the CONFIG_INPUT_EVDEV option enabled."
msgstr ""
"Om detta misslyckas kan detta bero på att din kernel saknar stöd för evdev "
"och att du behöver bygga om din kernel med CONFIG_INPUT_EVDEV aktiverad."
+
+#. Type: note
+#. Description
+#: ../templates:16
+msgid "Error loading evdev module"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:16
+msgid ""
+"The evdev module could not be loaded, probably your kernel has builtin-"
+"support for evdev, or your kernel is missing evdev support."
+msgstr ""
Modified: vdr/vdr-plugin-remote/trunk/debian/po/templates.pot
===================================================================
--- vdr/vdr-plugin-remote/trunk/debian/po/templates.pot 2006-01-22 11:58:11 UTC (rev 1805)
+++ vdr/vdr-plugin-remote/trunk/debian/po/templates.pot 2006-01-24 22:14:23 UTC (rev 1806)
@@ -16,7 +16,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-13 12:54+0100\n"
+"POT-Creation-Date: 2006-01-21 18:09+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -25,31 +25,45 @@
"Content-Transfer-Encoding: 8bit\n"
#. Type: boolean
-#. description
-#: ../templates:3
+#. Description
+#: ../templates:4
msgid "Try to automatically load the evdev module?"
msgstr ""
#. Type: boolean
-#. description
-#: ../templates:3
+#. Description
+#: ../templates:4
msgid ""
"Enable this, if you want a setup which automatically loads the evdev module, "
"needed by the remote-plugin."
msgstr ""
#. Type: boolean
-#. description
-#: ../templates:3
+#. Description
+#: ../templates:4
msgid ""
"This script will try to load the module evdev and, if this is successful, "
"it will add a new entry for evdev to your /etc/modules."
msgstr ""
#. Type: boolean
-#. description
-#: ../templates:3
+#. Description
+#: ../templates:4
msgid ""
"If this fails, your kernel maybe does not have evdev support, and you will "
"need to rebuild your kernel with the CONFIG_INPUT_EVDEV option enabled."
msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:16
+msgid "Error loading evdev module"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:16
+msgid ""
+"The evdev module could not be loaded, probably your kernel has builtin-"
+"support for evdev, or your kernel is missing evdev support."
+msgstr ""
Modified: vdr/vdr-plugin-remote/trunk/debian/postinst
===================================================================
--- vdr/vdr-plugin-remote/trunk/debian/postinst 2006-01-22 11:58:11 UTC (rev 1805)
+++ vdr/vdr-plugin-remote/trunk/debian/postinst 2006-01-24 22:14:23 UTC (rev 1806)
@@ -1,65 +1,26 @@
#! /bin/sh
-# postinst script for vdr-plugin-remote
-#
-# see: dh_installdeb(1)
-
set -e
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-# quoting from the policy:
-# Any necessary prompting should almost always be confined to the
-# post-installation script, and should be protected with a conditional
-# so that unnecessary prompting doesn't happen if a package's
-# installation fails and the `postinst' is called with `abort-upgrade',
-# `abort-remove' or `abort-deconfigure'.
+# confmodule makes sure that config is called
+. /usr/share/debconf/confmodule
-case "$1" in
- configure)
+if [ "$1" = "configure" ]
+then
+ db_get vdr-plugin-remote/install_evdev
+ if [ $RET = "true" ]
+ then
+ # Try to load the evdev-module
+ if modprobe evdev
+ then
+ if ! cat /etc/modules | grep -q ^evdev
+ then
+ echo "evdev" >> /etc/modules
+ fi
+ else
+ db_input high vdr-plugin-remote/error-evdev || true
+ db_go || true
+ fi
+ fi
+fi
- . /usr/share/debconf/confmodule
-
- db_get vdr-plugin-remote/install_evdev
-
- if [ $RET = "true" ]
- then
- # Try to load the evdev-module
-
- if modprobe evdev
- then
- if ! cat /etc/modules | grep -q ^evdev
- then
- echo "evdev" >> /etc/modules
- fi
- else
- echo "The evdev-module could not be loaded, probably your kernel \
- has builtin-support for evdev, or your kernel is missing \
- evdev-support"
- fi
- fi
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
#DEBHELPER#
-
-exit 0
Deleted: vdr/vdr-plugin-remote/trunk/debian/postrm
===================================================================
--- vdr/vdr-plugin-remote/trunk/debian/postrm 2006-01-22 11:58:11 UTC (rev 1805)
+++ vdr/vdr-plugin-remote/trunk/debian/postrm 2006-01-24 22:14:23 UTC (rev 1806)
@@ -1,42 +0,0 @@
-#! /bin/sh
-# postrm script for vdr-plugin-remote
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postrm> `remove'
-# * <postrm> `purge'
-# * <old-postrm> `upgrade' <new-version>
-# * <new-postrm> `failed-upgrade' <old-version>
-# * <new-postrm> `abort-install'
-# * <new-postrm> `abort-install' <old-version>
-# * <new-postrm> `abort-upgrade' <old-version>
-# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- purge)
- # purge debconf database
- . /usr/share/debconf/confmodule
- db_purge || echo "WARNING: db_purge failed"
- ;;
-
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Modified: vdr/vdr-plugin-remote/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-remote/trunk/debian/rules 2006-01-22 11:58:11 UTC (rev 1805)
+++ vdr/vdr-plugin-remote/trunk/debian/rules 2006-01-24 22:14:23 UTC (rev 1806)
@@ -5,9 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
endif
@@ -15,15 +12,14 @@
INSTALL_PROGRAM += -s
endif
-# Set VDR=vdr or VDR=vdrdevel
+# Set VDR=vdr or VDR=vdrdevel - vdrdevel always uses dpatch
VDR=$(shell dh_listpackages | grep "^vdr.*-" | head -n 1 | sed -e "s/-.*//")
+ifeq ($(VDR), vdrdevel)
+ DPATCH=yes
+endif
-PACKAGE=$(VDR)-plugin-remote
-VDRDIR=/usr/include/$(VDR)
-DVBDIR=/usr/include
-
# To use dpatch uncomment the following line and set Build-Depends to dpatch
-#DPATCH=yes
+DPATCH=yes
ifdef DPATCH
include /usr/share/dpatch/dpatch.make
@@ -41,7 +37,7 @@
build: build-stamp
build-stamp: configure-stamp
dh_testdir
- $(MAKE) all DVBDIR=$(DVBDIR) VDRDIR=$(VDRDIR) LIBDIR=.
+ $(MAKE) all DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=.
touch build-stamp
clean: clean-patched unpatch
@@ -51,10 +47,10 @@
rm -f build-stamp configure-stamp
-$(MAKE) -o .dependencies clean
rm -f libvdr-*.so.*
-
+
# Update debconf-templates:
debconf-updatepo
-
+
dh_clean
install: build
@@ -72,15 +68,27 @@
binary-arch: build install
dh_testdir
dh_testroot
- dh_installdebconf
+ dh_installdebconf
dh_installdocs
dh_installexamples
+# dh_installmenu
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+# dh_installman
+# dh_installinfo
+# dh_undocumented
dh_installchangelogs HISTORY
dh_link
dh_strip
dh_compress
dh_fixperms
+# dh_makeshlibs
dh_installdeb
+# dh_perl
dh_shlibdeps
/usr/lib/$(VDR)-dev/patchlevel.sh subst
/usr/lib/$(VDR)-dev/dependencies.sh
Modified: vdr/vdr-plugin-remote/trunk/debian/templates
===================================================================
--- vdr/vdr-plugin-remote/trunk/debian/templates 2006-01-22 11:58:11 UTC (rev 1805)
+++ vdr/vdr-plugin-remote/trunk/debian/templates 2006-01-24 22:14:23 UTC (rev 1806)
@@ -1,6 +1,7 @@
Template: vdr-plugin-remote/install_evdev
Type: boolean
-_description: Try to automatically load the evdev module?
+Default: false
+_Description: Try to automatically load the evdev module?
Enable this, if you want a setup which automatically loads the evdev module,
needed by the remote-plugin.
.
@@ -9,4 +10,9 @@
.
If this fails, your kernel maybe does not have evdev support, and you will
need to rebuild your kernel with the CONFIG_INPUT_EVDEV option enabled.
-Default: false
+
+Template: vdr-plugin-remote/error-evdev
+Type: note
+_Description: Error loading evdev module
+ The evdev module could not be loaded, probably your kernel has builtin-support
+ for evdev, or your kernel is missing evdev support.
More information about the pkg-vdr-dvb-changes
mailing list