r3766 - 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-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-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-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-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]

Author: tom-guest
Date: 2006-12-17 18:00:15 +0100 (Sun, 17 Dec 2006)
New Revision: 3766

Added:
   vdr/vdr-plugin-console/trunk/debian/compat
   vdr/vdr-plugin-freecell/trunk/debian/compat
   vdr/vdr-plugin-prefermenu/trunk/debian/compat
   vdr/vdr-plugin-vcd/trunk/debian/compat
   vdr/vdr-plugin-weather/trunk/debian/compat
   vdr/vdr/trunk/debian/make-special-vdr
Modified:
   vdr/vdr-plugin-advchctrl/trunk/debian/changelog
   vdr/vdr-plugin-advchctrl/trunk/debian/control
   vdr/vdr-plugin-advchctrl/trunk/debian/rules
   vdr/vdr-plugin-alcd/trunk/debian/changelog
   vdr/vdr-plugin-alcd/trunk/debian/control
   vdr/vdr-plugin-alcd/trunk/debian/rules
   vdr/vdr-plugin-autosort/trunk/debian/changelog
   vdr/vdr-plugin-autosort/trunk/debian/control
   vdr/vdr-plugin-autosort/trunk/debian/rules
   vdr/vdr-plugin-bitstreamout/trunk/debian/changelog
   vdr/vdr-plugin-bitstreamout/trunk/debian/control
   vdr/vdr-plugin-bitstreamout/trunk/debian/rules
   vdr/vdr-plugin-calc/trunk/debian/changelog
   vdr/vdr-plugin-calc/trunk/debian/control
   vdr/vdr-plugin-calc/trunk/debian/rules
   vdr/vdr-plugin-cdda/trunk/debian/changelog
   vdr/vdr-plugin-cdda/trunk/debian/control
   vdr/vdr-plugin-cdda/trunk/debian/rules
   vdr/vdr-plugin-channelscan/trunk/debian/changelog
   vdr/vdr-plugin-channelscan/trunk/debian/control
   vdr/vdr-plugin-channelscan/trunk/debian/rules
   vdr/vdr-plugin-chanorg/trunk/debian/changelog
   vdr/vdr-plugin-chanorg/trunk/debian/control
   vdr/vdr-plugin-chanorg/trunk/debian/rules
   vdr/vdr-plugin-console/trunk/debian/changelog
   vdr/vdr-plugin-console/trunk/debian/control
   vdr/vdr-plugin-console/trunk/debian/copyright
   vdr/vdr-plugin-console/trunk/debian/docs
   vdr/vdr-plugin-console/trunk/debian/install
   vdr/vdr-plugin-console/trunk/debian/rules
   vdr/vdr-plugin-console/trunk/debian/watch
   vdr/vdr-plugin-decruft/trunk/debian/changelog
   vdr/vdr-plugin-decruft/trunk/debian/control
   vdr/vdr-plugin-decruft/trunk/debian/rules
   vdr/vdr-plugin-dvd/trunk/debian/changelog
   vdr/vdr-plugin-dvd/trunk/debian/control
   vdr/vdr-plugin-dvd/trunk/debian/rules
   vdr/vdr-plugin-dxr3/trunk/debian/changelog
   vdr/vdr-plugin-dxr3/trunk/debian/control
   vdr/vdr-plugin-dxr3/trunk/debian/rules
   vdr/vdr-plugin-eggtimer/trunk/debian/changelog
   vdr/vdr-plugin-eggtimer/trunk/debian/control
   vdr/vdr-plugin-eggtimer/trunk/debian/rules
   vdr/vdr-plugin-extrecmenu/trunk/debian/changelog
   vdr/vdr-plugin-extrecmenu/trunk/debian/control
   vdr/vdr-plugin-extrecmenu/trunk/debian/rules
   vdr/vdr-plugin-femon/trunk/debian/changelog
   vdr/vdr-plugin-femon/trunk/debian/control
   vdr/vdr-plugin-femon/trunk/debian/rules
   vdr/vdr-plugin-ffnetdev/trunk/debian/changelog
   vdr/vdr-plugin-ffnetdev/trunk/debian/control
   vdr/vdr-plugin-ffnetdev/trunk/debian/rules
   vdr/vdr-plugin-freecell/trunk/debian/changelog
   vdr/vdr-plugin-freecell/trunk/debian/control
   vdr/vdr-plugin-freecell/trunk/debian/rules
   vdr/vdr-plugin-fussball/trunk/debian/changelog
   vdr/vdr-plugin-fussball/trunk/debian/control
   vdr/vdr-plugin-fussball/trunk/debian/rules
   vdr/vdr-plugin-games/trunk/debian/changelog
   vdr/vdr-plugin-games/trunk/debian/control
   vdr/vdr-plugin-games/trunk/debian/rules
   vdr/vdr-plugin-mlist/trunk/debian/changelog
   vdr/vdr-plugin-mlist/trunk/debian/control
   vdr/vdr-plugin-mlist/trunk/debian/rules
   vdr/vdr-plugin-mp3/trunk/debian/changelog
   vdr/vdr-plugin-mp3/trunk/debian/control
   vdr/vdr-plugin-mp3/trunk/debian/rules
   vdr/vdr-plugin-muggle/trunk/debian/changelog
   vdr/vdr-plugin-muggle/trunk/debian/control
   vdr/vdr-plugin-muggle/trunk/debian/rules
   vdr/vdr-plugin-nordlichtsepg/trunk/debian/changelog
   vdr/vdr-plugin-nordlichtsepg/trunk/debian/control
   vdr/vdr-plugin-nordlichtsepg/trunk/debian/rules
   vdr/vdr-plugin-osdteletext/trunk/debian/changelog
   vdr/vdr-plugin-osdteletext/trunk/debian/control
   vdr/vdr-plugin-osdteletext/trunk/debian/rules
   vdr/vdr-plugin-osdtest256/trunk/debian/changelog
   vdr/vdr-plugin-osdtest256/trunk/debian/control
   vdr/vdr-plugin-osdtest256/trunk/debian/rules
   vdr/vdr-plugin-playlist/trunk/debian/changelog
   vdr/vdr-plugin-playlist/trunk/debian/control
   vdr/vdr-plugin-playlist/trunk/debian/rules
   vdr/vdr-plugin-prefermenu/trunk/debian/changelog
   vdr/vdr-plugin-prefermenu/trunk/debian/control
   vdr/vdr-plugin-prefermenu/trunk/debian/rules
   vdr/vdr-plugin-radio/trunk/debian/changelog
   vdr/vdr-plugin-radio/trunk/debian/control
   vdr/vdr-plugin-radio/trunk/debian/rules
   vdr/vdr-plugin-radiolist/trunk/debian/changelog
   vdr/vdr-plugin-radiolist/trunk/debian/control
   vdr/vdr-plugin-radiolist/trunk/debian/rules
   vdr/vdr-plugin-recstatus/trunk/debian/changelog
   vdr/vdr-plugin-recstatus/trunk/debian/control
   vdr/vdr-plugin-recstatus/trunk/debian/rules
   vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog
   vdr/vdr-plugin-reelchannelscan/trunk/debian/control
   vdr/vdr-plugin-reelchannelscan/trunk/debian/rules
   vdr/vdr-plugin-remote/trunk/debian/changelog
   vdr/vdr-plugin-remote/trunk/debian/control
   vdr/vdr-plugin-remote/trunk/debian/rules
   vdr/vdr-plugin-remoteosd/trunk/debian/changelog
   vdr/vdr-plugin-remoteosd/trunk/debian/control
   vdr/vdr-plugin-remoteosd/trunk/debian/rules
   vdr/vdr-plugin-rssreader/trunk/debian/changelog
   vdr/vdr-plugin-rssreader/trunk/debian/control
   vdr/vdr-plugin-rssreader/trunk/debian/rules
   vdr/vdr-plugin-serial/trunk/debian/changelog
   vdr/vdr-plugin-serial/trunk/debian/control
   vdr/vdr-plugin-serial/trunk/debian/rules
   vdr/vdr-plugin-softdevice/trunk/debian/changelog
   vdr/vdr-plugin-softdevice/trunk/debian/control
   vdr/vdr-plugin-softdevice/trunk/debian/rules
   vdr/vdr-plugin-softplay/trunk/debian/changelog
   vdr/vdr-plugin-softplay/trunk/debian/control
   vdr/vdr-plugin-softplay/trunk/debian/rules
   vdr/vdr-plugin-solitaire/trunk/debian/changelog
   vdr/vdr-plugin-solitaire/trunk/debian/control
   vdr/vdr-plugin-solitaire/trunk/debian/rules
   vdr/vdr-plugin-spider/trunk/debian/changelog
   vdr/vdr-plugin-spider/trunk/debian/control
   vdr/vdr-plugin-spider/trunk/debian/rules
   vdr/vdr-plugin-statusleds/trunk/debian/changelog
   vdr/vdr-plugin-statusleds/trunk/debian/control
   vdr/vdr-plugin-statusleds/trunk/debian/rules
   vdr/vdr-plugin-streamdev/trunk/debian/changelog
   vdr/vdr-plugin-streamdev/trunk/debian/control
   vdr/vdr-plugin-streamdev/trunk/debian/rules
   vdr/vdr-plugin-sudoku/trunk/debian/changelog
   vdr/vdr-plugin-sudoku/trunk/debian/control
   vdr/vdr-plugin-sudoku/trunk/debian/rules
   vdr/vdr-plugin-svdrpext/trunk/debian/changelog
   vdr/vdr-plugin-svdrpext/trunk/debian/control
   vdr/vdr-plugin-svdrpext/trunk/debian/rules
   vdr/vdr-plugin-svdrpservice/trunk/debian/changelog
   vdr/vdr-plugin-svdrpservice/trunk/debian/control
   vdr/vdr-plugin-svdrpservice/trunk/debian/rules
   vdr/vdr-plugin-sysinfo/trunk/debian/changelog
   vdr/vdr-plugin-sysinfo/trunk/debian/control
   vdr/vdr-plugin-sysinfo/trunk/debian/rules
   vdr/vdr-plugin-timeline/trunk/debian/changelog
   vdr/vdr-plugin-timeline/trunk/debian/control
   vdr/vdr-plugin-timeline/trunk/debian/rules
   vdr/vdr-plugin-vcd/trunk/debian/changelog
   vdr/vdr-plugin-vcd/trunk/debian/control
   vdr/vdr-plugin-vcd/trunk/debian/copyright
   vdr/vdr-plugin-vcd/trunk/debian/docs
   vdr/vdr-plugin-vcd/trunk/debian/rules
   vdr/vdr-plugin-vdrcd/trunk/debian/changelog
   vdr/vdr-plugin-vdrcd/trunk/debian/control
   vdr/vdr-plugin-vdrcd/trunk/debian/rules
   vdr/vdr-plugin-wapd/trunk/debian/changelog
   vdr/vdr-plugin-wapd/trunk/debian/control
   vdr/vdr-plugin-wapd/trunk/debian/rules
   vdr/vdr-plugin-weather/trunk/debian/changelog
   vdr/vdr-plugin-weather/trunk/debian/control
   vdr/vdr-plugin-weather/trunk/debian/rules
   vdr/vdr-plugin-xine/trunk/debian/changelog
   vdr/vdr-plugin-xine/trunk/debian/control
   vdr/vdr-plugin-xine/trunk/debian/rules
   vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
   vdr/vdr-plugin-xineliboutput/trunk/debian/control
   vdr/vdr-plugin-xineliboutput/trunk/debian/rules
   vdr/vdr-plugin-zaphistory/trunk/debian/changelog
   vdr/vdr-plugin-zaphistory/trunk/debian/control
   vdr/vdr-plugin-zaphistory/trunk/debian/rules
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/plugin-template/rules
   vdr/vdr/trunk/debian/rules
   vdr/vdr/trunk/debian/vdr-dev.install
