r3861 - in vdr: vdr/trunk/debian vdr/trunk/debian/plugin-template vdr-plugin-advchctrl/trunk/debian vdr-plugin-alcd/trunk/debian vdr-plugin-autosort/trunk/debian vdr-plugin-bitstreamout/trunk/debian vdr-plugin-calc/trunk/debian vdr-plugin-cdda/trunk/debian vdr-plugin-channelscan/trunk/debian vdr-plugin-chanorg/trunk/debian vdr-plugin-console/trunk/debian vdr-plugin-decruft/trunk/debian vdr-plugin-dvd/trunk/debian vdr-plugin-dxr3/trunk/debian vdr-plugin-eggtimer/trunk/debian vdr-plugin-epgsearch/trunk/debian vdr-plugin-extrecmenu/trunk/debian vdr-plugin-femon/trunk/debian vdr-plugin-ffnetdev/trunk/debian vdr-plugin-freecell/trunk/debian vdr-plugin-fussball/trunk/debian vdr-plugin-games/trunk/debian vdr-plugin-image/trunk/debian vdr-plugin-mlist/trunk/debian vdr-plugin-mp3/trunk/debian vdr-plugin-muggle/trunk/debian vdr-plugin-nordlichtsepg/trunk/debian vdr-plugin-osdteletext/trunk/debian vdr-plugin-osdtest256/trunk/debian vdr-plugin-playlist/trunk/debian vdr-plugin-prefermenu/trunk/debian vdr-plugin-radio/trunk/debian vdr-plugin-radiolist/trunk/debian vdr-plugin-recstatus/trunk/debian vdr-plugin-reelchannelscan/trunk/debian vdr-plugin-remote/trunk/debian vdr-plugin-remoteosd/trunk/debian vdr-plugin-rssreader/trunk/debian vdr-plugin-serial/trunk/debian vdr-plugin-skinsoppalusikka/trunk/debian vdr-plugin-softdevice/trunk/debian vdr-plugin-softplay/trunk/debian vdr-plugin-solitaire/trunk/debian vdr-plugin-spider/trunk/debian vdr-plugin-statusleds/trunk/debian vdr-plugin-streamdev/trunk/debian vdr-plugin-sudoku/trunk/debian vdr-plugin-svdrpext/trunk/debian vdr-plugin-svdrpservice/trunk/debian vdr-plugin-sysinfo/trunk/debian vdr-plugin-text2skin/trunk/debian vdr-plugin-timeline/trunk/debian vdr-plugin-vcd/trunk/debian vdr-plugin-vdrcd/trunk/debian vdr-plugin-wapd/trunk/debian vdr-plugin-weather/trunk/debian vdr-plugin-xine/trunk/debian vdr-plugin-xineliboutput/trunk/debian vdr-plugin-zaphistory/trunk/debian

Thomas Günther tom-guest at alioth.debian.org
Sat Jan 13 21:49:16 CET 2007


Author: tom-guest
Date: 2007-01-13 21:49:10 +0100 (Sat, 13 Jan 2007)
New Revision: 3861

Added:
   vdr/vdr/trunk/debian/make-special-vdr.sh
Removed:
   vdr/vdr/trunk/debian/make-special-vdr
Modified:
   vdr/vdr-plugin-advchctrl/trunk/debian/changelog
   vdr/vdr-plugin-advchctrl/trunk/debian/rules
   vdr/vdr-plugin-alcd/trunk/debian/changelog
   vdr/vdr-plugin-alcd/trunk/debian/rules
   vdr/vdr-plugin-autosort/trunk/debian/changelog
   vdr/vdr-plugin-autosort/trunk/debian/rules
   vdr/vdr-plugin-bitstreamout/trunk/debian/changelog
   vdr/vdr-plugin-bitstreamout/trunk/debian/rules
   vdr/vdr-plugin-calc/trunk/debian/changelog
   vdr/vdr-plugin-calc/trunk/debian/rules
   vdr/vdr-plugin-cdda/trunk/debian/changelog
   vdr/vdr-plugin-cdda/trunk/debian/rules
   vdr/vdr-plugin-channelscan/trunk/debian/changelog
   vdr/vdr-plugin-channelscan/trunk/debian/rules
   vdr/vdr-plugin-chanorg/trunk/debian/changelog
   vdr/vdr-plugin-chanorg/trunk/debian/rules
   vdr/vdr-plugin-console/trunk/debian/changelog
   vdr/vdr-plugin-console/trunk/debian/rules
   vdr/vdr-plugin-decruft/trunk/debian/changelog
   vdr/vdr-plugin-decruft/trunk/debian/rules
   vdr/vdr-plugin-dvd/trunk/debian/changelog
   vdr/vdr-plugin-dvd/trunk/debian/rules
   vdr/vdr-plugin-dxr3/trunk/debian/changelog
   vdr/vdr-plugin-dxr3/trunk/debian/rules
   vdr/vdr-plugin-eggtimer/trunk/debian/changelog
   vdr/vdr-plugin-eggtimer/trunk/debian/rules
   vdr/vdr-plugin-epgsearch/trunk/debian/changelog
   vdr/vdr-plugin-epgsearch/trunk/debian/rules
   vdr/vdr-plugin-extrecmenu/trunk/debian/changelog
   vdr/vdr-plugin-extrecmenu/trunk/debian/rules
   vdr/vdr-plugin-femon/trunk/debian/changelog
   vdr/vdr-plugin-femon/trunk/debian/rules
   vdr/vdr-plugin-ffnetdev/trunk/debian/changelog
   vdr/vdr-plugin-ffnetdev/trunk/debian/rules
   vdr/vdr-plugin-freecell/trunk/debian/changelog
   vdr/vdr-plugin-freecell/trunk/debian/rules
   vdr/vdr-plugin-fussball/trunk/debian/changelog
   vdr/vdr-plugin-fussball/trunk/debian/rules
   vdr/vdr-plugin-games/trunk/debian/changelog
   vdr/vdr-plugin-games/trunk/debian/rules
   vdr/vdr-plugin-image/trunk/debian/changelog
   vdr/vdr-plugin-image/trunk/debian/rules
   vdr/vdr-plugin-mlist/trunk/debian/changelog
   vdr/vdr-plugin-mlist/trunk/debian/rules
   vdr/vdr-plugin-mp3/trunk/debian/changelog
   vdr/vdr-plugin-mp3/trunk/debian/rules
   vdr/vdr-plugin-muggle/trunk/debian/changelog
   vdr/vdr-plugin-muggle/trunk/debian/rules
   vdr/vdr-plugin-nordlichtsepg/trunk/debian/changelog
   vdr/vdr-plugin-nordlichtsepg/trunk/debian/rules
   vdr/vdr-plugin-osdteletext/trunk/debian/changelog
   vdr/vdr-plugin-osdteletext/trunk/debian/rules
   vdr/vdr-plugin-osdtest256/trunk/debian/changelog
   vdr/vdr-plugin-osdtest256/trunk/debian/rules
   vdr/vdr-plugin-playlist/trunk/debian/changelog
   vdr/vdr-plugin-playlist/trunk/debian/rules
   vdr/vdr-plugin-prefermenu/trunk/debian/changelog
   vdr/vdr-plugin-prefermenu/trunk/debian/rules
   vdr/vdr-plugin-radio/trunk/debian/changelog
   vdr/vdr-plugin-radio/trunk/debian/rules
   vdr/vdr-plugin-radiolist/trunk/debian/changelog
   vdr/vdr-plugin-radiolist/trunk/debian/rules
   vdr/vdr-plugin-recstatus/trunk/debian/changelog
   vdr/vdr-plugin-recstatus/trunk/debian/rules
   vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog
   vdr/vdr-plugin-reelchannelscan/trunk/debian/rules
   vdr/vdr-plugin-remote/trunk/debian/changelog
   vdr/vdr-plugin-remote/trunk/debian/rules
   vdr/vdr-plugin-remoteosd/trunk/debian/changelog
   vdr/vdr-plugin-remoteosd/trunk/debian/rules
   vdr/vdr-plugin-rssreader/trunk/debian/changelog
   vdr/vdr-plugin-rssreader/trunk/debian/rules
   vdr/vdr-plugin-serial/trunk/debian/changelog
   vdr/vdr-plugin-serial/trunk/debian/rules
   vdr/vdr-plugin-skinsoppalusikka/trunk/debian/changelog
   vdr/vdr-plugin-skinsoppalusikka/trunk/debian/rules
   vdr/vdr-plugin-softdevice/trunk/debian/changelog
   vdr/vdr-plugin-softdevice/trunk/debian/rules
   vdr/vdr-plugin-softplay/trunk/debian/changelog
   vdr/vdr-plugin-softplay/trunk/debian/rules
   vdr/vdr-plugin-solitaire/trunk/debian/changelog
   vdr/vdr-plugin-solitaire/trunk/debian/rules
   vdr/vdr-plugin-spider/trunk/debian/changelog
   vdr/vdr-plugin-spider/trunk/debian/rules
   vdr/vdr-plugin-statusleds/trunk/debian/changelog
   vdr/vdr-plugin-statusleds/trunk/debian/rules
   vdr/vdr-plugin-streamdev/trunk/debian/changelog
   vdr/vdr-plugin-streamdev/trunk/debian/rules
   vdr/vdr-plugin-sudoku/trunk/debian/changelog
   vdr/vdr-plugin-sudoku/trunk/debian/rules
   vdr/vdr-plugin-svdrpext/trunk/debian/changelog
   vdr/vdr-plugin-svdrpext/trunk/debian/rules
   vdr/vdr-plugin-svdrpservice/trunk/debian/changelog
   vdr/vdr-plugin-svdrpservice/trunk/debian/rules
   vdr/vdr-plugin-sysinfo/trunk/debian/changelog
   vdr/vdr-plugin-sysinfo/trunk/debian/rules
   vdr/vdr-plugin-text2skin/trunk/debian/changelog
   vdr/vdr-plugin-text2skin/trunk/debian/rules
   vdr/vdr-plugin-timeline/trunk/debian/changelog
   vdr/vdr-plugin-timeline/trunk/debian/rules
   vdr/vdr-plugin-vcd/trunk/debian/changelog
   vdr/vdr-plugin-vcd/trunk/debian/rules
   vdr/vdr-plugin-vdrcd/trunk/debian/changelog
   vdr/vdr-plugin-vdrcd/trunk/debian/rules
   vdr/vdr-plugin-wapd/trunk/debian/changelog
   vdr/vdr-plugin-wapd/trunk/debian/rules
   vdr/vdr-plugin-weather/trunk/debian/changelog
   vdr/vdr-plugin-weather/trunk/debian/rules
   vdr/vdr-plugin-xine/trunk/debian/changelog
   vdr/vdr-plugin-xine/trunk/debian/rules
   vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
   vdr/vdr-plugin-xineliboutput/trunk/debian/rules
   vdr/vdr-plugin-zaphistory/trunk/debian/changelog
   vdr/vdr-plugin-zaphistory/trunk/debian/rules
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/dependencies.sh
   vdr/vdr/trunk/debian/patchlevel.sh
   vdr/vdr/trunk/debian/plugin-template/rules
   vdr/vdr/trunk/debian/rules
   vdr/vdr/trunk/debian/vdr-dev.install
Log:
Renamed make-special-vdr to make-special-vdr.sh, changed directory of vdr-dev scripts to /usr/share/vdr-dev

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -16,9 +16,11 @@
 
   [ Thomas Günther ]
   * Replaced VDRdevel adaptions in debian/rules and plugin-template/rules
-    with make-special-vdr
-  * Install make-special-vdr into vdr-dev package - plugins can use this to
+    with make-special-vdr.sh
+  * Install make-special-vdr.sh into vdr-dev package - plugins can use this to
     build plugin packages for special vdr packages
+  * Changed installation directory of patchlevel.sh and dependencies.sh from
+    /usr/lib/vdr-dev to /usr/share/vdr-dev
 
   [ Thomas Schmidt ]
   * New upstream release

Modified: vdr/vdr/trunk/debian/dependencies.sh
===================================================================
--- vdr/vdr/trunk/debian/dependencies.sh	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr/trunk/debian/dependencies.sh	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,16 @@
-#!/bin/sh
+# dependencies.sh - vdr plugins depend on the current vdr version
+#
+# This script is called in debian/rules of vdr plugins:
+#    sh /usr/share/vdr-dev/dependencies.sh
+#
+# It sets a dependency to the current vdr version for all binary packages of the
+# plugin package. The current vdr version is the version of the vdr-dev package
+# used to compile the plugin package.
+#
+# This script sets the substitution variable "vdr:Depends" which is used in the
+# debian/control file of vdr plugins, e.g.:
+#    Depends: ${vdr:Depends}
+
 set -e
 
 FIRST_VERSION=$(dpkg -s vdr-dev | awk '/Version/ { print $2 }')

Deleted: vdr/vdr/trunk/debian/make-special-vdr
===================================================================
--- vdr/vdr/trunk/debian/make-special-vdr	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr/trunk/debian/make-special-vdr	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,740 +0,0 @@
-#! /bin/sh
-
-# make-special-vdr by Thomas Günther <tom at toms-cafe.de>
-#
-# Description:
-#
-# Make a special variation of the vdr package or of a vdr plugin package.
-# These debian packages could be installed parallel to the standard vdr debian
-# packages in order to test new development versions of vdr. Between the
-# standard and the special variation of vdr can be switched via command menu.
-#
-# Standard and special packages uses the same recordings directory. Therefore,
-# user and group are 'vdr' for the special packages too. The suffix of recording
-# files remains also '.vdr'.
-#
-# Necessary adaptions in the debian source packages:
-#
-# The special packages are built from the same source packages as the standard
-# packages. The make-special-vdr script is called from "debian/rules" instead of
-# the normal make. In the first line of "debian/rules" "#! /usr/bin/make -f" has
-# to be replaced with "#! /bin/sh debian/make-special-vdr" for the vdr package
-# respectively with "#! /bin/sh /usr/lib/vdr-dev/make-special-vdr" for a
-# vdr plugin package.
-#
-# Usage:
-#
-# The name of the special package is specified by the environment variable
-# SPECIAL_VDR_SUFFIX. E.g., the vdrdevel variation is built with
-#    SPECIAL_VDR_SUFFIX=devel fakeroot dpkg-buildpackage -us -uc -tc
-#
-# The plugin packages don't include make-special-vdr themselves. Instead they
-# use /usr/lib/vdr-dev/make-special-vdr installed by the vdr-dev package.
-#
-# If the installed make-special-vdr version of vdr-dev is to old to build the
-# special variation of a particular vdr plugin package, a newer version of
-# make-special-vdr can be specified by the environment variable
-# MAKE_SPECIAL_VDR, e.g.
-#    export MAKE_SPECIAL_VDR=/usr/lib/vdrdevel-dev/make-special-vdr
-#    SPECIAL_VDR_SUFFIX=devel fakeroot dpkg-buildpackage -us -uc -tc
-#
-# In order to build the standard vdr packages the environment variable
-# SPECIAL_VDR_SUFFIX has to be empty or not set.
-#
-# Implementation details:
-#
-# If SPECIAL_VDR_SUFFIX is set and not empty make-special-vdr does following
-# steps:
-#    1. Create the subdirectory ".save".
-#    2. Copy all files and directories into ".save".
-#    3. Substitute "vdr" in the contents of all files (recursively) except for
-#       "debian/changelog", "debian/make-special-vdr", all files in
-#       "debian/plugin-template", and all files in ".save".
-#    4. Substitute "vdr" in the names of all files (recursively) except for all
-#       files in ".save".
-#    5. Make special changes for certain packages.
-#    6. Call the normal make.
-# Points 1-5 are performed only if the subdirectory ".save" not exist.
-# If "debian/rules" is called with the argument "clean" all original files and
-# directories are restored form ".save" and the subdirectory ".save" is removed.
-#
-# History:
-#
-#    2004-06-12 - 2005-09-29: Version 0.0.0 - 0.1.4 (vdrdevel patch)
-#
-#    2006-??-??: Version 0.2
-#       - Converted vdrdevel patch to make-special-vdr
-
-
-main()
-{
-    echo "$0" "$@" \
-         "SPECIAL_VDR_SUFFIX='${SPECIAL_VDR_SUFFIX}'" \
-         "MAKE_SPECIAL_VDR='${MAKE_SPECIAL_VDR}'" \
-         "NO_CHECKBUILDDEPS='${NO_CHECKBUILDDEPS}'"
-    if [ -z "${SPECIAL_VDR_SUFFIX}" ]; then
-        # Original make if SPECIAL_VDR_SUFFIX is not set
-        /usr/bin/make -f "$@"
-    elif [ "${MAKE_SPECIAL_VDR}" ]; then
-        # Call newer version of make-special-vdr provided by MAKE_SPECIAL_VDR
-        MAKE_SPECIAL_VDR= /bin/sh "${MAKE_SPECIAL_VDR}" "$@"
-    elif ! check_clean_arg "$@"; then
-        # Make special variation: prepare the package before make
-        prepare
-        /usr/bin/make -f "$@"
-    else
-        # Clean prepared package
-        cleanup
-    fi
-}
-
-SAVE_DIR=".save"
-
-prepare()
-{
-    if [ ! -e "${SAVE_DIR}" ]; then
-        echo "prepare: save all in subdirectory ${SAVE_DIR}"
-        /bin/mkdir "${SAVE_DIR}"
-        /bin/cp -r $(/usr/bin/find ./ -mindepth 1 -maxdepth 1 \
-                                   -not -name "${SAVE_DIR}") "${SAVE_DIR}"
-
-        # Create tempfile
-        TMP_FILE=$(/bin/mktemp)
-
-        # Execute substitutions
-        prepare_common
-        if check_package "vdr${SPECIAL_VDR_SUFFIX}"; then
-            prepare_vdr
-        fi
-        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-analogtv"; then
-            prepare_analogtv
-        fi
-        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-graphtft"; then
-            prepare_graphtft
-        fi
-        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-mediamvp"; then
-            prepare_mediamvp
-        fi
-        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-pin"; then
-            prepare_pin
-        fi
-        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-rssreader"; then
-            prepare_rssreader
-        fi
-        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-softdevice"; then
-            prepare_softdevice
-        fi
-        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-sudoku"; then
-            prepare_sudoku
-        fi
-        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-text2skin"; then
-            prepare_text2skin
-        fi
-        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-vdr${SPECIAL_VDR_SUFFIX}c"; then
-            prepare_vdrc
-        fi
-        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-vdr${SPECIAL_VDR_SUFFIX}cd"; then
-            prepare_vdrcd
-        fi
-        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-vdr${SPECIAL_VDR_SUFFIX}rip"; then
-            prepare_vdrrip
-        fi
-        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-vompserver"; then
-            prepare_vompserver
-        fi
-        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-wapd"; then
-            prepare_wapd
-        fi
-        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-xine"; then
-            prepare_xine
-        fi
-        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-xineliboutput"; then
-            prepare_xineliboutput
-        fi
-
-        # Check build dependencies after substitutions
-        if [ -z "${NO_CHECKBUILDDEPS}" ]; then
-            if ! /usr/bin/dpkg-checkbuilddeps; then
-                echo >&2 "Build dependencies/conflicts unsatisfied; aborting."
-                echo >&2 "(Set NO_CHECKBUILDDEPS environment variable to override.)"
-                exit 3
-            fi
-        fi
-
-        # Remove tempfile
-        /bin/rm -f "${TMP_FILE}"
-    fi
-}
-
-prepare_common()
-{
-    echo "prepare_common: substitute vdr -> vdr${SPECIAL_VDR_SUFFIX}"
-    SUBST="s.vdr.vdr${SPECIAL_VDR_SUFFIX}.g; \
-           s.make-special-vdr${SPECIAL_VDR_SUFFIX}.make-special-vdr.g; \
-           s./bin/sh /usr/lib/vdr${SPECIAL_VDR_SUFFIX}-dev/make-special-vdr./bin/sh /usr/lib/vdr-dev/make-special-vdr.g; \
-           s.Source: vdr${SPECIAL_VDR_SUFFIX}.Source: vdr.g; \
-           s.Source: vdr-plugin-vdr${SPECIAL_VDR_SUFFIX}c.Source: vdr-plugin-vdrc.g; \
-           s.Source: vdr-plugin-vdr${SPECIAL_VDR_SUFFIX}rip.Source: vdr-plugin-vdrrip.g; \
-           s.Source: vdr-plugin-svdr${SPECIAL_VDR_SUFFIX}p.Source: vdr-plugin-svdrp.g; \
-           s.pkg-vdr${SPECIAL_VDR_SUFFIX}-dvb-devel.pkg-vdr-dvb-devel.g; \
-           s.vdr${SPECIAL_VDR_SUFFIX}admin.vdradmin.g; \
-           s.vdr${SPECIAL_VDR_SUFFIX}-xxv.vdr-xxv.g; \
-           s.vdr${SPECIAL_VDR_SUFFIX}sync.vdrsync.g; \
-           s.vdr${SPECIAL_VDR_SUFFIX}-xpmlogos.vdr-xpmlogos.g; \
-           s.vdr${SPECIAL_VDR_SUFFIX}-genindex.vdr-genindex.g; \
-           s.USER=vdr${SPECIAL_VDR_SUFFIX}.USER=vdr.g; \
-           s.GROUP=vdr${SPECIAL_VDR_SUFFIX}.GROUP=vdr.g; \
-           s.chown vdr${SPECIAL_VDR_SUFFIX}:vdr${SPECIAL_VDR_SUFFIX}.chown vdr:vdr.g; \
-           s.chown -R vdr${SPECIAL_VDR_SUFFIX}:vdr${SPECIAL_VDR_SUFFIX}.chown -R vdr:vdr.g; \
-           s/resume%s%s\.vdr${SPECIAL_VDR_SUFFIX}/resume%s%s.vdr/g; \
-           s/summary\.vdr${SPECIAL_VDR_SUFFIX}/summary.vdr/g; \
-           s/info\.vdr${SPECIAL_VDR_SUFFIX}/info.vdr/g; \
-           s/marks\.vdr${SPECIAL_VDR_SUFFIX}/marks.vdr/g; \
-           s/index\.vdr${SPECIAL_VDR_SUFFIX}/index.vdr/g; \
-           s/%03d\.vdr${SPECIAL_VDR_SUFFIX}/%03d.vdr/g; \
-           s/dvd\.vdr${SPECIAL_VDR_SUFFIX}/dvd.vdr/g; \
-           s/001\.vdr${SPECIAL_VDR_SUFFIX}/001.vdr/g; \
-           s/002\.vdr${SPECIAL_VDR_SUFFIX}/002.vdr/g; \
-           s/index_%02d\.vdr${SPECIAL_VDR_SUFFIX}/index_%02d.vdr/g; \
-           s/\[0-9\]\.vdr${SPECIAL_VDR_SUFFIX}/[0-9].vdr/g; \
-           s/index_archive\.vdr${SPECIAL_VDR_SUFFIX}/index_archive.vdr/g; \
-           s/{TRACK_ON_DVD}\.vdr${SPECIAL_VDR_SUFFIX}/{TRACK_ON_DVD}.vdr/g; \
-           s/size_cut\.vdr${SPECIAL_VDR_SUFFIX}/size_cut.vdr/g; \
-           s/size\.vdr${SPECIAL_VDR_SUFFIX}/size.vdr/g; \
-           s/strcasecmp(pos, \".vdr${SPECIAL_VDR_SUFFIX}\")/strcasecmp(pos, \".vdr\")/g; \
-           s/input_vdr${SPECIAL_VDR_SUFFIX}\.h/input_vdr.h/g; \
-           s/dvdr${SPECIAL_VDR_SUFFIX}ecord/dvdrecord/g; \
-           s/dvdr${SPECIAL_VDR_SUFFIX}ead/dvdread/g"
-    FILES=$(/usr/bin/find ./ -type f -not -regex "./${SAVE_DIR}/.*" \
-                          -not -regex "./debian/changelog" \
-                          -not -regex "./debian/make-special-vdr" \
-                          -not -regex "./debian/plugin-template/.*")
-    set -f; OLD_IFS="${IFS}"; IFS="
-"; set -- ${FILES}; IFS="${OLD_IFS}"; set +f
-    subst_in_files "${SUBST}" "$@"
-    rename_files   "${SUBST}" "$@"
-}
-
-prepare_vdr()
-{
-    echo "prepare_vdr: prevent conflict to standard vdr"
-    if /bin/grep -q "var/lib/video" "debian/vdr${SPECIAL_VDR_SUFFIX}.links"; then
-        /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
---- debian/vdr${SPECIAL_VDR_SUFFIX}.links
-+++ debian/vdr${SPECIAL_VDR_SUFFIX}.links
-@@ -15 +14,0 @@
--var/lib/video.00  var/lib/video
---- debian/vdr${SPECIAL_VDR_SUFFIX}.postinst
-+++ debian/vdr${SPECIAL_VDR_SUFFIX}.postinst
-@@ -1,1 +1,6 @@
--#!/bin/sh
-+#!/bin/sh
-+if [ "$1" = "configure" ]; then
-+    if [ ! -e /var/lib/video ] ; then
-+        /bin/ln -s /var/lib/video.00 /var/lib/video
-+    fi
-+fi
-EOF
-    fi
-
-    echo "prepare_vdr: add debconf question which vdr variation should start automatically"
-    if [ ! -e "debian/vdr${SPECIAL_VDR_SUFFIX}.config" ]; then
-        /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
---- debian/rules
-+++ debian/rules
-@@ -130 +130 @@
--	dh_installinit -a
-+	dh_installinit -a --noscripts
---- debian/vdr${SPECIAL_VDR_SUFFIX}.config  1970-01-01 00:00:00.000000000 +0000
-+++ debian/vdr${SPECIAL_VDR_SUFFIX}.config
-@@ -0,0 +1,6 @@
-+#! /bin/sh
-+set -e
-+. /usr/share/debconf/confmodule
-+db_version 2.0
-+db_input high vdr${SPECIAL_VDR_SUFFIX}/autostart || true
-+db_go || true
---- debian/vdr${SPECIAL_VDR_SUFFIX}.postinst
-+++ debian/vdr${SPECIAL_VDR_SUFFIX}.postinst
-@@ -1,1 +1,21 @@
--#!/bin/sh
-+#!/bin/sh
-+. /usr/share/debconf/confmodule
-+if [ "$1" = "configure" ]; then
-+    db_get vdr${SPECIAL_VDR_SUFFIX}/autostart
-+    if [ "$RET" = "true" ]; then
-+        START="vdr${SPECIAL_VDR_SUFFIX}"
-+        STOP="vdr"
-+    else
-+        START="vdr"
-+        STOP="vdr${SPECIAL_VDR_SUFFIX}"
-+    fi
-+    if [ -x "/etc/init.d/$STOP" ]; then
-+        /etc/init.d/$STOP stop
-+        update-rc.d -f $STOP remove >/dev/null
-+    fi
-+    if [ -x "/etc/init.d/$START" ]; then
-+        /etc/init.d/$START stop
-+        update-rc.d $START defaults >/dev/null
-+        /etc/init.d/$START start
-+    fi
-+fi
---- debian/vdr${SPECIAL_VDR_SUFFIX}.prerm  1970-01-01 00:00:00.000000000 +0000
-+++ debian/vdr${SPECIAL_VDR_SUFFIX}.prerm
-@@ -0,0 +1,16 @@
-+#! /bin/sh
-+set -e
-+if [ -x "/etc/init.d/vdr${SPECIAL_VDR_SUFFIX}" ]; then
-+    /etc/init.d/vdr${SPECIAL_VDR_SUFFIX} stop
-+fi
-+if [ "$1" = "remove" ] ; then
-+    if [ -x "/etc/init.d/vdr${SPECIAL_VDR_SUFFIX}" ]; then
-+        update-rc.d -f vdr${SPECIAL_VDR_SUFFIX} remove >/dev/null
-+    fi
-+    if [ -x "/etc/init.d/vdr" ]; then
-+        /etc/init.d/vdr stop
-+        update-rc.d vdr defaults >/dev/null
-+        /etc/init.d/vdr start
-+    fi
-+fi
-+#DEBHELPER#
---- debian/vdr${SPECIAL_VDR_SUFFIX}.templates  1970-01-01 00:00:00.000000000 +0000
-+++ debian/vdr${SPECIAL_VDR_SUFFIX}.templates
-@@ -0,0 +1,7 @@
-+Template: vdr${SPECIAL_VDR_SUFFIX}/autostart
-+Type: boolean
-+Default: false
-+Description: Start vdr${SPECIAL_VDR_SUFFIX} automatically instead of vdr?
-+ On system startup either vdr${SPECIAL_VDR_SUFFIX} or vdr will be started in daemon mode.
-+ By selecting this, you choose vdr${SPECIAL_VDR_SUFFIX} instead of vdr.
-+ But you can manually switch between vdr${SPECIAL_VDR_SUFFIX} and vdr by menu commands.
-EOF
-    else
-        /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
---- debian/rules
-+++ debian/rules
-@@ -123 +123 @@
--	dh_installinit -a
-+	dh_installinit -a --noscripts
---- debian/vdr${SPECIAL_VDR_SUFFIX}.config
-+++ debian/vdr${SPECIAL_VDR_SUFFIX}.config
-@@ -24,1 +24,3 @@
--exit 0
-+db_input high vdr${SPECIAL_VDR_SUFFIX}/autostart || true
-+db_go || true
-+exit 0
---- debian/vdr${SPECIAL_VDR_SUFFIX}.postinst
-+++ debian/vdr${SPECIAL_VDR_SUFFIX}.postinst
-@@ -1,1 +1,21 @@
--#! /bin/sh
-+#! /bin/sh
-+. /usr/share/debconf/confmodule
-+if [ "$1" = "configure" ]; then
-+    db_get vdr${SPECIAL_VDR_SUFFIX}/autostart
-+    if [ "$RET" = "true" ]; then
-+        START="vdr${SPECIAL_VDR_SUFFIX}"
-+        STOP="vdr"
-+    else
-+        START="vdr"
-+        STOP="vdr${SPECIAL_VDR_SUFFIX}"
-+    fi
-+    if [ -x "/etc/init.d/$STOP" ]; then
-+        /etc/init.d/$STOP stop
-+        update-rc.d -f $STOP remove >/dev/null
-+    fi
-+    if [ -x "/etc/init.d/$START" ]; then
-+        /etc/init.d/$START stop
-+        update-rc.d $START defaults >/dev/null
-+        /etc/init.d/$START start
-+    fi
-+fi
---- debian/vdr${SPECIAL_VDR_SUFFIX}.prerm
-+++ debian/vdr${SPECIAL_VDR_SUFFIX}.prerm
-@@ -1,1 +1,15 @@
--#! /bin/sh
-+#! /bin/sh
-+set -e
-+if [ -x "/etc/init.d/vdr${SPECIAL_VDR_SUFFIX}" ]; then
-+    /etc/init.d/vdr${SPECIAL_VDR_SUFFIX} stop
-+fi
-+if [ "$1" = "remove" ] ; then
-+    if [ -x "/etc/init.d/vdr${SPECIAL_VDR_SUFFIX}" ]; then
-+        update-rc.d -f vdr${SPECIAL_VDR_SUFFIX} remove >/dev/null
-+    fi
-+    if [ -x "/etc/init.d/vdr" ]; then
-+        /etc/init.d/vdr stop
-+        update-rc.d vdr defaults >/dev/null
-+        /etc/init.d/vdr start
-+    fi
-+fi
---- debian/vdr${SPECIAL_VDR_SUFFIX}.templates
-+++ debian/vdr${SPECIAL_VDR_SUFFIX}.templates
-@@ -0,0 +1,8 @@
-+Template: vdr${SPECIAL_VDR_SUFFIX}/autostart
-+Type: boolean
-+Default: false
-+Description: Start vdr${SPECIAL_VDR_SUFFIX} automatically instead of vdr?
-+ On system startup either vdr${SPECIAL_VDR_SUFFIX} or vdr will be started in daemon mode.
-+ By selecting this, you choose vdr${SPECIAL_VDR_SUFFIX} instead of vdr.
-+ But you can manually switch between vdr${SPECIAL_VDR_SUFFIX} and vdr by menu commands.
-+
-EOF
-    fi
-
-    # Add commands to switch between the vdr variations
-    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
---- debian/commands.switch-vdr.conf  1970-01-01 00:00:00.000000000 +0000
-+++ debian/commands.switch-vdr.conf
-@@ -0,0 +1 @@
-+VDR-Standardversion starten : echo "/usr/lib/vdr${SPECIAL_VDR_SUFFIX}/ctvdr${SPECIAL_VDR_SUFFIX}wrapper --stop && /bin/sleep 5 && /usr/lib/vdr/ctvdrwrapper --restart" | at now
---- debian/commands.switch-vdr${SPECIAL_VDR_SUFFIX}.conf  1970-01-01 00:00:00.000000000 +0000
-+++ debian/commands.switch-vdr${SPECIAL_VDR_SUFFIX}.conf
-@@ -0,0 +1 @@
-+VDR-Entwicklerversion vdr${SPECIAL_VDR_SUFFIX} starten : echo "/usr/lib/vdr/ctvdrwrapper --stop && /bin/sleep 5 && /usr/lib/vdr${SPECIAL_VDR_SUFFIX}/ctvdr${SPECIAL_VDR_SUFFIX}wrapper --restart" | at now
---- debian/vdr${SPECIAL_VDR_SUFFIX}.install
-+++ debian/vdr${SPECIAL_VDR_SUFFIX}.install
-@@ -0,0 +1,2 @@
-+debian/commands.switch-vdr.conf         usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/
-+debian/commands.switch-vdr${SPECIAL_VDR_SUFFIX}.conf         usr/share/vdr/command-hooks/
-EOF
-
-    echo "prepare_vdr: set links to use logos and addons from standard packages"
-    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
---- debian/commands-loader.sh
-+++ debian/commands-loader.sh
-@@ -33 +33 @@
--    cmds=( `find $CMDHOOKSDIR -maxdepth 1 -name "$cmdtype.*.conf" -printf "%f \n" | sed "s/$cmdtype\.\(.\+\)\.conf/\1/g"` )
-+    cmds=( `find $CMDHOOKSDIR -maxdepth 1 -name "$cmdtype.*.conf" -xtype f -printf "%f \n" | sed "s/$cmdtype\.\(.\+\)\.conf/\1/g"` )
---- debian/vdr${SPECIAL_VDR_SUFFIX}.links
-+++ debian/vdr${SPECIAL_VDR_SUFFIX}.links
-@@ -0,0 +1,21 @@
-+var/lib/vdr/logos                                         var/lib/vdr${SPECIAL_VDR_SUFFIX}/logos
-+usr/share/vdr/shutdown-hooks/S90.acpiwakeup               usr/share/vdr${SPECIAL_VDR_SUFFIX}/shutdown-hooks/S90.acpiwakeup
-+usr/share/vdr/command-hooks/reccmds.noad.conf             usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/reccmds.noad.conf
-+usr/share/vdr/recording-hooks/R10.noad                    usr/share/vdr${SPECIAL_VDR_SUFFIX}/recording-hooks/R10.noad
-+usr/share/vdr/shutdown-hooks/S50.noad                     usr/share/vdr${SPECIAL_VDR_SUFFIX}/shutdown-hooks/S50.noad
-+usr/share/vdr/shutdown-hooks/S90.nvram-wakeup             usr/share/vdr${SPECIAL_VDR_SUFFIX}/shutdown-hooks/S90.nvram-wakeup
-+usr/share/vdr/recording-hooks/R10.sharemarks              usr/share/vdr${SPECIAL_VDR_SUFFIX}/recording-hooks/R10.sharemarks
-+usr/share/vdr/command-hooks/reccmds.sharemarks.conf       usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/reccmds.sharemarks.conf
-+usr/share/vdr/command-hooks/reccmds.tosvcd.conf           usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/reccmds.tosvcd.conf
-+usr/share/vdr/shutdown-hooks/S50.tosvcd                   usr/share/vdr${SPECIAL_VDR_SUFFIX}/shutdown-hooks/S50.tosvcd
-+usr/share/vdr/command-hooks/commands.tvinfomerk2vdr.conf  usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/commands.tvinfomerk2vdr.conf
-+usr/share/vdr/command-hooks/commands.tvmovie2vdr.conf     usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/commands.tvmovie2vdr.conf
-+usr/share/vdr/command-hooks/commands.vdrconvert.conf      usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/commands.vdrconvert.conf
-+usr/share/vdr/command-hooks/reccmds.vdrconvert-divx.conf  usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/reccmds.vdrconvert-divx.conf
-+usr/share/vdr/command-hooks/reccmds.vdrconvert-svcd.conf  usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/reccmds.vdrconvert-svcd.conf
-+usr/share/vdr/command-hooks/reccmds.vdrconvert-vcd.conf   usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/reccmds.vdrconvert-vcd.conf
-+usr/share/vdr/command-hooks/reccmds.vdrconvert-mpeg.conf  usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/reccmds.vdrconvert-mpeg.conf
-+usr/share/vdr/command-hooks/reccmds.vdrconvert-mp3.conf   usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/reccmds.vdrconvert-mp3.conf
-+usr/share/vdr/command-hooks/reccmds.vdrconvert-ac3.conf   usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/reccmds.vdrconvert-ac3.conf
-+usr/share/vdr/command-hooks/reccmds.vdrconvert-dvd.conf   usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/reccmds.vdrconvert-dvd.conf
-+usr/share/vdr/shutdown-hooks/S50.vdrconvert               usr/share/vdr${SPECIAL_VDR_SUFFIX}/shutdown-hooks/S50.vdrconvert
-EOF
-
-    echo "prepare_vdr: add hint to the plugin debianizer script"
-    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' >> "debian/debianize-vdr${SPECIAL_VDR_SUFFIX}plugin"
-echo
-echo "To build vdr${SPECIAL_VDR_SUFFIX} plugin packages use the environment variable"
-echo "SPECIAL_VDR_SUFFIX, e.g.:"
-echo "    SPECIAL_VDR_SUFFIX=${SPECIAL_VDR_SUFFIX} fakeroot dpkg-buildpackage -us -uc -tc"
-echo "See /usr/lib/vdr-dev/make-special-vdr for details."
-EOF
-}
-
-prepare_analogtv()
-{
-    echo "prepare_analogtv: rename mp1e -> mp1e_vdr${SPECIAL_VDR_SUFFIX}"
-    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
---- player-analogtv.c
-+++ player-analogtv.c
-@@ -569 +569 @@
--                     sprintf(cmd, "mp1e -m %d %s%s%s%s -t %d -g %s -p %s -c %s -x %s -d %d -a %d -b %d -B %d%s -r %d,%d -s %s -S %2.1f -F %d%s%s%s%s -o %s &",
-+                     sprintf(cmd, "mp1e_vdr${SPECIAL_VDR_SUFFIX} -m %d %s%s%s%s -t %d -g %s -p %s -c %s -x %s -d %d -a %d -b %d -B %d%s -r %d,%d -s %s -S %2.1f -F %d%s%s%s%s -o %s &",
---- debian/rules
-+++ debian/rules
-@@ -73,1 +73,3 @@
--	dh_install
-+	dh_install
-+	cd debian/vdr${SPECIAL_VDR_SUFFIX}-plugin-analogtv/usr/bin; mv mp1e mp1e_vdr${SPECIAL_VDR_SUFFIX}
-+	cd debian/vdr${SPECIAL_VDR_SUFFIX}-plugin-analogtv/usr/share/man/man1; mv mp1e.1 mp1e_vdr${SPECIAL_VDR_SUFFIX}.1
-EOF
-}
-
-prepare_graphtft()
-{
-    echo "prepare_graphtft: correct device option vdr"
-    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
---- display.c
-+++ display.c
-@@ -96 +96 @@
--	pos = strstr(dev, "vdr${SPECIAL_VDR_SUFFIX}/");
-+	pos = strstr(dev, "vdr/");
---- graphtft.c
-+++ graphtft.c
-@@ -83 +83 @@
--	"                           /dev/fb0 or vdr${SPECIAL_VDR_SUFFIX}/1 \n"
-+	"                           /dev/fb0 or vdr/1 \n"
-@@ -113 +113 @@
--				}else if (strstr(optarg, "vdr${SPECIAL_VDR_SUFFIX}/")){
-+				}else if (strstr(optarg, "vdr/")){
-@@ -170,2 +170,2 @@
--				fprintf(stderr, "vdr${SPECIAL_VDR_SUFFIX}: graphtft -  try device: vdr${SPECIAL_VDR_SUFFIX}/%d !\n", i);
--				asprintf(&_dev, "vdr${SPECIAL_VDR_SUFFIX}/%d", i);
-+				fprintf(stderr, "vdr${SPECIAL_VDR_SUFFIX}: graphtft -  try device: vdr/%d !\n", i);
-+				asprintf(&_dev, "vdr/%d", i);
---- debian/plugin.graphtft.conf
-+++ debian/plugin.graphtft.conf
-@@ -5 +5 @@
--#-d vdr${SPECIAL_VDR_SUFFIX}/1
-+#-d vdr/1
-EOF
-
-    echo "prepare_graphtft: use skins from standard packages"
-    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
---- debian/control
-+++ debian/control
-@@ -12 +12 @@
--Depends: ${shlibs:Depends}, ${vdr${SPECIAL_VDR_SUFFIX}:Depends}, vdr${SPECIAL_VDR_SUFFIX}-tft-standard, ttf-bitstream-vera
-+Depends: ${shlibs:Depends}, ${vdr${SPECIAL_VDR_SUFFIX}:Depends}, vdr-tft-standard, ttf-bitstream-vera
---- debian/dirs
-+++ debian/dirs
-@@ -1 +0,0 @@
--var/lib/vdr${SPECIAL_VDR_SUFFIX}/plugins/graphTFT/themes
---- debian/links
-+++ debian/links
-@@ -0,0 +1 @@
-+var/lib/vdr/plugins/graphTFT/themes  var/lib/vdr${SPECIAL_VDR_SUFFIX}/plugins/graphTFT/themes
-EOF
-}
-
-prepare_mediamvp()
-{
-    echo "prepare_mediamvp: rename mvploader -> mvploader_vdr${SPECIAL_VDR_SUFFIX}"
-    SUBST="s.mvploader.mvploader_vdr${SPECIAL_VDR_SUFFIX}.g; \
-           s./usr/lib/mediamvp./usr/share/vdr${SPECIAL_VDR_SUFFIX}-plugin-mediamvp.g"
-    FILES=$(/usr/bin/find ./ -type f -not -regex "./${SAVE_DIR}/.*" \
-                          -not -regex "./debian/changelog")
-    subst_in_files "${SUBST}" ${FILES}
-    rename_files   "${SUBST}" ${FILES}
-    /bin/mv "debian/mvploader" "debian/mvploader_vdr${SPECIAL_VDR_SUFFIX}"
-}
-
-prepare_pin()
-{
-    echo "prepare_pin: rename fskcheck -> fskcheck_vdr${SPECIAL_VDR_SUFFIX}"
-    SUBST="s/fskcheck/fskcheck_vdr${SPECIAL_VDR_SUFFIX}/g"
-    FILES=$(/usr/bin/find ./ -type f -not -regex "./${SAVE_DIR}/.*" \
-                          -not -regex "./debian/changelog")
-    subst_in_files "${SUBST}" ${FILES}
-    rename_files   "${SUBST}" ${FILES}
-}
-
-prepare_rssreader()
-{
-    echo "prepare_rssreader: correct rss entry"
-    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
---- debian/rssreader.conf
-+++ debian/rssreader.conf
-@@ -15 +15 @@
--VDR Announcements   : http://www.netholic.com/extras/vdr${SPECIAL_VDR_SUFFIX}_announce_rss.php?num=10
-+VDR Announcements   : http://www.netholic.com/extras/vdr_announce_rss.php?num=10
-EOF
-}
-
-prepare_softdevice()
-{
-    echo "prepare_softdevice: ShmClient -> ShmClient_vdr${SPECIAL_VDR_SUFFIX}"
-    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
---- debian/rules
-+++ debian/rules
-@@ -54,1 +54,2 @@
--	dh_install
-+	dh_install
-+	cd debian/vdr${SPECIAL_VDR_SUFFIX}-plugin-softdevice/usr/bin; mv ShmClient ShmClient_vdr${SPECIAL_VDR_SUFFIX}
-EOF
-}
-
-prepare_sudoku()
-{
-    echo "prepare_sudoku: rename sudoku_generator -> sudoku_generator_vdr${SPECIAL_VDR_SUFFIX}"
-    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
---- debian/rules
-+++ debian/rules
-@@ -53,1 +53,2 @@
--	dh_install
-+	dh_install
-+	cd debian/vdr${SPECIAL_VDR_SUFFIX}-plugin-sudoku/usr/bin; mv sudoku_generator sudoku_generator_vdr${SPECIAL_VDR_SUFFIX}
-EOF
-}
-
-prepare_text2skin()
-{
-    echo "prepare_text2skin: use skins from standard packages"
-    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
---- debian/links  1970-01-01 00:00:00.000000000 +0000
-+++ debian/links
-@@ -0,0 +1 @@
-+var/lib/vdr/plugins/text2skin  var/lib/vdr${SPECIAL_VDR_SUFFIX}/plugins/text2skin
-EOF
-}
-
-prepare_vdrc()
-{
-    echo "prepare_vdrc: set conflict to old special package"
-    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
---- debian/control
-+++ debian/control
-@@ -12,1 +12,3 @@
--Depends: ${vdr${SPECIAL_VDR_SUFFIX}:Depends}, ${shlibs:Depends}
-+Depends: ${vdr${SPECIAL_VDR_SUFFIX}:Depends}, ${shlibs:Depends}
-+Conflicts: vdr${SPECIAL_VDR_SUFFIX}-plugin-vdrc
-+Replaces: vdr${SPECIAL_VDR_SUFFIX}-plugin-vdrc
-EOF
-}
-
-prepare_vdrcd()
-{
-    echo "prepare_vdrcd: set conflict to old special package"
-    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
---- debian/control
-+++ debian/control
-@@ -11,1 +11,3 @@
--Depends: ${shlibs:Depends}, ${vdr${SPECIAL_VDR_SUFFIX}:Depends}, vdr${SPECIAL_VDR_SUFFIX}-plugin-dvd, vdr${SPECIAL_VDR_SUFFIX}-plugin-vcd
-+Depends: ${shlibs:Depends}, ${vdr${SPECIAL_VDR_SUFFIX}:Depends}, vdr${SPECIAL_VDR_SUFFIX}-plugin-dvd, vdr${SPECIAL_VDR_SUFFIX}-plugin-vcd
-+Conflicts: vdr${SPECIAL_VDR_SUFFIX}-plugin-vdrcd
-+Replaces: vdr${SPECIAL_VDR_SUFFIX}-plugin-vdrcd
-EOF
-}
-
-prepare_vdrrip()
-{
-    echo "prepare_vdrrip: rename queuehandler.sh -> queuehandler_vdr${SPECIAL_VDR_SUFFIX}.sh"
-    SUBST="s/queuehandler.sh/queuehandler_vdr${SPECIAL_VDR_SUFFIX}.sh/g"
-    FILES=$(/usr/bin/find ./ -type f -not -regex "./${SAVE_DIR}/.*" \
-                          -not -regex "./debian/changelog")
-    subst_in_files "${SUBST}" ${FILES}
-    rename_files   "${SUBST}" ${FILES}
-
-    echo "prepare_vdrrip: set conflict to old special package"
-    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
---- debian/control
-+++ debian/control
-@@ -12,1 +12,3 @@
--Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr${SPECIAL_VDR_SUFFIX}:Depends}
-+Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr${SPECIAL_VDR_SUFFIX}:Depends}
-+Conflicts: vdr${SPECIAL_VDR_SUFFIX}-plugin-vdrrip
-+Replaces: vdr${SPECIAL_VDR_SUFFIX}-plugin-vdrrip
-EOF
-}
-
-prepare_vompserver()
-{
-    echo "prepare_vompserver: use vompclient from standard package"
-    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
---- debian/control
-+++ debian/control
-@@ -13 +13 @@
--Conflicts: vdr${SPECIAL_VDR_SUFFIX}-plugin-mediamvp, vdr${SPECIAL_VDR_SUFFIX}-vompclient-mvp (<< 0.2.5)
-+Conflicts: vdr${SPECIAL_VDR_SUFFIX}-plugin-mediamvp, vdr-vompclient-mvp (<< 0.2.5)
---- debian/vomp.conf
-+++ debian/vomp.conf
-@@ -30 +30 @@
--TFTP directory = /usr/share/vdr${SPECIAL_VDR_SUFFIX}-plugin-vompserver
-+TFTP directory = /usr/share/vdr-plugin-vompserver
-EOF
-}
-
-prepare_wapd()
-{
-    echo "prepare_wapd: rename wappasswd -> wappasswd_vdr${SPECIAL_VDR_SUFFIX}"
-    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
---- debian/rules
-+++ debian/rules
-@@ -53,1 +53,2 @@
--	dh_install
-+	dh_install
-+	cd debian/vdr${SPECIAL_VDR_SUFFIX}-plugin-wapd/usr/bin; mv wappasswd wappasswd_vdr${SPECIAL_VDR_SUFFIX}
-EOF
-}
-
-prepare_xine()
-{
-    echo "prepare_xine: rename xineplayer -> xineplayer_vdr${SPECIAL_VDR_SUFFIX}"
-    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
---- debian/rules
-+++ debian/rules
-@@ -69,1 +69,2 @@
--	dh_install
-+	dh_install
-+	cd debian/vdr${SPECIAL_VDR_SUFFIX}-plugin-xine/usr/bin; mv xineplayer xineplayer_vdr${SPECIAL_VDR_SUFFIX}
-EOF
-}
-
-prepare_xineliboutput()
-{
-    echo "prepare_xineliboutput: use libxine/xineliboutput from standard package"
-    SUBST="/Package: libxineliboutput-fbfe/,/^\$/d; \
-           /Package: libxineliboutput-sxfe/,/^\$/d; \
-           /Package: xineliboutput-fbfe/,/^\$/d; \
-           /Package: xineliboutput-sxfe/,/^\$/d; \
-           /Package: libxine-xvdr${SPECIAL_VDR_SUFFIX}/,/^\$/d"
-    subst_in_files "${SUBST}" "debian/control"
-}
-
-cleanup()
-{
-    if [ -e "${SAVE_DIR}" ]; then
-        echo "cleanup: remove all but ${SAVE_DIR} and restore all files form there"
-        /bin/rm -rf $(/usr/bin/find ./ -mindepth 1 -maxdepth 1 \
-                                    -not -name "${SAVE_DIR}")
-        cd "${SAVE_DIR}"
-        /bin/cp -r $(/usr/bin/find ./ -mindepth 1 -maxdepth 1) ..
-        cd ..
-        /bin/rm -rf "${SAVE_DIR}"
-    fi
-}
-
-check_clean_arg()
-{
-    for ARG; do
-        [ "${ARG}" = "clean" ] && return
-    done
-    false
-}
-
-check_package()
-{
-    for ARG; do
-        /usr/bin/dh_listpackages | /bin/grep -q "^${ARG}\$" && return
-    done
-    false
-}
-
-subst_in_files()
-{
-    SUBST="$1"
-    shift
-    for F; do
-        /bin/chmod +w "${F}"
-        /bin/cp -a -f "${F}" "${TMP_FILE}"
-        /bin/sed -e "${SUBST}" "${F}" >"${TMP_FILE}"
-        if ! /usr/bin/cmp -s "${F}" "${TMP_FILE}"; then
-            /usr/bin/touch -r "${F}" "${TMP_FILE}"
-            /bin/mv -f "${TMP_FILE}" "${F}"
-        fi
-    done
-}
-
-rename_files()
-{
-    SUBST="$1"
-    shift
-    for F; do
-        N=$(dirname "${F}")/$(basename "${F}" | /bin/sed -e "${SUBST}")
-        if [ "${F}" != "${N}" ]; then
-            /bin/mv "${F}" "${N}"
-        fi
-    done
-}
-
-main "$@"