Log:
Replaced VDRdevel adaptions in debian/rules with make-special-vdr

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,10 +1,18 @@
 vdr (1.4.4-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+
+  [ Tobias Grimm ]
   * Removed Conflicts line from plugin template
 
- -- Tobias Grimm <tg at e-tobi.net>  Wed,  8 Nov 2006 22:40:36 +0100
+  [ 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
+    build plugin packages for special vdr packages
 
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:26:55 +0100
+
 vdr (1.4.4-1) unstable; urgency=low
 
   [ Tobias Grimm ]

Added: vdr/vdr/trunk/debian/make-special-vdr
===================================================================
--- vdr/vdr/trunk/debian/make-special-vdr	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr/trunk/debian/make-special-vdr	2006-12-17 17:00:15 UTC (rev 3766)
@@ -0,0 +1,740 @@
+#! /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 "$@"

Modified: vdr/vdr/trunk/debian/plugin-template/rules
===================================================================
--- vdr/vdr/trunk/debian/plugin-template/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr/trunk/debian/plugin-template/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: vdr/vdr/trunk/debian/rules
===================================================================
--- vdr/vdr/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh debian/make-special-vdr
 # 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,9 +23,8 @@
 unpatch:
 endif
 
-CFGDIR=/var/lib/$(VDR)
-PLUGINDIR=/usr/lib/$(VDR)/plugins
-VIDEODIR=/var/lib/video.00
+MAKE_OPTIONS = VFAT=1 DVBDIR=/usr CFGDIR=/var/lib/vdr \
+               VIDEODIR=/var/lib/video.00 PLUGINLIBDIR=/usr/lib/vdr/plugins
 
 configure: configure-stamp
 configure-stamp: patch-stamp
@@ -42,19 +35,16 @@
 build-stamp: configure-stamp
 	dh_testdir
 
-	$(MAKE) VFAT=1 DVBDIR=/usr \
-	        VIDEODIR=$(VIDEODIR) PLUGINLIBDIR=$(PLUGINDIR) CFGDIR=$(CFGDIR)
-	[ "$(VDR)" = "vdr" ] || \
-	    (cp vdr $(VDR); cp vdr.1 $(VDR).1; cp vdr.5 $(VDR).5)
-	ln -f $(VDR) $(VDR)-kbd
+	$(MAKE) all $(MAKE_OPTIONS)
+	ln -f vdr vdr-kbd
 
 	# plugins
 	mkdir -p PLUGINS/lib
-	$(MAKE) plugins
+	$(MAKE) plugins $(MAKE_OPTIONS)
 
-	cp newplugin $(VDR)-newplugin
+	cp newplugin vdr-newplugin
 
-	gcc -o debian/$(VDR)-shutdown.wrapper debian/$(VDR)-shutdown-wrapper.c
+	gcc -o debian/vdr-shutdown.wrapper debian/vdr-shutdown-wrapper.c
 
 	touch build-stamp
 
@@ -67,13 +57,12 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	-$(MAKE) -o .dependencies clean-plugins
-	-$(MAKE) -o .dependencies clean
-	[ "$(VDR)" = "vdr" ] || rm -f $(VDR) $(VDR).1 $(VDR).5
-	rm -f $(VDR)-kbd
+	-$(MAKE) -o .dependencies clean-plugins $(MAKE_OPTIONS)
+	-$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
+	rm -f vdr-kbd
 	rm -rf PLUGINS/lib
-	rm -f $(VDR)-newplugin
-	rm -f debian/$(VDR)-shutdown.wrapper
+	rm -f vdr-newplugin
+	rm -f debian/vdr-shutdown.wrapper
 	sh debian/patchlevel.sh clean
 	rm -f debian/patchinfo
 	dh_clean
@@ -84,9 +73,9 @@
 	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-* \
+	  $(CURDIR)/debian/vdr-dev/usr/lib/vdr-dev/patchlevel.sh \
+	  $(CURDIR)/debian/vdr-dev/usr/lib/vdr-dev/dependencies.sh
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -124,7 +113,7 @@
 	dh_testdir -a
 	dh_testroot -a
 	dh_installdebconf -a
-	dh_installdocs -a -N$(VDR)-dbg -N$(VDR)-plugin-examples
+	dh_installdocs -a -Nvdr-dbg -Nvdr-plugin-examples
 	dh_installexamples -a
 	dh_installmenu -a
 #	dh_installlogrotate -a
@@ -136,8 +125,8 @@
 	dh_installman -a
 #	dh_installinfo -a
 #	dh_undocumented -a
-	dh_installchangelogs -p$(VDR) HISTORY
-	dh_installchangelogs -p$(VDR)-plugin-sky PLUGINS/src/sky/HISTORY
+	dh_installchangelogs -pvdr HISTORY
+	dh_installchangelogs -pvdr-plugin-sky PLUGINS/src/sky/HISTORY
 	dh_link -a
 	dh_strip -a
 	dh_compress -a

Modified: vdr/vdr/trunk/debian/vdr-dev.install
===================================================================
--- vdr/vdr/trunk/debian/vdr-dev.install	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr/trunk/debian/vdr-dev.install	2006-12-17 17:00:15 UTC (rev 3766)
@@ -14,3 +14,5 @@
 patchlevel                      usr/include/vdr/
 
 debian/dependencies.sh          usr/lib/vdr-dev/
+
+debian/make-special-vdr         usr/lib/vdr-dev/

Modified: vdr/vdr-plugin-advchctrl/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-advchctrl/trunk/debian/changelog	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-advchctrl/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-advchctrl (0.0.5-10) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:02 +0100
+
 vdr-plugin-advchctrl (0.0.5-9) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-advchctrl/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-advchctrl/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-advchctrl/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), dpatch
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-advchctrl

Modified: vdr/vdr-plugin-advchctrl/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-advchctrl/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-advchctrl/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-alcd/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,10 +1,16 @@
 vdr-plugin-alcd (1.0.0-6) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+
+  [ Tobias Grimm ]
   * Made activy_off.sh executable (reported by Marcel Jueling)
 
- -- Tobias Grimm <tg at e-tobi.net>  Mon,  4 Dec 2006 22:55:34 +0100
+  [ Thomas Günther ]
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
 
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:03 +0100
+
 vdr-plugin-alcd (1.0.0-5) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-alcd/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-alcd/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-alcd/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), dpatch (>= 2.0.9), vdr-dev (>= 1.4.4-1)