Copied: vdr/vdr/trunk/debian/make-special-vdr.sh (from rev 3858, vdr/vdr/trunk/debian/make-special-vdr)
===================================================================
--- vdr/vdr/trunk/debian/make-special-vdr	2007-01-13 14:43:28 UTC (rev 3858)
+++ vdr/vdr/trunk/debian/make-special-vdr.sh	2007-01-13 20:49:10 UTC (rev 3861)
@@ -0,0 +1,738 @@
+# make-special-vdr.sh by Thomas Günther <tom at toms-cafe.de>
+#
+# Description:
+#
+# Make a special variation of the vdr package or of a vdr plugin package.
+# These debian packages could be installed parallel to the standard vdr debian
+# packages in order to test new development versions of vdr. Between the
+# standard and the special variation of vdr can be switched via command menu.
+#
+# Standard and special packages uses the same recordings directory. Therefore,
+# user and group are 'vdr' for the special packages too. The suffix of recording
+# files remains also '.vdr'.
+#
+# Necessary adaptions in the debian source packages:
+#
+# The special packages are built from the same source packages as the standard
+# packages. The make-special-vdr.sh script is called from "debian/rules" instead
+# of the normal make. In the first line of "debian/rules" "#! /usr/bin/make -f"
+# has to be replaced with "#! /bin/sh debian/make-special-vdr.sh" for the vdr
+# package respectively with "#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh"
+# for a vdr plugin package.
+#
+# Usage:
+#
+# The name of the special package is specified by the environment variable
+# SPECIAL_VDR_SUFFIX. E.g., the vdrdevel variation is built with
+#    SPECIAL_VDR_SUFFIX=devel fakeroot dpkg-buildpackage -us -uc -tc
+#
+# The plugin packages don't include make-special-vdr.sh themselves. Instead they
+# use /usr/share/vdr-dev/make-special-vdr.sh installed by the vdr-dev package.
+#
+# If the installed make-special-vdr.sh version of vdr-dev is to old to build the
+# special variation of a particular vdr plugin package, a newer version of
+# make-special-vdr.sh can be specified by the environment variable
+# MAKE_SPECIAL_VDR, e.g.
+#    export MAKE_SPECIAL_VDR=/usr/share/vdrdevel-dev/make-special-vdr.sh
+#    SPECIAL_VDR_SUFFIX=devel fakeroot dpkg-buildpackage -us -uc -tc
+#
+# In order to build the standard vdr packages the environment variable
+# SPECIAL_VDR_SUFFIX has to be empty or not set.
+#
+# Implementation details:
+#
+# If SPECIAL_VDR_SUFFIX is set and not empty make-special-vdr.sh does following
+# steps:
+#    1. Create the subdirectory ".save".
+#    2. Copy all files and directories into ".save".
+#    3. Substitute "vdr" in the contents of all files (recursively) except for
+#       "debian/changelog", "debian/make-special-vdr.sh", all files in
+#       "debian/plugin-template", and all files in ".save".
+#    4. Substitute "vdr" in the names of all files (recursively) except for all
+#       files in ".save".
+#    5. Make special changes for certain packages.
+#    6. Call the normal make.
+# Points 1-5 are performed only if the subdirectory ".save" not exist.
+# If "debian/rules" is called with the argument "clean" all original files and
+# directories are restored form ".save" and the subdirectory ".save" is removed.
+#
+# History:
+#
+#    2004-06-12 - 2005-09-29: Version 0.0.0 - 0.1.4 (vdrdevel patch)
+#
+#    2007-01-13: Version 0.2
+#       - Converted vdrdevel patch to make-special-vdr.sh
+
+
+main()
+{
+    echo "$0" "$@" \
+         "SPECIAL_VDR_SUFFIX='${SPECIAL_VDR_SUFFIX}'" \
+         "MAKE_SPECIAL_VDR='${MAKE_SPECIAL_VDR}'" \
+         "NO_CHECKBUILDDEPS='${NO_CHECKBUILDDEPS}'"
+    if [ -z "${SPECIAL_VDR_SUFFIX}" ]; then
+        # Original make if SPECIAL_VDR_SUFFIX is not set
+        /usr/bin/make -f "$@"
+    elif [ "${MAKE_SPECIAL_VDR}" ]; then
+        # Call newer version of make-special-vdr.sh provided by MAKE_SPECIAL_VDR
+        MAKE_SPECIAL_VDR= /bin/sh "${MAKE_SPECIAL_VDR}" "$@"
+    elif ! check_clean_arg "$@"; then
+        # Make special variation: prepare the package before make
+        prepare
+        /usr/bin/make -f "$@"
+    else
+        # Clean prepared package
+        cleanup
+    fi
+}
+
+SAVE_DIR=".save"
+
+prepare()
+{
+    if [ ! -e "${SAVE_DIR}" ]; then
+        echo "prepare: save all in subdirectory ${SAVE_DIR}"
+        /bin/mkdir "${SAVE_DIR}"
+        /bin/cp -r $(/usr/bin/find ./ -mindepth 1 -maxdepth 1 \
+                                   -not -name "${SAVE_DIR}") "${SAVE_DIR}"
+
+        # Create tempfile
+        TMP_FILE=$(/bin/mktemp)
+
+        # Execute substitutions
+        prepare_common
+        if check_package "vdr${SPECIAL_VDR_SUFFIX}"; then
+            prepare_vdr
+        fi
+        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-analogtv"; then
+            prepare_analogtv
+        fi
+        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-graphtft"; then
+            prepare_graphtft
+        fi
+        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-mediamvp"; then
+            prepare_mediamvp
+        fi
+        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-pin"; then
+            prepare_pin
+        fi
+        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-rssreader"; then
+            prepare_rssreader
+        fi
+        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-softdevice"; then
+            prepare_softdevice
+        fi
+        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-sudoku"; then
+            prepare_sudoku
+        fi
+        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-text2skin"; then
+            prepare_text2skin
+        fi
+        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-vdr${SPECIAL_VDR_SUFFIX}c"; then
+            prepare_vdrc
+        fi
+        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-vdr${SPECIAL_VDR_SUFFIX}cd"; then
+            prepare_vdrcd
+        fi
+        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-vdr${SPECIAL_VDR_SUFFIX}rip"; then
+            prepare_vdrrip
+        fi
+        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-vompserver"; then
+            prepare_vompserver
+        fi
+        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-wapd"; then
+            prepare_wapd
+        fi
+        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-xine"; then
+            prepare_xine
+        fi
+        if check_package "vdr${SPECIAL_VDR_SUFFIX}-plugin-xineliboutput"; then
+            prepare_xineliboutput
+        fi
+
+        # Check build dependencies after substitutions
+        if [ -z "${NO_CHECKBUILDDEPS}" ]; then
+            if ! /usr/bin/dpkg-checkbuilddeps; then
+                echo >&2 "Build dependencies/conflicts unsatisfied; aborting."
+                echo >&2 "(Set NO_CHECKBUILDDEPS environment variable to override.)"
+                exit 3
+            fi
+        fi
+
+        # Remove tempfile
+        /bin/rm -f "${TMP_FILE}"
+    fi
+}
+
+prepare_common()
+{
+    echo "prepare_common: substitute vdr -> vdr${SPECIAL_VDR_SUFFIX}"
+    SUBST="s.vdr.vdr${SPECIAL_VDR_SUFFIX}.g; \
+           s.make-special-vdr${SPECIAL_VDR_SUFFIX}.make-special-vdr.g; \
+           s./bin/sh /usr/share/vdr${SPECIAL_VDR_SUFFIX}-dev/make-special-vdr./bin/sh /usr/share/vdr-dev/make-special-vdr.g; \
+           s.Source: vdr${SPECIAL_VDR_SUFFIX}.Source: vdr.g; \
+           s.Source: vdr-plugin-vdr${SPECIAL_VDR_SUFFIX}c.Source: vdr-plugin-vdrc.g; \
+           s.Source: vdr-plugin-vdr${SPECIAL_VDR_SUFFIX}rip.Source: vdr-plugin-vdrrip.g; \
+           s.Source: vdr-plugin-svdr${SPECIAL_VDR_SUFFIX}p.Source: vdr-plugin-svdrp.g; \
+           s.pkg-vdr${SPECIAL_VDR_SUFFIX}-dvb-devel.pkg-vdr-dvb-devel.g; \
+           s.vdr${SPECIAL_VDR_SUFFIX}admin.vdradmin.g; \
+           s.vdr${SPECIAL_VDR_SUFFIX}-xxv.vdr-xxv.g; \
+           s.vdr${SPECIAL_VDR_SUFFIX}sync.vdrsync.g; \
+           s.vdr${SPECIAL_VDR_SUFFIX}-xpmlogos.vdr-xpmlogos.g; \
+           s.vdr${SPECIAL_VDR_SUFFIX}-genindex.vdr-genindex.g; \
+           s.USER=vdr${SPECIAL_VDR_SUFFIX}.USER=vdr.g; \
+           s.GROUP=vdr${SPECIAL_VDR_SUFFIX}.GROUP=vdr.g; \
+           s.chown vdr${SPECIAL_VDR_SUFFIX}:vdr${SPECIAL_VDR_SUFFIX}.chown vdr:vdr.g; \
+           s.chown -R vdr${SPECIAL_VDR_SUFFIX}:vdr${SPECIAL_VDR_SUFFIX}.chown -R vdr:vdr.g; \
+           s/resume%s%s\.vdr${SPECIAL_VDR_SUFFIX}/resume%s%s.vdr/g; \
+           s/summary\.vdr${SPECIAL_VDR_SUFFIX}/summary.vdr/g; \
+           s/info\.vdr${SPECIAL_VDR_SUFFIX}/info.vdr/g; \
+           s/marks\.vdr${SPECIAL_VDR_SUFFIX}/marks.vdr/g; \
+           s/index\.vdr${SPECIAL_VDR_SUFFIX}/index.vdr/g; \
+           s/%03d\.vdr${SPECIAL_VDR_SUFFIX}/%03d.vdr/g; \
+           s/dvd\.vdr${SPECIAL_VDR_SUFFIX}/dvd.vdr/g; \
+           s/001\.vdr${SPECIAL_VDR_SUFFIX}/001.vdr/g; \
+           s/002\.vdr${SPECIAL_VDR_SUFFIX}/002.vdr/g; \
+           s/index_%02d\.vdr${SPECIAL_VDR_SUFFIX}/index_%02d.vdr/g; \
+           s/\[0-9\]\.vdr${SPECIAL_VDR_SUFFIX}/[0-9].vdr/g; \
+           s/index_archive\.vdr${SPECIAL_VDR_SUFFIX}/index_archive.vdr/g; \
+           s/{TRACK_ON_DVD}\.vdr${SPECIAL_VDR_SUFFIX}/{TRACK_ON_DVD}.vdr/g; \
+           s/size_cut\.vdr${SPECIAL_VDR_SUFFIX}/size_cut.vdr/g; \
+           s/size\.vdr${SPECIAL_VDR_SUFFIX}/size.vdr/g; \
+           s/strcasecmp(pos, \".vdr${SPECIAL_VDR_SUFFIX}\")/strcasecmp(pos, \".vdr\")/g; \
+           s/input_vdr${SPECIAL_VDR_SUFFIX}\.h/input_vdr.h/g; \
+           s/dvdr${SPECIAL_VDR_SUFFIX}ecord/dvdrecord/g; \
+           s/dvdr${SPECIAL_VDR_SUFFIX}ead/dvdread/g"
+    FILES=$(/usr/bin/find ./ -type f -not -regex "./${SAVE_DIR}/.*" \
+                          -not -regex "./debian/changelog" \
+                          -not -regex "./debian/make-special-vdr.sh" \
+                          -not -regex "./debian/plugin-template/.*")
+    set -f; OLD_IFS="${IFS}"; IFS="
+"; set -- ${FILES}; IFS="${OLD_IFS}"; set +f
+    subst_in_files "${SUBST}" "$@"
+    rename_files   "${SUBST}" "$@"
+}
+
+prepare_vdr()
+{
+    echo "prepare_vdr: prevent conflict to standard vdr"
+    if /bin/grep -q "var/lib/video" "debian/vdr${SPECIAL_VDR_SUFFIX}.links"; then
+        /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
+--- debian/vdr${SPECIAL_VDR_SUFFIX}.links
++++ debian/vdr${SPECIAL_VDR_SUFFIX}.links
+@@ -15 +14,0 @@
+-var/lib/video.00  var/lib/video
+--- debian/vdr${SPECIAL_VDR_SUFFIX}.postinst
++++ debian/vdr${SPECIAL_VDR_SUFFIX}.postinst
+@@ -1,1 +1,6 @@
+-#!/bin/sh
++#!/bin/sh
++if [ "$1" = "configure" ]; then
++    if [ ! -e /var/lib/video ] ; then
++        /bin/ln -s /var/lib/video.00 /var/lib/video
++    fi
++fi
+EOF
+    fi
+
+    echo "prepare_vdr: add debconf question which vdr variation should start automatically"
+    if [ ! -e "debian/vdr${SPECIAL_VDR_SUFFIX}.config" ]; then
+        /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
+--- debian/rules
++++ debian/rules
+@@ -130 +130 @@
+-	dh_installinit -a
++	dh_installinit -a --noscripts
+--- debian/vdr${SPECIAL_VDR_SUFFIX}.config  1970-01-01 00:00:00.000000000 +0000
++++ debian/vdr${SPECIAL_VDR_SUFFIX}.config
+@@ -0,0 +1,6 @@
++#! /bin/sh
++set -e
++. /usr/share/debconf/confmodule
++db_version 2.0
++db_input high vdr${SPECIAL_VDR_SUFFIX}/autostart || true
++db_go || true
+--- debian/vdr${SPECIAL_VDR_SUFFIX}.postinst
++++ debian/vdr${SPECIAL_VDR_SUFFIX}.postinst
+@@ -1,1 +1,21 @@
+-#!/bin/sh
++#!/bin/sh
++. /usr/share/debconf/confmodule
++if [ "$1" = "configure" ]; then
++    db_get vdr${SPECIAL_VDR_SUFFIX}/autostart
++    if [ "$RET" = "true" ]; then
++        START="vdr${SPECIAL_VDR_SUFFIX}"
++        STOP="vdr"
++    else
++        START="vdr"
++        STOP="vdr${SPECIAL_VDR_SUFFIX}"
++    fi
++    if [ -x "/etc/init.d/$STOP" ]; then
++        /etc/init.d/$STOP stop
++        update-rc.d -f $STOP remove >/dev/null
++    fi
++    if [ -x "/etc/init.d/$START" ]; then
++        /etc/init.d/$START stop
++        update-rc.d $START defaults >/dev/null
++        /etc/init.d/$START start
++    fi
++fi
+--- debian/vdr${SPECIAL_VDR_SUFFIX}.prerm  1970-01-01 00:00:00.000000000 +0000
++++ debian/vdr${SPECIAL_VDR_SUFFIX}.prerm
+@@ -0,0 +1,16 @@
++#! /bin/sh
++set -e
++if [ -x "/etc/init.d/vdr${SPECIAL_VDR_SUFFIX}" ]; then
++    /etc/init.d/vdr${SPECIAL_VDR_SUFFIX} stop
++fi
++if [ "$1" = "remove" ] ; then
++    if [ -x "/etc/init.d/vdr${SPECIAL_VDR_SUFFIX}" ]; then
++        update-rc.d -f vdr${SPECIAL_VDR_SUFFIX} remove >/dev/null
++    fi
++    if [ -x "/etc/init.d/vdr" ]; then
++        /etc/init.d/vdr stop
++        update-rc.d vdr defaults >/dev/null
++        /etc/init.d/vdr start
++    fi
++fi
++#DEBHELPER#
+--- debian/vdr${SPECIAL_VDR_SUFFIX}.templates  1970-01-01 00:00:00.000000000 +0000
++++ debian/vdr${SPECIAL_VDR_SUFFIX}.templates
+@@ -0,0 +1,7 @@
++Template: vdr${SPECIAL_VDR_SUFFIX}/autostart
++Type: boolean
++Default: false
++Description: Start vdr${SPECIAL_VDR_SUFFIX} automatically instead of vdr?
++ On system startup either vdr${SPECIAL_VDR_SUFFIX} or vdr will be started in daemon mode.
++ By selecting this, you choose vdr${SPECIAL_VDR_SUFFIX} instead of vdr.
++ But you can manually switch between vdr${SPECIAL_VDR_SUFFIX} and vdr by menu commands.
+EOF
+    else
+        /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
+--- debian/rules
++++ debian/rules
+@@ -123 +123 @@
+-	dh_installinit -a
++	dh_installinit -a --noscripts
+--- debian/vdr${SPECIAL_VDR_SUFFIX}.config
++++ debian/vdr${SPECIAL_VDR_SUFFIX}.config
+@@ -24,1 +24,3 @@
+-exit 0
++db_input high vdr${SPECIAL_VDR_SUFFIX}/autostart || true
++db_go || true
++exit 0
+--- debian/vdr${SPECIAL_VDR_SUFFIX}.postinst
++++ debian/vdr${SPECIAL_VDR_SUFFIX}.postinst
+@@ -1,1 +1,21 @@
+-#! /bin/sh
++#! /bin/sh
++. /usr/share/debconf/confmodule
++if [ "$1" = "configure" ]; then
++    db_get vdr${SPECIAL_VDR_SUFFIX}/autostart
++    if [ "$RET" = "true" ]; then
++        START="vdr${SPECIAL_VDR_SUFFIX}"
++        STOP="vdr"
++    else
++        START="vdr"
++        STOP="vdr${SPECIAL_VDR_SUFFIX}"
++    fi
++    if [ -x "/etc/init.d/$STOP" ]; then
++        /etc/init.d/$STOP stop
++        update-rc.d -f $STOP remove >/dev/null
++    fi
++    if [ -x "/etc/init.d/$START" ]; then
++        /etc/init.d/$START stop
++        update-rc.d $START defaults >/dev/null
++        /etc/init.d/$START start
++    fi
++fi
+--- debian/vdr${SPECIAL_VDR_SUFFIX}.prerm
++++ debian/vdr${SPECIAL_VDR_SUFFIX}.prerm
+@@ -1,1 +1,15 @@
+-#! /bin/sh
++#! /bin/sh
++set -e
++if [ -x "/etc/init.d/vdr${SPECIAL_VDR_SUFFIX}" ]; then
++    /etc/init.d/vdr${SPECIAL_VDR_SUFFIX} stop
++fi
++if [ "$1" = "remove" ] ; then
++    if [ -x "/etc/init.d/vdr${SPECIAL_VDR_SUFFIX}" ]; then
++        update-rc.d -f vdr${SPECIAL_VDR_SUFFIX} remove >/dev/null
++    fi
++    if [ -x "/etc/init.d/vdr" ]; then
++        /etc/init.d/vdr stop
++        update-rc.d vdr defaults >/dev/null
++        /etc/init.d/vdr start
++    fi
++fi
+--- debian/vdr${SPECIAL_VDR_SUFFIX}.templates
++++ debian/vdr${SPECIAL_VDR_SUFFIX}.templates
+@@ -0,0 +1,8 @@
++Template: vdr${SPECIAL_VDR_SUFFIX}/autostart
++Type: boolean
++Default: false
++Description: Start vdr${SPECIAL_VDR_SUFFIX} automatically instead of vdr?
++ On system startup either vdr${SPECIAL_VDR_SUFFIX} or vdr will be started in daemon mode.
++ By selecting this, you choose vdr${SPECIAL_VDR_SUFFIX} instead of vdr.
++ But you can manually switch between vdr${SPECIAL_VDR_SUFFIX} and vdr by menu commands.
++
+EOF
+    fi
+
+    # Add commands to switch between the vdr variations
+    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
+--- debian/commands.switch-vdr.conf  1970-01-01 00:00:00.000000000 +0000
++++ debian/commands.switch-vdr.conf
+@@ -0,0 +1 @@
++VDR-Standardversion starten : echo "/usr/lib/vdr${SPECIAL_VDR_SUFFIX}/ctvdr${SPECIAL_VDR_SUFFIX}wrapper --stop && /bin/sleep 5 && /usr/lib/vdr/ctvdrwrapper --restart" | at now
+--- debian/commands.switch-vdr${SPECIAL_VDR_SUFFIX}.conf  1970-01-01 00:00:00.000000000 +0000
++++ debian/commands.switch-vdr${SPECIAL_VDR_SUFFIX}.conf
+@@ -0,0 +1 @@
++VDR-Entwicklerversion vdr${SPECIAL_VDR_SUFFIX} starten : echo "/usr/lib/vdr/ctvdrwrapper --stop && /bin/sleep 5 && /usr/lib/vdr${SPECIAL_VDR_SUFFIX}/ctvdr${SPECIAL_VDR_SUFFIX}wrapper --restart" | at now
+--- debian/vdr${SPECIAL_VDR_SUFFIX}.install
++++ debian/vdr${SPECIAL_VDR_SUFFIX}.install
+@@ -0,0 +1,2 @@
++debian/commands.switch-vdr.conf         usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/
++debian/commands.switch-vdr${SPECIAL_VDR_SUFFIX}.conf         usr/share/vdr/command-hooks/
+EOF
+
+    echo "prepare_vdr: set links to use logos and addons from standard packages"
+    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
+--- debian/commands-loader.sh
++++ debian/commands-loader.sh
+@@ -33 +33 @@
+-    cmds=( `find $CMDHOOKSDIR -maxdepth 1 -name "$cmdtype.*.conf" -printf "%f \n" | sed "s/$cmdtype\.\(.\+\)\.conf/\1/g"` )
++    cmds=( `find $CMDHOOKSDIR -maxdepth 1 -name "$cmdtype.*.conf" -xtype f -printf "%f \n" | sed "s/$cmdtype\.\(.\+\)\.conf/\1/g"` )
+--- debian/vdr${SPECIAL_VDR_SUFFIX}.links
++++ debian/vdr${SPECIAL_VDR_SUFFIX}.links
+@@ -0,0 +1,21 @@
++var/lib/vdr/logos                                         var/lib/vdr${SPECIAL_VDR_SUFFIX}/logos
++usr/share/vdr/shutdown-hooks/S90.acpiwakeup               usr/share/vdr${SPECIAL_VDR_SUFFIX}/shutdown-hooks/S90.acpiwakeup
++usr/share/vdr/command-hooks/reccmds.noad.conf             usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/reccmds.noad.conf
++usr/share/vdr/recording-hooks/R10.noad                    usr/share/vdr${SPECIAL_VDR_SUFFIX}/recording-hooks/R10.noad
++usr/share/vdr/shutdown-hooks/S50.noad                     usr/share/vdr${SPECIAL_VDR_SUFFIX}/shutdown-hooks/S50.noad
++usr/share/vdr/shutdown-hooks/S90.nvram-wakeup             usr/share/vdr${SPECIAL_VDR_SUFFIX}/shutdown-hooks/S90.nvram-wakeup
++usr/share/vdr/recording-hooks/R10.sharemarks              usr/share/vdr${SPECIAL_VDR_SUFFIX}/recording-hooks/R10.sharemarks
++usr/share/vdr/command-hooks/reccmds.sharemarks.conf       usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/reccmds.sharemarks.conf
++usr/share/vdr/command-hooks/reccmds.tosvcd.conf           usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/reccmds.tosvcd.conf
++usr/share/vdr/shutdown-hooks/S50.tosvcd                   usr/share/vdr${SPECIAL_VDR_SUFFIX}/shutdown-hooks/S50.tosvcd
++usr/share/vdr/command-hooks/commands.tvinfomerk2vdr.conf  usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/commands.tvinfomerk2vdr.conf
++usr/share/vdr/command-hooks/commands.tvmovie2vdr.conf     usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/commands.tvmovie2vdr.conf
++usr/share/vdr/command-hooks/commands.vdrconvert.conf      usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/commands.vdrconvert.conf
++usr/share/vdr/command-hooks/reccmds.vdrconvert-divx.conf  usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/reccmds.vdrconvert-divx.conf
++usr/share/vdr/command-hooks/reccmds.vdrconvert-svcd.conf  usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/reccmds.vdrconvert-svcd.conf
++usr/share/vdr/command-hooks/reccmds.vdrconvert-vcd.conf   usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/reccmds.vdrconvert-vcd.conf
++usr/share/vdr/command-hooks/reccmds.vdrconvert-mpeg.conf  usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/reccmds.vdrconvert-mpeg.conf
++usr/share/vdr/command-hooks/reccmds.vdrconvert-mp3.conf   usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/reccmds.vdrconvert-mp3.conf
++usr/share/vdr/command-hooks/reccmds.vdrconvert-ac3.conf   usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/reccmds.vdrconvert-ac3.conf
++usr/share/vdr/command-hooks/reccmds.vdrconvert-dvd.conf   usr/share/vdr${SPECIAL_VDR_SUFFIX}/command-hooks/reccmds.vdrconvert-dvd.conf
++usr/share/vdr/shutdown-hooks/S50.vdrconvert               usr/share/vdr${SPECIAL_VDR_SUFFIX}/shutdown-hooks/S50.vdrconvert
+EOF
+
+    echo "prepare_vdr: add hint to the plugin debianizer script"
+    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' >> "debian/debianize-vdr${SPECIAL_VDR_SUFFIX}plugin"
+echo
+echo "To build vdr${SPECIAL_VDR_SUFFIX} plugin packages use the environment variable"
+echo "SPECIAL_VDR_SUFFIX, e.g.:"
+echo "    SPECIAL_VDR_SUFFIX=${SPECIAL_VDR_SUFFIX} fakeroot dpkg-buildpackage -us -uc -tc"
+echo "See /usr/share/vdr-dev/make-special-vdr.sh for details."
+EOF
+}
+
+prepare_analogtv()
+{
+    echo "prepare_analogtv: rename mp1e -> mp1e_vdr${SPECIAL_VDR_SUFFIX}"
+    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
+--- player-analogtv.c
++++ player-analogtv.c
+@@ -569 +569 @@
+-                     sprintf(cmd, "mp1e -m %d %s%s%s%s -t %d -g %s -p %s -c %s -x %s -d %d -a %d -b %d -B %d%s -r %d,%d -s %s -S %2.1f -F %d%s%s%s%s -o %s &",
++                     sprintf(cmd, "mp1e_vdr${SPECIAL_VDR_SUFFIX} -m %d %s%s%s%s -t %d -g %s -p %s -c %s -x %s -d %d -a %d -b %d -B %d%s -r %d,%d -s %s -S %2.1f -F %d%s%s%s%s -o %s &",
+--- debian/rules
++++ debian/rules
+@@ -73,1 +73,3 @@
+-	dh_install
++	dh_install
++	cd debian/vdr${SPECIAL_VDR_SUFFIX}-plugin-analogtv/usr/bin; mv mp1e mp1e_vdr${SPECIAL_VDR_SUFFIX}
++	cd debian/vdr${SPECIAL_VDR_SUFFIX}-plugin-analogtv/usr/share/man/man1; mv mp1e.1 mp1e_vdr${SPECIAL_VDR_SUFFIX}.1
+EOF
+}
+
+prepare_graphtft()
+{
+    echo "prepare_graphtft: correct device option vdr"
+    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
+--- display.c
++++ display.c
+@@ -96 +96 @@
+-	pos = strstr(dev, "vdr${SPECIAL_VDR_SUFFIX}/");
++	pos = strstr(dev, "vdr/");
+--- graphtft.c
++++ graphtft.c
+@@ -83 +83 @@
+-	"                           /dev/fb0 or vdr${SPECIAL_VDR_SUFFIX}/1 \n"
++	"                           /dev/fb0 or vdr/1 \n"
+@@ -113 +113 @@
+-				}else if (strstr(optarg, "vdr${SPECIAL_VDR_SUFFIX}/")){
++				}else if (strstr(optarg, "vdr/")){
+@@ -170,2 +170,2 @@
+-				fprintf(stderr, "vdr${SPECIAL_VDR_SUFFIX}: graphtft -  try device: vdr${SPECIAL_VDR_SUFFIX}/%d !\n", i);
+-				asprintf(&_dev, "vdr${SPECIAL_VDR_SUFFIX}/%d", i);
++				fprintf(stderr, "vdr${SPECIAL_VDR_SUFFIX}: graphtft -  try device: vdr/%d !\n", i);
++				asprintf(&_dev, "vdr/%d", i);
+--- debian/plugin.graphtft.conf
++++ debian/plugin.graphtft.conf
+@@ -5 +5 @@
+-#-d vdr${SPECIAL_VDR_SUFFIX}/1
++#-d vdr/1
+EOF
+
+    echo "prepare_graphtft: use skins from standard packages"
+    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
+--- debian/control
++++ debian/control
+@@ -12 +12 @@
+-Depends: ${shlibs:Depends}, ${vdr${SPECIAL_VDR_SUFFIX}:Depends}, vdr${SPECIAL_VDR_SUFFIX}-tft-standard, ttf-bitstream-vera
++Depends: ${shlibs:Depends}, ${vdr${SPECIAL_VDR_SUFFIX}:Depends}, vdr-tft-standard, ttf-bitstream-vera
+--- debian/dirs
++++ debian/dirs
+@@ -1 +0,0 @@
+-var/lib/vdr${SPECIAL_VDR_SUFFIX}/plugins/graphTFT/themes
+--- debian/links
++++ debian/links
+@@ -0,0 +1 @@
++var/lib/vdr/plugins/graphTFT/themes  var/lib/vdr${SPECIAL_VDR_SUFFIX}/plugins/graphTFT/themes
+EOF
+}
+
+prepare_mediamvp()
+{
+    echo "prepare_mediamvp: rename mvploader -> mvploader_vdr${SPECIAL_VDR_SUFFIX}"
+    SUBST="s.mvploader.mvploader_vdr${SPECIAL_VDR_SUFFIX}.g; \
+           s./usr/lib/mediamvp./usr/share/vdr${SPECIAL_VDR_SUFFIX}-plugin-mediamvp.g"
+    FILES=$(/usr/bin/find ./ -type f -not -regex "./${SAVE_DIR}/.*" \
+                          -not -regex "./debian/changelog")
+    subst_in_files "${SUBST}" ${FILES}
+    rename_files   "${SUBST}" ${FILES}
+    /bin/mv "debian/mvploader" "debian/mvploader_vdr${SPECIAL_VDR_SUFFIX}"
+}
+
+prepare_pin()
+{
+    echo "prepare_pin: rename fskcheck -> fskcheck_vdr${SPECIAL_VDR_SUFFIX}"
+    SUBST="s/fskcheck/fskcheck_vdr${SPECIAL_VDR_SUFFIX}/g"
+    FILES=$(/usr/bin/find ./ -type f -not -regex "./${SAVE_DIR}/.*" \
+                          -not -regex "./debian/changelog")
+    subst_in_files "${SUBST}" ${FILES}
+    rename_files   "${SUBST}" ${FILES}
+}
+
+prepare_rssreader()
+{
+    echo "prepare_rssreader: correct rss entry"
+    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
+--- debian/rssreader.conf
++++ debian/rssreader.conf
+@@ -15 +15 @@
+-VDR Announcements   : http://www.netholic.com/extras/vdr${SPECIAL_VDR_SUFFIX}_announce_rss.php?num=10
++VDR Announcements   : http://www.netholic.com/extras/vdr_announce_rss.php?num=10
+EOF
+}
+
+prepare_softdevice()
+{
+    echo "prepare_softdevice: ShmClient -> ShmClient_vdr${SPECIAL_VDR_SUFFIX}"
+    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
+--- debian/rules
++++ debian/rules
+@@ -54,1 +54,2 @@
+-	dh_install
++	dh_install
++	cd debian/vdr${SPECIAL_VDR_SUFFIX}-plugin-softdevice/usr/bin; mv ShmClient ShmClient_vdr${SPECIAL_VDR_SUFFIX}
+EOF
+}
+
+prepare_sudoku()
+{
+    echo "prepare_sudoku: rename sudoku_generator -> sudoku_generator_vdr${SPECIAL_VDR_SUFFIX}"
+    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
+--- debian/rules
++++ debian/rules
+@@ -53,1 +53,2 @@
+-	dh_install
++	dh_install
++	cd debian/vdr${SPECIAL_VDR_SUFFIX}-plugin-sudoku/usr/bin; mv sudoku_generator sudoku_generator_vdr${SPECIAL_VDR_SUFFIX}
+EOF
+}
+
+prepare_text2skin()
+{
+    echo "prepare_text2skin: use skins from standard packages"
+    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
+--- debian/links  1970-01-01 00:00:00.000000000 +0000
++++ debian/links
+@@ -0,0 +1 @@
++var/lib/vdr/plugins/text2skin  var/lib/vdr${SPECIAL_VDR_SUFFIX}/plugins/text2skin
+EOF
+}
+
+prepare_vdrc()
+{
+    echo "prepare_vdrc: set conflict to old special package"
+    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
+--- debian/control
++++ debian/control
+@@ -12,1 +12,3 @@
+-Depends: ${vdr${SPECIAL_VDR_SUFFIX}:Depends}, ${shlibs:Depends}
++Depends: ${vdr${SPECIAL_VDR_SUFFIX}:Depends}, ${shlibs:Depends}
++Conflicts: vdr${SPECIAL_VDR_SUFFIX}-plugin-vdrc
++Replaces: vdr${SPECIAL_VDR_SUFFIX}-plugin-vdrc
+EOF
+}
+
+prepare_vdrcd()
+{
+    echo "prepare_vdrcd: set conflict to old special package"
+    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
+--- debian/control
++++ debian/control
+@@ -11,1 +11,3 @@
+-Depends: ${shlibs:Depends}, ${vdr${SPECIAL_VDR_SUFFIX}:Depends}, vdr${SPECIAL_VDR_SUFFIX}-plugin-dvd, vdr${SPECIAL_VDR_SUFFIX}-plugin-vcd
++Depends: ${shlibs:Depends}, ${vdr${SPECIAL_VDR_SUFFIX}:Depends}, vdr${SPECIAL_VDR_SUFFIX}-plugin-dvd, vdr${SPECIAL_VDR_SUFFIX}-plugin-vcd
++Conflicts: vdr${SPECIAL_VDR_SUFFIX}-plugin-vdrcd
++Replaces: vdr${SPECIAL_VDR_SUFFIX}-plugin-vdrcd
+EOF
+}
+
+prepare_vdrrip()
+{
+    echo "prepare_vdrrip: rename queuehandler.sh -> queuehandler_vdr${SPECIAL_VDR_SUFFIX}.sh"
+    SUBST="s/queuehandler.sh/queuehandler_vdr${SPECIAL_VDR_SUFFIX}.sh/g"
+    FILES=$(/usr/bin/find ./ -type f -not -regex "./${SAVE_DIR}/.*" \
+                          -not -regex "./debian/changelog")
+    subst_in_files "${SUBST}" ${FILES}
+    rename_files   "${SUBST}" ${FILES}
+
+    echo "prepare_vdrrip: set conflict to old special package"
+    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
+--- debian/control
++++ debian/control
+@@ -12,1 +12,3 @@
+-Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr${SPECIAL_VDR_SUFFIX}:Depends}
++Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr${SPECIAL_VDR_SUFFIX}:Depends}
++Conflicts: vdr${SPECIAL_VDR_SUFFIX}-plugin-vdrrip
++Replaces: vdr${SPECIAL_VDR_SUFFIX}-plugin-vdrrip
+EOF
+}
+
+prepare_vompserver()
+{
+    echo "prepare_vompserver: use vompclient from standard package"
+    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
+--- debian/control
++++ debian/control
+@@ -13 +13 @@
+-Conflicts: vdr${SPECIAL_VDR_SUFFIX}-plugin-mediamvp, vdr${SPECIAL_VDR_SUFFIX}-vompclient-mvp (<< 0.2.5)
++Conflicts: vdr${SPECIAL_VDR_SUFFIX}-plugin-mediamvp, vdr-vompclient-mvp (<< 0.2.5)
+--- debian/vomp.conf
++++ debian/vomp.conf
+@@ -30 +30 @@
+-TFTP directory = /usr/share/vdr${SPECIAL_VDR_SUFFIX}-plugin-vompserver
++TFTP directory = /usr/share/vdr-plugin-vompserver
+EOF
+}
+
+prepare_wapd()
+{
+    echo "prepare_wapd: rename wappasswd -> wappasswd_vdr${SPECIAL_VDR_SUFFIX}"
+    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
+--- debian/rules
++++ debian/rules
+@@ -53,1 +53,2 @@
+-	dh_install
++	dh_install
++	cd debian/vdr${SPECIAL_VDR_SUFFIX}-plugin-wapd/usr/bin; mv wappasswd wappasswd_vdr${SPECIAL_VDR_SUFFIX}
+EOF
+}
+
+prepare_xine()
+{
+    echo "prepare_xine: rename xineplayer -> xineplayer_vdr${SPECIAL_VDR_SUFFIX}"
+    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
+--- debian/rules
++++ debian/rules
+@@ -69,1 +69,2 @@
+-	dh_install
++	dh_install
++	cd debian/vdr${SPECIAL_VDR_SUFFIX}-plugin-xine/usr/bin; mv xineplayer xineplayer_vdr${SPECIAL_VDR_SUFFIX}
+EOF
+}
+
+prepare_xineliboutput()
+{
+    echo "prepare_xineliboutput: use libxine/xineliboutput from standard package"
+    SUBST="/Package: libxineliboutput-fbfe/,/^\$/d; \
+           /Package: libxineliboutput-sxfe/,/^\$/d; \
+           /Package: xineliboutput-fbfe/,/^\$/d; \
+           /Package: xineliboutput-sxfe/,/^\$/d; \
+           /Package: libxine-xvdr${SPECIAL_VDR_SUFFIX}/,/^\$/d"
+    subst_in_files "${SUBST}" "debian/control"
+}
+
+cleanup()
+{
+    if [ -e "${SAVE_DIR}" ]; then
+        echo "cleanup: remove all but ${SAVE_DIR} and restore all files form there"
+        /bin/rm -rf $(/usr/bin/find ./ -mindepth 1 -maxdepth 1 \
+                                    -not -name "${SAVE_DIR}")
+        cd "${SAVE_DIR}"
+        /bin/cp -r $(/usr/bin/find ./ -mindepth 1 -maxdepth 1) ..
+        cd ..
+        /bin/rm -rf "${SAVE_DIR}"
+    fi
+}
+
+check_clean_arg()
+{
+    for ARG; do
+        [ "${ARG}" = "clean" ] && return
+    done
+    false
+}
+
+check_package()
+{
+    for ARG; do
+        /usr/bin/dh_listpackages | /bin/grep -q "^${ARG}\$" && return
+    done
+    false
+}
+
+subst_in_files()
+{
+    SUBST="$1"
+    shift
+    for F; do
+        /bin/chmod +w "${F}"
+        /bin/cp -a -f "${F}" "${TMP_FILE}"
+        /bin/sed -e "${SUBST}" "${F}" >"${TMP_FILE}"
+        if ! /usr/bin/cmp -s "${F}" "${TMP_FILE}"; then
+            /usr/bin/touch -r "${F}" "${TMP_FILE}"
+            /bin/mv -f "${TMP_FILE}" "${F}"
+        fi
+    done
+}
+
+rename_files()
+{
+    SUBST="$1"
+    shift
+    for F; do
+        N=$(dirname "${F}")/$(basename "${F}" | /bin/sed -e "${SUBST}")
+        if [ "${F}" != "${N}" ]; then
+            /bin/mv "${F}" "${N}"
+        fi
+    done
+}
+
+main "$@"