+Build-Depends: debhelper (>> 4.1.16), dpatch (>= 2.0.9), vdr-dev (>= 1.4.4-2)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-alcd

Modified: vdr/vdr-plugin-alcd/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-alcd/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-alcd/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
 
@@ -87,8 +83,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-autosort/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-autosort (0.0.10-9) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:03 +0100
+
 vdr-plugin-autosort (0.0.10-8) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-autosort/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-autosort/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-autosort/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), dpatch
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-autosort

Modified: vdr/vdr-plugin-autosort/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-autosort/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-autosort/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-bitstreamout (0.85-10) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:03 +0100
+
 vdr-plugin-bitstreamout (0.85-9) unstable; urgency=low
 
   * Added build dependency to po-debconf

Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>> 4.1.16), dpatch (>= 2.0.9), po-debconf, vdr-dev (>=1.4.4-1), libasound2-dev, libmad0-dev
+Build-Depends: debhelper (>> 4.1.16), dpatch (>= 2.0.9), po-debconf, vdr-dev (>= 1.4.4-2), libasound2-dev, libmad0-dev
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-bitstreamout

Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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=. CXXARCH=
+
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
@@ -37,7 +33,7 @@
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-	$(MAKE) all CXXARCH= 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.*
 
 	# Update debconf-templates:                                             
@@ -90,8 +86,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-calc/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-calc (0+0.0.1rc5-13) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:03 +0100
+
 vdr-plugin-calc (0+0.0.1rc5-12) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-calc/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-calc/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-calc/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), dpatch
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-calc

Modified: vdr/vdr-plugin-calc/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-calc/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-calc/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-cdda/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-cdda (0.1.0-11) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:04 +0100
+
 vdr-plugin-cdda (0.1.0-10) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-cdda/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-cdda/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), libcdio-dev (>= 0.76), libmad0-dev, dpatch
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), libcdio-dev (>= 0.76), libmad0-dev, dpatch
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-cdda

Modified: vdr/vdr-plugin-cdda/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-cdda/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-channelscan/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-channelscan (0.0.5a-12) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:04 +0100
+
 vdr-plugin-channelscan (0.0.5a-11) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-channelscan/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-channelscan/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-channelscan/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), dpatch
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-channelscan

Modified: vdr/vdr-plugin-channelscan/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-channelscan/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-channelscan/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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,9 @@
 unpatch:
 endif
 
+MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. \
+               INCLUDES=-I/usr/include/vdr
+
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
@@ -37,8 +34,7 @@
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-	$(MAKE) all DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=. \
-	    INCLUDES=-I/usr/include/$(VDR)
+	$(MAKE) all $(MAKE_OPTIONS)
 	touch build-stamp
 
 clean: clean-patched unpatch
@@ -46,7 +42,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
 
@@ -87,8 +83,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-chanorg/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-chanorg (0.0.6-6) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:04 +0100
+
 vdr-plugin-chanorg (0.0.6-5) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-chanorg/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-chanorg/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-chanorg/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), dpatch
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-chanorg

Modified: vdr/vdr-plugin-chanorg/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-chanorg/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-chanorg/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-console/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,16 @@
+vdr-plugin-console (0.6.0-26) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+  * Install HISTORY as changelog
+  * Using debian/compat now
+  * Shortened debian/copyright
+  * Fixed debian/watch
+  * Replaced tabs with spaces
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:04 +0100
+
 vdr-plugin-console (0.6.0-25) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)
@@ -219,7 +232,7 @@
   * Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>
     - First upload to the official archive (closes: #278045) 
     - Added watch-file
-    - Added patchlevel-mechanism, to be compatible with c't-vdr		 
+    - Added patchlevel-mechanism, to be compatible with c't-vdr
     - Use dh_install
     - Changed maintainer to Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
     - Use dpatch, so build-dep on dpatch

Added: vdr/vdr-plugin-console/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/compat	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-console/trunk/debian/compat	2006-12-17 17:00:15 UTC (rev 3766)
@@ -0,0 +1 @@
+4

Modified: vdr/vdr-plugin-console/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-console/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,14 +3,14 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>=1.4.4-1), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch (>= 2.0.9)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-console
 Architecture: any
 Depends: ${shlibs:Depends}, ${vdr:Depends}
 Description: Plugin for vdr that implements a virtual terminal
- This plugin for VDR implements a virtual terminal, that can be 
- displayed by VDR's OSD, it allows you to display and control 
- allmost every console application.
-XB-VDR-Patchlevel: ${vdr:Patchlevel} 
+ This plugin for VDR implements a virtual terminal, that can be
+ displayed by VDR's OSD, it allows you to display and control
+ almost every console application.
+XB-VDR-Patchlevel: ${vdr:Patchlevel}

Modified: vdr/vdr-plugin-console/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/copyright	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-console/trunk/debian/copyright	2006-12-17 17:00:15 UTC (rev 3766)
@@ -8,24 +8,10 @@
 Debian Maintainers:
 
   Tobias Grimm <tg at e-tobi.net>
+  Thomas Günther <tom at toms-cafe.de>
   Thomas Schmidt <tschmidt at debian.org>
 
 Copyright:
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software 
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-  MA 02110-1301, USA.
-
- see /usr/share/common-licenses/GPL
-
+It may be redistributed under the terms of the GNU GPL, Version 2
+found on Debian systems in the file /usr/share/common-licenses/GPL .

Modified: vdr/vdr-plugin-console/trunk/debian/docs
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/docs	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-console/trunk/debian/docs	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,2 +1 @@
 README
-HISTORY

Modified: vdr/vdr-plugin-console/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/install	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-console/trunk/debian/install	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,5 +1,5 @@
-debian/default-message		usr/share/vdr-plugin-console
+debian/default-message          usr/share/vdr-plugin-console/
 