Modified: vdr/vdr/trunk/debian/patchlevel.sh
===================================================================
--- vdr/vdr/trunk/debian/patchlevel.sh	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr/trunk/debian/patchlevel.sh	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,22 @@
-#!/bin/sh
+# patchlevel.sh - maintain the patchlevel of vdr packages
+#
+# This script is called in debian/rules of the vdr package and all vdr plugins.
+#
+# In the vdr package it is used to generate the patchlevel file:
+#     sh debian/patchlevel.sh make
+# to remove it:
+#     sh debian/patchlevel.sh clean
+# and to set the substitution variable "vdr:Patchlevel":
+#     sh debian/patchlevel.sh subst
+#
+# The vdr plugins read the patchlevel from /usr/include/vdr/patchlevel installed
+# by the vdr-dev package and set the substitution variable:
+#     sh /usr/share/vdr-dev/patchlevel.sh subst
+#
+# This substitution variable is used in the debian/control file of the vdr
+# package and all vdr plugins:
+#     XB-VDR-Patchlevel: ${vdr:Patchlevel}
+
 set -e
 case "$*" in
     "make")
@@ -41,4 +59,3 @@
         exit 1
         ;;
 esac
-exit 0

Modified: vdr/vdr/trunk/debian/plugin-template/rules
===================================================================
--- vdr/vdr/trunk/debian/plugin-template/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr/trunk/debian/plugin-template/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr/trunk/debian/rules
===================================================================
--- vdr/vdr/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh debian/make-special-vdr
+#! /bin/sh debian/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -73,9 +73,7 @@
 	dh_clean -k
 	dh_installdirs
 	dh_install