-debian/plugin.console.conf	etc/vdr/plugins
+debian/plugin.console.conf      etc/vdr/plugins/
 
-libvdr-*.so.* usr/lib/vdr/plugins
+libvdr-console.so.*             usr/lib/vdr/plugins/

Modified: vdr/vdr-plugin-console/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-console/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,16 +1,10 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
-# include dpatch stuff
-include /usr/share/dpatch/dpatch.make
-
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
 endif
@@ -18,38 +12,37 @@
 	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/-.*//")
+# To use dpatch uncomment the following line and set Build-Depends to dpatch
+DPATCH=yes
 
-PACKAGE=$(VDR)-plugin-console
-VDRDIR=/usr/include/$(VDR)
-DVBDIR=/usr/include
+ifdef DPATCH
+include /usr/share/dpatch/dpatch.make
+else
+patch:
+patch-stamp:
+unpatch:
+endif
 
+MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=.
+
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch-stamp
 	dh_testdir
-
 	touch configure-stamp
 
-
-build: patch-stamp build-stamp
-
-build-stamp: configure-stamp 
+build: build-stamp
+build-stamp: configure-stamp
 	dh_testdir
-
-	$(MAKE) all DVBDIR=/usr/include VDRDIR=/usr/include/vdr LIBDIR=. REMOTE=lirc
-
+	$(MAKE) all $(MAKE_OPTIONS)
 	touch build-stamp
 
 clean: clean-patched unpatch
-
 clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	rm -f libvdr-*.so*
-	-make clean
-
+	-$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
+	rm -f libvdr-*.so.*
 	dh_clean
 
 install: build
@@ -58,7 +51,7 @@
 	dh_clean -k
 	dh_installdirs
 	dh_install
-	chmod 0755 $(CURDIR)/debian/$(VDR)-plugin-console/usr/share/$(VDR)-plugin-console/default-message
+	chmod 0755 $(CURDIR)/debian/vdr-plugin-console/usr/share/vdr-plugin-console/default-message
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -68,24 +61,34 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
+#	dh_installdebconf
 	dh_installdocs
 	dh_installexamples
-	dh_installmenu
-	dh_installcron
-	dh_installman
-	dh_installinfo
-	dh_installchangelogs 
+#	dh_installmenu
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installman
+#	dh_installinfo
+#	dh_undocumented
+	dh_installchangelogs HISTORY
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
+#	dh_makeshlibs
 	dh_installdeb
+#	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch configure
+.PHONY: build clean binary-indep binary-arch binary install configure \
+        clean-patched patch unpatch

Modified: vdr/vdr-plugin-console/trunk/debian/watch
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/watch	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-console/trunk/debian/watch	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,2 +1,2 @@
 version=2
-http://ricomp.de/vdr/vdr-console-(.*).tgz
+http://ricomp.de/vdr/vdr-console-(.*)\.tgz

Modified: vdr/vdr-plugin-decruft/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-decruft/trunk/debian/changelog	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-decruft/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-decruft (0.0.4-3) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:05 +0100
+
 vdr-plugin-decruft (0.0.4-2) unstable; urgency=low
 
   * Bumped Standards-Version to 3.7.2

Modified: vdr/vdr-plugin-decruft/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-decruft/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-decruft/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -2,7 +2,7 @@
 Section: misc
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
-Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.4-1)
+Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.4-2)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-decruft

Modified: vdr/vdr-plugin-decruft/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-decruft/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-decruft/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-dvd/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-dvd (0.3.6~b03-3) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:05 +0100
+
 vdr-plugin-dvd (0.3.6~b03-2) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-dvd/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-dvd/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>
-Build-Depends: debhelper (>> 4.1.16), liba52-0.7.4-dev, vdr-dev (>=1.4.4-1), libdvdnav-dev (>=0.1.9), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), liba52-0.7.4-dev, vdr-dev (>= 1.4.4-2), libdvdnav-dev (>=0.1.9), dpatch (>= 2.0.9)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-dvd

Modified: vdr/vdr-plugin-dvd/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-dvd/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-dxr3/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-dxr3 (0.2.6-8) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:05 +0100
+
 vdr-plugin-dxr3 (0.2.6-7) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-dxr3/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-dxr3/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Nicolas Boullis <nboullis at debian.org>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), dpatch (>= 2.0.9), vdr-dev (>= 1.4.4-1), libavcodec-dev (>= 0.cvs20060329-1), em8300-headers
+Build-Depends: debhelper (>> 4.1.16), dpatch (>= 2.0.9), vdr-dev (>= 1.4.4-2), libavcodec-dev (>= 0.cvs20060329-1), em8300-headers
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-dxr3

Modified: vdr/vdr-plugin-dxr3/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-dxr3/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-eggtimer/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-eggtimer (0.9.5-3) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:05 +0100
+
 vdr-plugin-eggtimer (0.9.5-2) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-eggtimer/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-eggtimer/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-eggtimer/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Günther <tom at toms-cafe.de>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-eggtimer

Modified: vdr/vdr-plugin-eggtimer/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-eggtimer/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-eggtimer/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-extrecmenu (0.12a-5) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:06 +0100
+
 vdr-plugin-extrecmenu (0.12a-4) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), dpatch
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-extrecmenu

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-femon/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-femon (1.1.0-4) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:06 +0100
+
 vdr-plugin-femon (1.1.0-3) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-femon/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-femon/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-femon

Modified: vdr/vdr-plugin-femon/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-femon/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
 
@@ -86,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-ffnetdev/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-ffnetdev (0.1.0+svn20060625-5) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:06 +0100
+
 vdr-plugin-ffnetdev (0.1.0+svn20060625-4) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-ffnetdev/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-ffnetdev/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-ffnetdev/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), dpatch (>= 2.0.9), vdr-dev (>= 1.4.4-1)
+Build-Depends: debhelper (>> 4.1.16), dpatch (>= 2.0.9), vdr-dev (>= 1.4.4-2)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-ffnetdev

Modified: vdr/vdr-plugin-ffnetdev/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-ffnetdev/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-ffnetdev/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-freecell/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,12 @@
+vdr-plugin-freecell (0.0.2-29) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+  * Using debian/compat now
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:06 +0100
+
 vdr-plugin-freecell (0.0.2-28) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Added: vdr/vdr-plugin-freecell/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/compat	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-freecell/trunk/debian/compat	2006-12-17 17:00:15 UTC (rev 3766)
@@ -0,0 +1 @@
+4

Modified: vdr/vdr-plugin-freecell/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-freecell/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>=1.4.4-1), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch (>= 2.0.9)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-freecell

Modified: vdr/vdr-plugin-freecell/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-freecell/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,13 +1,10 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
 endif
@@ -15,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/-.*//")
-
-VDRDIR=/usr/include/$(VDR)
-PACKAGE=$(VDR)-plugin-freecell
-
 # To use dpatch uncomment the following line and set Build-Depends to dpatch
 DPATCH=yes
 
@@ -32,6 +23,8 @@
 unpatch:
 endif
 
+MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=.
+
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
@@ -40,15 +33,15 @@
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-	$(MAKE) all DVBDIR=/usr VDRDIR=$(VDRDIR) LIBDIR=.
+	$(MAKE) all $(MAKE_OPTIONS)
 	touch build-stamp
 
-clean: clean1 unpatch
-clean1:
+clean: clean-patched unpatch
+clean-patched:
 	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
 
@@ -67,21 +60,34 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
+#	dh_installdebconf
 	dh_installdocs
 	dh_installexamples
+#	dh_installmenu
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installman
+#	dh_installinfo
+#	dh_undocumented
 	dh_installchangelogs HISTORY
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
+#	dh_makeshlibs
 	dh_installdeb
+#	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst	
-	/usr/lib/$(VDR)-dev/dependencies.sh	
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure \
-        clean1 patch unpatch
+        clean-patched patch unpatch