-	chmod +x $(CURDIR)/debian/vdr/usr/lib/vdr/vdr-* \
-	  $(CURDIR)/debian/vdr-dev/usr/lib/vdr-dev/patchlevel.sh \
-	  $(CURDIR)/debian/vdr-dev/usr/lib/vdr-dev/dependencies.sh
+	chmod +x $(CURDIR)/debian/vdr/usr/lib/vdr/vdr-*
 
 # Build architecture-independent files here.
 binary-indep: build install

Modified: vdr/vdr/trunk/debian/vdr-dev.install
===================================================================
--- vdr/vdr/trunk/debian/vdr-dev.install	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr/trunk/debian/vdr-dev.install	2007-01-13 20:49:10 UTC (rev 3861)
@@ -9,10 +9,10 @@
 
 debian/lintian/vdr-dev          usr/share/lintian/overrides/
 
-debian/patchlevel.sh            usr/lib/vdr-dev/
+debian/patchlevel.sh            usr/share/vdr-dev/
 
 patchlevel                      usr/include/vdr/
 
-debian/dependencies.sh          usr/lib/vdr-dev/
+debian/dependencies.sh          usr/share/vdr-dev/
 
-debian/make-special-vdr         usr/lib/vdr-dev/
+debian/make-special-vdr.sh      usr/share/vdr-dev/