Modified: vdr/vdr-plugin-fussball/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-fussball/trunk/debian/changelog	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-fussball/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-fussball (0.0.3b-4) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:07 +0100
+
 vdr-plugin-fussball (0.0.3b-3) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-fussball/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-fussball/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-fussball/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), dpatch
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-fussball

Modified: vdr/vdr-plugin-fussball/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-fussball/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-fussball/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-games/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-games (0.6.3-6) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:07 +0100
+
 vdr-plugin-games (0.6.3-5) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-games/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-games/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-games/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>=1.4.4-1), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch (>= 2.0.9)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-games

Modified: vdr/vdr-plugin-games/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-games/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-games/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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 VDRDIR=/usr/include/$(VDR)
+	-$(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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-mlist/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-mlist (0.0.3-6) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:07 +0100
+
 vdr-plugin-mlist (0.0.3-5) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-mlist/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-mlist/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-mlist/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-mlist

Modified: vdr/vdr-plugin-mlist/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-mlist/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-mlist/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
 
@@ -86,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-mp3/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-mp3 (0.9.15-6) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:08 +0100
+
 vdr-plugin-mp3 (0.9.15-5) unstable; urgency=low
 
   * Fixed encoding of Thomas Günther's name in debian/copyright

Modified: vdr/vdr-plugin-mp3/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-mp3/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,14 +3,13 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>
-Build-Depends: debhelper (>> 4.1.16), dpatch (>= 2.0.9), vdr-dev (>=1.4.4-1), libsndfile1-dev, libid3tag0-dev, libmad0-dev, libvorbis-dev
+Build-Depends: debhelper (>> 4.1.16), dpatch (>= 2.0.9), vdr-dev (>= 1.4.4-2), libsndfile1-dev, libid3tag0-dev, libmad0-dev, libvorbis-dev
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-mp3
 Architecture: any
 Depends: ${shlibs:Depends}, ${vdr:Depends}, eject
 Suggests: mjpegtools (>=1:1.8.0), netpbm
-Conflicts: ${vdr:Conflicts}
 Description: MP3 playback plugin for VDR
  This plugin for VDR allows to play back mp3's, ogg-files and 
  audio-cds.

Modified: vdr/vdr-plugin-mp3/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-mp3/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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,9 @@
 unpatch:
 endif
 
+MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. \
+               WITH_OSS_OUTPUT=1 WITHOUT_MPLAYER=1
+
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
@@ -37,8 +34,7 @@
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-	$(MAKE) all VDRDIR=/usr/include/$(VDR) LIBDIR=. \
-	  WITH_OSS_OUTPUT=1 WITHOUT_MPLAYER=1
+	$(MAKE) all $(MAKE_OPTIONS)
 	touch build-stamp
 
 clean: clean-patched unpatch
@@ -46,7 +42,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
 
@@ -58,13 +54,13 @@
 	dh_install
 
 	install -m 755 $(CURDIR)/debian/mount.sh \
-	  $(CURDIR)/debian/$(VDR)-plugin-mp3/usr/share/$(VDR)-plugin-mp3/mount
+	  $(CURDIR)/debian/vdr-plugin-mp3/usr/share/vdr-plugin-mp3/mount
 
 	install -m 755 $(CURDIR)/examples/image_convert.sh.example \
-	  $(CURDIR)/debian/$(VDR)-plugin-mp3/usr/share/$(VDR)-plugin-mp3/image_convert
+	  $(CURDIR)/debian/vdr-plugin-mp3/usr/share/vdr-plugin-mp3/image_convert
 
 	cp $(CURDIR)/examples/mp3sources.conf.example \
-	  $(CURDIR)/debian/$(VDR)-plugin-mp3/etc/vdr/plugins/mp3sources.conf
+	  $(CURDIR)/debian/vdr-plugin-mp3/etc/vdr/plugins/mp3sources.conf
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -96,8 +92,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-muggle/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-muggle (0.1.11-5) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:08 +0100
+
 vdr-plugin-muggle (0.1.11-4) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-muggle/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-muggle/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders:  Thomas Günther <tom at toms-cafe.de>, Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), dpatch (>= 2.0.9), libtag1-dev, libmysqlclient-dev, libmad0-dev, libvorbis-dev, libflac++-dev, libsndfile1-dev
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch (>= 2.0.9), libtag1-dev, libmysqlclient-dev, libmad0-dev, libvorbis-dev, libflac++-dev, libsndfile1-dev
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-muggle

Modified: vdr/vdr-plugin-muggle/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-muggle/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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,7 +23,7 @@
 unpatch:
 endif
 
-MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=. \
+MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. \
                HAVE_VORBISFILE=1 HAVE_FLAC=1 HAVE_SNDFILE=1 \
                HAVE_MYSQL=1 HAVE_ONLY_SERVER=1
 
@@ -94,8 +88,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-nordlichtsepg/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-nordlichtsepg (0.8a-10) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:08 +0100
+
 vdr-plugin-nordlichtsepg (0.8a-9) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-nordlichtsepg/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-nordlichtsepg/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-nordlichtsepg/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), dpatch
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-nordlichtsepg

Modified: vdr/vdr-plugin-nordlichtsepg/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-nordlichtsepg/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-nordlichtsepg/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-osdteletext (0.5.1-20) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:08 +0100
+
 vdr-plugin-osdteletext (0.5.1-19) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-osdteletext/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>= 4.1.16), vdr-dev (>=1.4.4-1), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>= 4.1.16), vdr-dev (>= 1.4.4-2), dpatch (>= 2.0.9)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-osdteletext

Modified: vdr/vdr-plugin-osdteletext/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-osdtest256/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-osdtest256 (0.1.0-13) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:09 +0100
+
 vdr-plugin-osdtest256 (0.1.0-12) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-osdtest256/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-osdtest256/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-osdtest256/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch (>= 2.0.9)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-osdtest256

Modified: vdr/vdr-plugin-osdtest256/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-osdtest256/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-osdtest256/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-playlist/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-playlist (0.0.1+0.0.2rc3-15) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:09 +0100
+
 vdr-plugin-playlist (0.0.1+0.0.2rc3-14) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-playlist/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-playlist/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch (>= 2.0.9)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-playlist

Modified: vdr/vdr-plugin-playlist/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-playlist/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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 VDRDIR=/usr/include/$(VDR)
+	-$(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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,12 @@
+vdr-plugin-prefermenu (0.6.6-6) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+  * Using debian/compat now
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:09 +0100
+
 vdr-plugin-prefermenu (0.6.6-5) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Added: vdr/vdr-plugin-prefermenu/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/compat	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/compat	2006-12-17 17:00:15 UTC (rev 3766)
@@ -0,0 +1 @@
+4

Modified: vdr/vdr-plugin-prefermenu/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>=1.4.4-1), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch (>= 2.0.9)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-prefermenu

Modified: vdr/vdr-plugin-prefermenu/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,16 +1,10 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
-# include dpatch stuff
-include /usr/share/dpatch/dpatch.make
-
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
 endif
@@ -18,38 +12,37 @@
 	INSTALL_PROGRAM += -s
 endif
 
-# Set VDR=vdr or VDR=vdrdevel
-VDR=$(shell dh_listpackages | grep "^vdr.*-" | head -n 1 | sed -e "s/-.*//")
+# To use dpatch uncomment the following line and set Build-Depends to dpatch
+DPATCH=yes
 
-PACKAGE=$(VDR)-plugin-prefermenu
-VDRDIR=/usr/include/$(VDR)
-DVBDIR=/usr/include
+ifdef DPATCH
+include /usr/share/dpatch/dpatch.make
+else
+patch:
+patch-stamp:
+unpatch:
+endif
 
+MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=.
+
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch-stamp
 	dh_testdir
-
 	touch configure-stamp
 
-
-build: patch-stamp build-stamp
-
-build-stamp: configure-stamp 
+build: build-stamp
+build-stamp: configure-stamp
 	dh_testdir