Modified: vdr/vdr-plugin-advchctrl/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-advchctrl/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-advchctrl/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-advchctrl/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-advchctrl/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-advchctrl/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-alcd/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-alcd/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-alcd/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -7,6 +7,8 @@
 
   [ Thomas Günther ]
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-alcd/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-alcd/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-alcd/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -83,8 +83,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-autosort/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-autosort/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-autosort/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-autosort/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-autosort/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-autosort/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -86,8 +86,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-calc/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-calc/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-calc/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-calc/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-calc/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-calc/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-cdda/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-cdda/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-cdda/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-cdda/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-channelscan/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-channelscan/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-channelscan/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-channelscan/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-channelscan/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-channelscan/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -83,8 +83,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-chanorg/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-chanorg/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-chanorg/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-chanorg/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-chanorg/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-chanorg/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-console/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-console/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
   * Install HISTORY as changelog
   * Using debian/compat now
   * Shortened debian/copyright

Modified: vdr/vdr-plugin-console/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-console/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -83,8 +83,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-decruft/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-decruft/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-decruft/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-decruft/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-decruft/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-decruft/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-dvd/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-dvd/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-dvd/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-dvd/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-dxr3/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-dxr3/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -4,6 +4,8 @@
 
   [ Thomas Günther ]
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Removed 10_em8300_mc_path.dpatch - since em8300 0.16.0-1 the firmware is

Modified: vdr/vdr-plugin-dxr3/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-dxr3/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-eggtimer/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-eggtimer/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-eggtimer/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-eggtimer/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-eggtimer/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-eggtimer/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-epgsearch/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-epgsearch/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-epgsearch/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-epgsearch/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-epgsearch/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-epgsearch/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -83,8 +83,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -4,6 +4,8 @@
 
   [ Thomas Günther ]
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * New upstream release

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-femon/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-femon/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-femon/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-femon/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-ffnetdev/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-ffnetdev/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-ffnetdev/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-ffnetdev/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-ffnetdev/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-ffnetdev/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-freecell/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-freecell/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
   * Using debian/compat now
 
   [ Tobias Grimm ]

Modified: vdr/vdr-plugin-freecell/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-freecell/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-fussball/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-fussball/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-fussball/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-fussball/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-fussball/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-fussball/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-games/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-games/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-games/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-games/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-games/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-games/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-image/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-image/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-image/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-image/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-image/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-image/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-mlist/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-mlist/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-mlist/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-mlist/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-mlist/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-mlist/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-mp3/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-mp3/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -4,6 +4,8 @@
 
   [ Thomas Günther ]
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Now also compiling vdr-plugin-mplayer as mplayer has officially become

Modified: vdr/vdr-plugin-mp3/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-mp3/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -98,8 +98,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-muggle/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-muggle/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-muggle/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-muggle/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -88,8 +88,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-nordlichtsepg/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-nordlichtsepg/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-nordlichtsepg/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-nordlichtsepg/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-nordlichtsepg/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-nordlichtsepg/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-osdteletext/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-osdteletext/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-osdtest256/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-osdtest256/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-osdtest256/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-osdtest256/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-osdtest256/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-osdtest256/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-playlist/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-playlist/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-playlist/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-playlist/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-prefermenu/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
   * Using debian/compat now
 
   [ Tobias Grimm ]