-
-	$(MAKE) all DVBDIR=/usr/include VDRDIR=/usr/include/vdr LIBDIR=.
-
+	$(MAKE) all $(MAKE_OPTIONS)
 	touch build-stamp
 
 clean: clean-patched unpatch
-
 clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	rm -f libvdr-*.so*
-	-make clean
-
+	-$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
+	rm -f libvdr-*.so.*
 	dh_clean
 
 install: build
@@ -57,7 +50,6 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
 	dh_install
 
 # Build architecture-independent files here.
@@ -68,24 +60,34 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
+#	dh_installdebconf
 	dh_installdocs
 	dh_installexamples
-	dh_installmenu
-	dh_installcron
-	dh_installman
-	dh_installinfo
-	dh_installchangelogs 
+#	dh_installmenu
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installman
+#	dh_installinfo
+#	dh_undocumented
+	dh_installchangelogs
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
+#	dh_makeshlibs
 	dh_installdeb
+#	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst	
-	/usr/lib/$(VDR)-dev/dependencies.sh	
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch configure
+.PHONY: build clean binary-indep binary-arch binary install configure \
+        clean-patched patch unpatch

Modified: vdr/vdr-plugin-radio/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-radio/trunk/debian/changelog	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-radio/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-radio (0.1.4-4) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:10 +0100
+
 vdr-plugin-radio (0.1.4-3) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-radio/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-radio/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-radio/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch (>= 2.0.9)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-radio

Modified: vdr/vdr-plugin-radio/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-radio/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-radio/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
 
@@ -86,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-radiolist/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-radiolist (0.0.2-3) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:09 +0100
+
 vdr-plugin-radiolist (0.0.2-2) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-radiolist/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-radiolist/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-radiolist/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-radiolist

Modified: vdr/vdr-plugin-radiolist/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-radiolist/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-radiolist/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-recstatus/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-recstatus (0+0.0.1.beta1-10) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:10 +0100
+
 vdr-plugin-recstatus (0+0.0.1.beta1-9) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-recstatus/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-recstatus/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-recstatus/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), dpatch
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-recstatus

Modified: vdr/vdr-plugin-recstatus/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-recstatus/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-recstatus/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-reelchannelscan (0.3.3-5) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:10 +0100
+
 vdr-plugin-reelchannelscan (0.3.3-4) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-reelchannelscan/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), dpatch
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-reelchannelscan

Modified: vdr/vdr-plugin-reelchannelscan/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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,9 @@
 unpatch:
 endif
 
+MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. \
+               INCLUDES=-I/usr/include/vdr
+
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
@@ -37,8 +34,7 @@
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-	$(MAKE) all DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=. \
-	    INCLUDES=-I/usr/include/$(VDR)
+	$(MAKE) all $(MAKE_OPTIONS)
 	touch build-stamp
 
 clean: clean-patched unpatch
@@ -46,7 +42,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
 
@@ -87,8 +83,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-remote/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-remote (0.3.8-4) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:11 +0100
+
 vdr-plugin-remote (0.3.8-3) unstable; urgency=low
 
   * Build-depend on po-debconf

Modified: vdr/vdr-plugin-remote/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-remote/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-remote/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Peter Siering <ps at ctmagazin.de>, Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>> 4.1.16), po-debconf, vdr-dev (>=1.4.4-1)
+Build-Depends: debhelper (>> 4.1.16), po-debconf, vdr-dev (>= 1.4.4-2)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-remote

Modified: vdr/vdr-plugin-remote/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-remote/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-remote/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -12,14 +12,8 @@
 	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
+# DPATCH=yes
 
 ifdef DPATCH
 include /usr/share/dpatch/dpatch.make
@@ -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.*
 
 	# Update debconf-templates:
@@ -90,8 +86,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-remoteosd/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-remoteosd (0.0.1-2) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:10 +0100
+
 vdr-plugin-remoteosd (0.0.1-1) unstable; urgency=low
 
   * Initial Release.

Modified: vdr/vdr-plugin-remoteosd/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-remoteosd/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-remoteosd/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -2,7 +2,7 @@
 Section: misc
 Priority: extra
 Maintainer: Tobias Grimm <tg at e-tobi.net>
-Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.4-1), svdrpservice-dev
+Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.4-2), svdrpservice-dev
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-remoteosd

Modified: vdr/vdr-plugin-remoteosd/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-remoteosd/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-remoteosd/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-rssreader/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-rssreader (1.0.1-4) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:11 +0100
+
 vdr-plugin-rssreader (1.0.1-3) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-rssreader/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-rssreader/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-rssreader/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), libexpat1-dev, libcurl-dev
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), libexpat1-dev, libcurl-dev
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-rssreader

Modified: vdr/vdr-plugin-rssreader/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-rssreader/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-rssreader/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
 
@@ -86,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-serial/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-serial (0.0.6a-7) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:11 +0100
+
 vdr-plugin-serial (0.0.6a-6) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-serial/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-serial/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-serial/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), dpatch (>= 2.0.9), vdr-dev (>= 1.4.4-1)
+Build-Depends: debhelper (>> 4.1.16), dpatch (>= 2.0.9), vdr-dev (>= 1.4.4-2)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-serial

Modified: vdr/vdr-plugin-serial/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-serial/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-serial/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-softdevice/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-softdevice (0.3.1-2) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:11 +0100
+
 vdr-plugin-softdevice (0.3.1-1) unstable; urgency=low
 
   * New upstream release

Modified: vdr/vdr-plugin-softdevice/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-softdevice/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Nicolas Huillard <nicolas at huillard.net>, Tobias Grimm <tg at e-tobi.net>
-Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.4-1), libavcodec-dev (>= 0.cvs20060329-4), libavformat-dev (>= 0.cvs20060329-4), libasound2-dev, libdfb++-dev, libdirectfb-dev, libxv-dev, libx11-dev, libxext-dev, zlib1g-dev
+Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.4-2), libavcodec-dev (>= 0.cvs20060329-4), libavformat-dev (>= 0.cvs20060329-4), libasound2-dev, libdfb++-dev, libdirectfb-dev, libxv-dev, libx11-dev, libxext-dev, zlib1g-dev
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-softdevice

Modified: vdr/vdr-plugin-softdevice/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-softdevice/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
@@ -38,7 +34,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
@@ -46,7 +42,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
 
@@ -87,8 +83,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-softplay/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-softplay (0.0.2+cvs20060323-12) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:12 +0100
+
 vdr-plugin-softplay (0.0.2+cvs20060323-11) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-softplay/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-softplay/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-softplay/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team  <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.4-1), libavcodec-dev (>= 0.cvs20060329-4), libavformat-dev (>=  0.cvs20060329-4)
+Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.4-2), libavcodec-dev (>= 0.cvs20060329-4), libavformat-dev (>=  0.cvs20060329-4)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-softplay

Modified: vdr/vdr-plugin-softplay/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-softplay/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-softplay/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-solitaire/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-solitaire (0.0.2-25) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:12 +0100
+
 vdr-plugin-solitaire (0.0.2-24) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-solitaire/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-solitaire/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-solitaire/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders:  Thomas Günther <tom at toms-cafe.de>, Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch (>= 2.0.9)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-solitaire

Modified: vdr/vdr-plugin-solitaire/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-solitaire/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-solitaire/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-spider/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-spider (0.1.2-7) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:12 +0100
+
 vdr-plugin-spider (0.1.2-6) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-spider/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-spider/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-spider/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders:  Thomas Günther <tom at toms-cafe.de>, Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-spider

Modified: vdr/vdr-plugin-spider/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-spider/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-spider/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
 
@@ -86,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-statusleds/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-statusleds (0.3-11) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:13 +0100
+
 vdr-plugin-statusleds (0.3-10) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-statusleds/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-statusleds/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-statusleds/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch (>= 2.0.9)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-statusleds

Modified: vdr/vdr-plugin-statusleds/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-statusleds/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-statusleds/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-streamdev/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-streamdev (0.3.1+cvs20050522-25) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:13 +0100
+
 vdr-plugin-streamdev (0.3.1+cvs20050522-24) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-streamdev/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-streamdev/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Peter Siering <ps at ctmagazin.de>, Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch (>= 2.0.9)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-streamdev-client

Modified: vdr/vdr-plugin-streamdev/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-streamdev/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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)
 	cp streamdevhosts.conf.example streamdevhosts.conf
 	touch build-stamp
 
@@ -46,7 +42,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.*
 	rm -f streamdevhosts.conf
 	dh_clean
@@ -88,8 +84,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-sudoku/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-sudoku (0.1.2-7) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:13 +0100
+
 vdr-plugin-sudoku (0.1.2-6) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-sudoku/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-sudoku/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-sudoku/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-sudoku

Modified: vdr/vdr-plugin-sudoku/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-sudoku/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-sudoku/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
 
@@ -86,8 +82,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
@@ -97,4 +93,4 @@
         clean-patched patch unpatch srcdoc
 
 srcdoc:
-	-$(MAKE) -o .dependencies srcdoc VDRDIR=/usr/include/$(VDR)
+	-$(MAKE) -o .dependencies srcdoc $(MAKE_OPTIONS)

Modified: vdr/vdr-plugin-svdrpext/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-svdrpext/trunk/debian/changelog	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-svdrpext/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-svdrpext (0.0.1-2) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:13 +0100
+
 vdr-plugin-svdrpext (0.0.1-1) unstable; urgency=low
 
   * Initial Release.

Modified: vdr/vdr-plugin-svdrpext/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-svdrpext/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-svdrpext/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -2,7 +2,7 @@
 Section: misc
 Priority: extra
 Maintainer: Tobias Grimm <tg at e-tobi.net>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-svdrpext

Modified: vdr/vdr-plugin-svdrpext/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-svdrpext/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-svdrpext/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-svdrpservice/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-svdrpservice (0.0.2-2) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:14 +0100
+
 vdr-plugin-svdrpservice (0.0.2-1) unstable; urgency=low
 
   * Initial Release.

Modified: vdr/vdr-plugin-svdrpservice/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-svdrpservice/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-svdrpservice/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -2,7 +2,7 @@
 Section: misc
 Priority: extra
 Maintainer: Tobias Grimm <tg at e-tobi.net>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-svdrpservice
@@ -14,7 +14,7 @@
 XB-VDR-Patchlevel: ${vdr:Patchlevel}
 
 Package: svdrpservice-dev
-Architecture:  all
+Architecture: all
 Depends: ${misc:Depends}
-Description: VDRR svdrpservice plugin development files
+Description: VDR svdrpservice plugin development files
  Header files for VDR plugins that use the svdrpservice plugin.

Modified: vdr/vdr-plugin-svdrpservice/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-svdrpservice/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-svdrpservice/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-sysinfo/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-sysinfo (0.0.4a-10) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:14 +0100
+
 vdr-plugin-sysinfo (0.0.4a-9) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-sysinfo/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-sysinfo/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-sysinfo/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), dpatch
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-sysinfo

Modified: vdr/vdr-plugin-sysinfo/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-sysinfo/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-sysinfo/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-timeline/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-timeline (1.0.141-5) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:14 +0100
+
 vdr-plugin-timeline (1.0.141-4) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-timeline/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-timeline/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-timeline/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>= 4.1.16), vdr-dev (>= 1.4.4-1)
+Build-Depends: debhelper (>= 4.1.16), vdr-dev (>= 1.4.4-2)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-timeline

Modified: vdr/vdr-plugin-timeline/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-timeline/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-timeline/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-vcd/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,14 @@
+vdr-plugin-vcd (0.7-27) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+  * Install HISTORY as changelog
+  * Using debian/compat now
+  * Shortened debian/copyright
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:14 +0100
+
 vdr-plugin-vcd (0.7-26) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Added: vdr/vdr-plugin-vcd/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-vcd/trunk/debian/compat	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-vcd/trunk/debian/compat	2006-12-17 17:00:15 UTC (rev 3766)
@@ -0,0 +1 @@
+4

Modified: vdr/vdr-plugin-vcd/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-vcd/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-vcd/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>=1.4.4-1), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch (>= 2.0.9)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-vcd

Modified: vdr/vdr-plugin-vcd/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-vcd/trunk/debian/copyright	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-vcd/trunk/debian/copyright	2006-12-17 17:00:15 UTC (rev 3766)
@@ -9,24 +9,10 @@
 Debian Maintainers:
 
   Tobias Grimm <tg at e-tobi.net>
+  Thomas Günther <tom at toms-cafe.de>
   Thomas Schmidt <tschmidt at debian.org>
 
 Copyright:
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software 
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-  MA 02110-1301, USA.
-
-  see /usr/share/common-licenses/GPL
-
+It may be redistributed under the terms of the GNU GPL, Version 2
+found on Debian systems in the file /usr/share/common-licenses/GPL .

Modified: vdr/vdr-plugin-vcd/trunk/debian/docs
===================================================================
--- vdr/vdr-plugin-vcd/trunk/debian/docs	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-vcd/trunk/debian/docs	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,2 +1 @@
 README
-HISTORY

Modified: vdr/vdr-plugin-vcd/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-vcd/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-vcd/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,16 +1,10 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
-# include dpatch stuff
-include /usr/share/dpatch/dpatch.make
-
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
 endif
@@ -18,39 +12,37 @@
 	INSTALL_PROGRAM += -s
 endif
 
-# Set VDR=vdr or VDR=vdrdevel
-VDR=$(shell dh_listpackages | grep "^vdr.*-" | head -n 1 | sed -e "s/-.*//")
+# To use dpatch uncomment the following line and set Build-Depends to dpatch
+DPATCH=yes
 
-PACKAGE=$(VDR)-plugin-vcd
-VDRDIR=/usr/include/$(VDR)
-DVBDIR=/usr/include
+ifdef DPATCH
+include /usr/share/dpatch/dpatch.make
+else
+patch:
+patch-stamp:
+unpatch:
+endif
 
+MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=.
+
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch-stamp
 	dh_testdir
-
 	touch configure-stamp
 
-
-build: patch-stamp build-stamp
-
-build-stamp: configure-stamp 
+build: build-stamp
+build-stamp: configure-stamp
 	dh_testdir
-
-	$(MAKE) DVBDIR=/usr/include VDRDIR=/usr/include/vdr LIBDIR=. all
-
+	$(MAKE) all $(MAKE_OPTIONS)
 	touch build-stamp
 
 clean: clean-patched unpatch
-
 clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	rm -rf build-tree
-	rm -f libvdr-*.so*
-	-make clean
-
+	-$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
+	rm -f libvdr-*.so.*
 	dh_clean
 
 install: build
@@ -58,7 +50,6 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
 	dh_install
 
 # Build architecture-independent files here.
@@ -69,24 +60,34 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
+#	dh_installdebconf
 	dh_installdocs
 	dh_installexamples
-	dh_installmenu
-	dh_installcron
-	dh_installman
-	dh_installinfo
-	dh_installchangelogs 
+#	dh_installmenu
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installman
+#	dh_installinfo
+#	dh_undocumented
+	dh_installchangelogs HISTORY
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
+#	dh_makeshlibs
 	dh_installdeb
+#	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch configure
+.PHONY: build clean binary-indep binary-arch binary install configure \
+        clean-patched patch unpatch

Modified: vdr/vdr-plugin-vdrcd/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-vdrcd/trunk/debian/changelog	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-vdrcd/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-vdrcd (0.0.10.1-26) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:15 +0100
+
 vdr-plugin-vdrcd (0.0.10.1-25) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-vdrcd/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-vdrcd/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-vdrcd/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch (>= 2.0.9)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-vdrcd

Modified: vdr/vdr-plugin-vdrcd/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-vdrcd/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-vdrcd/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
 
@@ -55,7 +51,7 @@
 	dh_clean -k
 	dh_installdirs
 	dh_install