Modified: vdr/vdr-plugin-prefermenu/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-radio/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-radio/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-radio/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,10 +3,12 @@
   * NOT RELEASED YET
 
   [ Tobias Grimm ]
-  *  New upstream release
+  * New upstream release
+  * Build-Depend on vdr-dev (>=1.4.5-1)
 
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
-  * Build-Depend on vdr-dev (>=1.4.5-1)
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
  -- Tobias Grimm <tg at e-tobi.net>  Sun,  7 Jan 2007 22:46:44 +0100
 

Modified: vdr/vdr-plugin-radio/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-radio/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-radio/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-radiolist/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-radiolist/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-radiolist/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-radiolist/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-radiolist/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-radiolist/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-recstatus/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-recstatus/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-recstatus/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-recstatus/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-recstatus/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-recstatus/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-reelchannelscan/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -83,8 +83,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-remote/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-remote/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-remote/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -7,6 +7,8 @@
 
   [ Thomas Günther ]
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-remote/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-remote/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-remote/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -86,8 +86,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-remoteosd/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-remoteosd/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-remoteosd/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-remoteosd/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-remoteosd/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-remoteosd/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-rssreader/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-rssreader/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-rssreader/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-rssreader/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-rssreader/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-rssreader/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-serial/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-serial/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-serial/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-serial/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-serial/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-serial/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-skinsoppalusikka/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-skinsoppalusikka/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-skinsoppalusikka/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,6 +1,13 @@
 vdr-plugin-skinsoppalusikka (1.0.2-4) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+
+  [ Thomas Günther ]
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
+
+  [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)
 
  -- Tobias Grimm <tg at e-tobi.net>  Sun,  7 Jan 2007 22:46:37 +0100

Modified: vdr/vdr-plugin-skinsoppalusikka/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-skinsoppalusikka/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-skinsoppalusikka/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -12,12 +12,6 @@
 	INSTALL_PROGRAM += -s
 endif
 
-# 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
-
 # To use dpatch uncomment the following line and set Build-Depends to dpatch
 # DPATCH=yes
 
@@ -29,6 +23,8 @@
 unpatch:
 endif
 
+MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=.
+
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
@@ -37,7 +33,7 @@
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-	$(MAKE) all VDRDIR=/usr/include/$(VDR) LIBDIR=.
+	$(MAKE) all $(MAKE_OPTIONS)
 	touch build-stamp
 
 clean: clean-patched unpatch
@@ -45,7 +41,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	-$(MAKE) -o .dependencies clean
+	-$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
 	rm -f libvdr-*.so.*
 	dh_clean
 
@@ -55,7 +51,7 @@
 	dh_clean -k
 	dh_installdirs
 	dh_install
-	cd $(CURDIR)/debian/$(VDR)-plugin-skinsoppalusikka/var/lib/$(VDR)/plugins/skinsoppalusikka;\
+	cd $(CURDIR)/debian/vdr-plugin-skinsoppalusikka/var/lib/vdr/plugins/skinsoppalusikka;\
 	    ln -sf "CANAL+ Film 2.xpm"   "CANAL+ FILM 2.xpm";\
 	    ln -sf "CANAL+ Film 3.xpm"   "CANAL+ FILM 3.xpm";\
 	    ln -sf "CANAL+ Film.xpm"     "CANAL+ FILM.xpm";\
@@ -112,8 +108,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-softdevice/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-softdevice/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-softdevice/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-softdevice/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -83,8 +83,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-softplay/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-softplay/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-softplay/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-softplay/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-softplay/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-softplay/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-solitaire/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-solitaire/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-solitaire/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-solitaire/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-solitaire/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-solitaire/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-spider/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-spider/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-spider/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-spider/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-spider/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-spider/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-statusleds/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-statusleds/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-statusleds/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-statusleds/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-statusleds/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-statusleds/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-streamdev/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-streamdev/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-streamdev/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-streamdev/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -84,8 +84,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-sudoku/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-sudoku/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-sudoku/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-sudoku/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-sudoku/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-sudoku/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-svdrpext/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-svdrpext/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-svdrpext/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-svdrpext/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-svdrpext/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-svdrpext/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-svdrpservice/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-svdrpservice/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-svdrpservice/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-svdrpservice/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-svdrpservice/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-svdrpservice/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-sysinfo/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-sysinfo/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-sysinfo/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-sysinfo/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-sysinfo/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-sysinfo/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-text2skin/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-text2skin/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,6 +1,13 @@
 vdr-plugin-text2skin (1.0+cvs20050618-25) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+
+  [ Thomas Günther ]
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
+
+  [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)
 
  -- Tobias Grimm <tg at e-tobi.net>  Sun,  7 Jan 2007 22:46:30 +0100

Modified: vdr/vdr-plugin-text2skin/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-text2skin/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -12,12 +12,6 @@
 	INSTALL_PROGRAM += -s
 endif
 
-# 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
-
 # To use dpatch uncomment the following line and set Build-Depends to dpatch
 DPATCH=yes
 
@@ -29,6 +23,8 @@
 unpatch:
 endif
 
+MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=.
+
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
@@ -37,7 +33,7 @@
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-	$(MAKE) all DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=.
+	$(MAKE) all $(MAKE_OPTIONS)
 	touch build-stamp
 
 clean: clean-patched unpatch
@@ -45,7 +41,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	-$(MAKE) -o .dependencies clean
+	-$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
 	rm -f libvdr-*.so.*
 	dh_clean
 
@@ -86,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-timeline/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-timeline/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-timeline/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-timeline/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-timeline/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-timeline/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-vcd/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-vcd/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-vcd/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
   * Install HISTORY as changelog
   * Using debian/compat now
   * Shortened debian/copyright

Modified: vdr/vdr-plugin-vcd/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-vcd/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-vcd/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-vdrcd/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-vdrcd/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-vdrcd/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-vdrcd/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-vdrcd/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-vdrcd/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -83,8 +83,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-wapd/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-wapd/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-wapd/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-wapd/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -69,8 +69,8 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-weather/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-weather/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-weather/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
   * Using debian/compat now
 
   [ Tobias Grimm ]

Modified: vdr/vdr-plugin-weather/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-weather/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-weather/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-xine/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-xine/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-xine/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-xine/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # -*- makefile -*-
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
@@ -78,8 +78,8 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -89,8 +89,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr-plugin-zaphistory/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-zaphistory/trunk/debian/changelog	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-zaphistory/trunk/debian/changelog	2007-01-13 20:49:10 UTC (rev 3861)
@@ -3,6 +3,8 @@
   [ Thomas Günther ]
   * NOT RELEASED YET
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Adapted call of dependencies.sh and patchlevel.sh to the new location
+    in /usr/share/vdr-dev/
 
   [ Tobias Grimm ]
   * Build-Depend on vdr-dev (>=1.4.5-1)

Modified: vdr/vdr-plugin-zaphistory/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-zaphistory/trunk/debian/rules	2007-01-13 20:26:36 UTC (rev 3860)
+++ vdr/vdr-plugin-zaphistory/trunk/debian/rules	2007-01-13 20:49:10 UTC (rev 3861)
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -82,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/vdr-dev/patchlevel.sh subst
-	/usr/lib/vdr-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb




More information about the pkg-vdr-dvb-changes mailing list