-	chmod 755 $(CURDIR)/debian/$(VDR)-plugin-vdrcd/usr/lib/$(VDR)-plugin-vdrcd/mount.sh
+	chmod 755 $(CURDIR)/debian/vdr-plugin-vdrcd/usr/lib/vdr-plugin-vdrcd/mount.sh
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -87,8 +83,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-wapd/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-wapd (0.8-11) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:15 +0100
+
 vdr-plugin-wapd (0.8-10) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-wapd/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-wapd/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> 
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch (>= 2.0.9)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-wapd

Modified: vdr/vdr-plugin-wapd/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-wapd/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-wapd/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
 
@@ -73,8 +69,8 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-weather/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,12 @@
+vdr-plugin-weather (0.2.1e-33) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+  * Using debian/compat now
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:15 +0100
+
 vdr-plugin-weather (0.2.1e-32) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Added: vdr/vdr-plugin-weather/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-weather/trunk/debian/compat	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-weather/trunk/debian/compat	2006-12-17 17:00:15 UTC (rev 3766)
@@ -0,0 +1 @@
+4

Modified: vdr/vdr-plugin-weather/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-weather/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-weather/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>=1.4.4-1), ftplib-dev (>=3.1-1-1), libmdsp-dev (>=0.11-6), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), ftplib-dev (>=3.1-1-1), libmdsp-dev (>=0.11-6), dpatch (>= 2.0.9)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-weather

Modified: vdr/vdr-plugin-weather/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-weather/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-weather/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,13 +1,10 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
 endif
@@ -15,12 +12,6 @@
 	INSTALL_PROGRAM += -s
 endif
 
-# Set VDR=vdr or VDR=vdrdevel
-VDR=$(shell dh_listpackages | grep "^vdr.*-" | head -n 1 | sed -e "s/-.*//")
-
-VDRDIR=/usr/include/$(VDR)
-PACKAGE=$(VDR)-plugin-weather
-
 # To use dpatch uncomment the following line and set Build-Depends to dpatch
 DPATCH=yes
 
@@ -32,6 +23,8 @@
 unpatch:
 endif
 
+MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=.
+
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
@@ -40,15 +33,15 @@
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-	$(MAKE) all DVBDIR=/usr VDRDIR=$(VDRDIR) LIBDIR=.
+	$(MAKE) all $(MAKE_OPTIONS)
 	touch build-stamp
 
-clean: clean1 unpatch
-clean1:
+clean: clean-patched unpatch
+clean-patched:
 	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
 
@@ -67,21 +60,34 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
+#	dh_installdebconf
 	dh_installdocs
 	dh_installexamples
+#	dh_installmenu
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installman
+#	dh_installinfo
+#	dh_undocumented
 	dh_installchangelogs HISTORY
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
+#	dh_makeshlibs
 	dh_installdeb
+#	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure \
-        clean1 patch unpatch
+        clean-patched patch unpatch

Modified: vdr/vdr-plugin-xine/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/changelog	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-xine/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-xine (0.7.9-8) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:16 +0100
+
 vdr-plugin-xine (0.7.9-7) unstable; urgency=low
 
   * Added netpbm to Suggest (together with mjpegtools and y4mscaler

Modified: vdr/vdr-plugin-xine/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-xine/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Darren Salt <linux at youmustbejoking.demon.co.uk>, Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>
-Build-Depends: debhelper (>= 4.0.0), dpatch, libxine-dev (>= 1.0.2-0vdr1), vdr-dev (>= 1.4.4-1)
+Build-Depends: debhelper (>= 4.0.0), dpatch, libxine-dev (>= 1.0.2-0vdr1), vdr-dev (>= 1.4.4-2)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-xine

Modified: vdr/vdr-plugin-xine/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-xine/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # -*- makefile -*-
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
@@ -6,9 +6,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# dpatch stuff
-include /usr/share/dpatch/dpatch.make
-
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -16,38 +13,40 @@
 else
 	CFLAGS += -O2
 endif
-DH_STRIP = dh_strip -a
-ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
-	DH_STRIP =
 endif
 
-VDR=vdr
-PACKAGE=$(VDR)-plugin-xine
-VDRDIR=/usr/include/$(VDR)
+# To use dpatch uncomment the following line and set Build-Depends to dpatch
+DPATCH=yes
 
-# Drop the following three lines sometime...
-VDRVERSION = $(shell grep 'define VDRVERSION ' /usr/include/vdr/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
-# Minimum vdr .deb version; reset for new vdr upstream release.
-VDRDEBVERSION =
+ifdef DPATCH
+include /usr/share/dpatch/dpatch.make
+else
+patch:
+patch-stamp:
+unpatch:
+endif
 
+MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=.
+
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch-stamp
 	dh_testdir
 	touch configure-stamp
 
-build: patch build-stamp
+build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-	$(MAKE) all
+	$(MAKE) all $(MAKE_OPTIONS)
 	touch build-stamp
 
-clean: clean-tree unpatch
-clean-tree:
+clean: clean-patched unpatch
+clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	-$(MAKE) clean
+	-$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
 	dh_clean
 
 install: build
@@ -55,7 +54,7 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/vdr-plugin-xine $(DEFS)
+	$(MAKE) install $(MAKE_OPTIONS) DESTDIR=$(CURDIR)/debian/vdr-plugin-xine $(DEFS)
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -69,7 +68,7 @@
 	dh_installdocs
 	dh_install
 	dh_link
-	$(DH_STRIP)
+	dh_strip
 	set -e; \
 	  for i in debian/vdr-plugin-xine/usr/share/doc/vdr-plugin-xine/*; do \
 	    iconv -f iso8859-1 -t utf-8 <"$$i" >"$$i.new"; \
@@ -79,11 +78,12 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean clean-tree binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install configure \
+        clean-patched patch unpatch

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/changelog	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-xineliboutput (1.0.0~pre5+cvs20061017-3) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:15 +0100
+
 vdr-plugin-xineliboutput (1.0.0~pre5+cvs20061017-2) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.4-1), libxine-dev (>= 1.1.1), libjpeg62-dev, libxv-dev, libx11-dev, libxext-dev, sharutils
+Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.4-2), libxine-dev (>= 1.1.1), libjpeg62-dev, libxv-dev, libx11-dev, libxext-dev, sharutils
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-xineliboutput

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
 
@@ -32,6 +26,9 @@
 # install target directory for xine plugins
 XINEPLUGINDIR=libxine-xvdr/$(shell xine-config --plugindir)
 
+MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. \
+               NOSIGNAL_IMAGE_FILE=/usr/share/libxine-xvdr/nosignal.mpg
+
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
@@ -40,8 +37,7 @@
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-	$(MAKE) all DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=. \
-          NOSIGNAL_IMAGE_FILE=/usr/share/libxine-xvdr/nosignal.mpg
+	$(MAKE) all $(MAKE_OPTIONS)
 	touch build-stamp
 
 clean: clean-patched unpatch
@@ -49,7 +45,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	-$(MAKE) -o .dependencies clean DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=.
+	-$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
 	rm -f libvdr-*.so.*
 	dh_clean
 
@@ -93,8 +89,8 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/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	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-zaphistory/trunk/debian/changelog	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,3 +1,11 @@
+vdr-plugin-zaphistory (0.9.5-3) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+    Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:16 +0100
+
 vdr-plugin-zaphistory (0.9.5-2) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-zaphistory/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-zaphistory/trunk/debian/control	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-zaphistory/trunk/debian/control	2006-12-17 17:00:15 UTC (rev 3766)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), dpatch (>= 2.0.9), vdr-dev (>= 1.4.4-1)
+Build-Depends: debhelper (>> 4.1.16), dpatch (>= 2.0.9), vdr-dev (>= 1.4.4-2)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-zaphistory

Modified: vdr/vdr-plugin-zaphistory/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-zaphistory/trunk/debian/rules	2006-12-16 19:29:48 UTC (rev 3765)
+++ vdr/vdr-plugin-zaphistory/trunk/debian/rules	2006-12-17 17:00:15 UTC (rev 3766)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
 # 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
+	/usr/lib/vdr-dev/patchlevel.sh subst
+	/usr/lib/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb