r7985 - in /vdr/make-special-vdr: ./ tags/ trunk/ trunk/debian/ trunk/debian/changelog trunk/debian/compat trunk/debian/control trunk/debian/copyright trunk/debian/install trunk/debian/rules trunk/make-special-vdr
tom-guest at users.alioth.debian.org
tom-guest at users.alioth.debian.org
Sun Nov 1 23:22:43 UTC 2009
Author: tom-guest
Date: Sun Nov 1 23:22:43 2009
New Revision: 7985
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7985
Log:
Initialization of package make-special-vdr
Added:
vdr/make-special-vdr/
vdr/make-special-vdr/tags/
vdr/make-special-vdr/trunk/
vdr/make-special-vdr/trunk/debian/
vdr/make-special-vdr/trunk/debian/changelog
vdr/make-special-vdr/trunk/debian/compat
vdr/make-special-vdr/trunk/debian/control
vdr/make-special-vdr/trunk/debian/copyright
vdr/make-special-vdr/trunk/debian/install
vdr/make-special-vdr/trunk/debian/rules (with props)
vdr/make-special-vdr/trunk/make-special-vdr
- copied, changed from r7984, vdr/vdr/trunk/debian/make-special-vdr.sh
Added: vdr/make-special-vdr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/make-special-vdr/trunk/debian/changelog?rev=7985&op=file
==============================================================================
--- vdr/make-special-vdr/trunk/debian/changelog (added)
+++ vdr/make-special-vdr/trunk/debian/changelog Sun Nov 1 23:22:43 2009
@@ -1,0 +1,5 @@
+make-special-vdr (1.4) experimental; urgency=low
+
+ * Initial Release
+
+ -- Thomas Günther <tom at toms-cafe.de> Sun, 01 Nov 2009 13:18:41 +0100
Added: vdr/make-special-vdr/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/make-special-vdr/trunk/debian/compat?rev=7985&op=file
==============================================================================
--- vdr/make-special-vdr/trunk/debian/compat (added)
+++ vdr/make-special-vdr/trunk/debian/compat Sun Nov 1 23:22:43 2009
@@ -1,0 +1,1 @@
+4
Added: vdr/make-special-vdr/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/make-special-vdr/trunk/debian/control?rev=7985&op=file
==============================================================================
--- vdr/make-special-vdr/trunk/debian/control (added)
+++ vdr/make-special-vdr/trunk/debian/control Sun Nov 1 23:22:43 2009
@@ -1,0 +1,18 @@
+Source: make-special-vdr
+Section: video
+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 <etobi at debian.org>, Thomas Schmidt <tschmidt at debian.org>
+Build-Depends: debhelper (>= 5), cdbs
+Standards-Version: 3.8.2
+Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/make-special-vdr/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/make-special-vdr/trunk/
+
+Package: make-special-vdr
+Architecture: all
+Depends: ${misc:Depends}
+Description: Make special vdr packages
+ 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.
Added: vdr/make-special-vdr/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/make-special-vdr/trunk/debian/copyright?rev=7985&op=file
==============================================================================
--- vdr/make-special-vdr/trunk/debian/copyright (added)
+++ vdr/make-special-vdr/trunk/debian/copyright Sun Nov 1 23:22:43 2009
@@ -1,0 +1,38 @@
+Upstream Homepage:
+ http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/make-special-vdr/
+
+Upstream Author:
+ Thomas Günther <tom at toms-cafe.de>
+
+Debian Maintainers:
+ Tobias Grimm <etobi at debian.org>
+ Thomas Günther <tom at toms-cafe.de>
+ Thomas Schmidt <tschmidt at debian.org>
+
+Copyright:
+ (C) 2004 - 2009 Thomas Günther
+
+Copyright (Debian packaging):
+ (C) 2009 Tobias Grimm, Thomas Günther, Thomas Schmidt
+
+License:
+ 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ The complete text of the GNU General Public License can be found
+ in /usr/share/common-licenses/GPL-2 on most Debian systems.
+
+License (Debian packaging):
+ The Debian packaging is licensed under the GPL, version 2 or any
+ later version, see /usr/share/common-licenses/GPL-2.
Added: vdr/make-special-vdr/trunk/debian/install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/make-special-vdr/trunk/debian/install?rev=7985&op=file
==============================================================================
--- vdr/make-special-vdr/trunk/debian/install (added)
+++ vdr/make-special-vdr/trunk/debian/install Sun Nov 1 23:22:43 2009
@@ -1,0 +1,1 @@
+make-special-vdr usr/bin/
Added: vdr/make-special-vdr/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/make-special-vdr/trunk/debian/rules?rev=7985&op=file
==============================================================================
--- vdr/make-special-vdr/trunk/debian/rules (added)
+++ vdr/make-special-vdr/trunk/debian/rules Sun Nov 1 23:22:43 2009
@@ -1,0 +1,3 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
Propchange: vdr/make-special-vdr/trunk/debian/rules
------------------------------------------------------------------------------
svn:executable = *
Copied: vdr/make-special-vdr/trunk/make-special-vdr (from r7984, vdr/vdr/trunk/debian/make-special-vdr.sh)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/make-special-vdr/trunk/make-special-vdr?rev=7985&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/make-special-vdr.sh (original)
+++ vdr/make-special-vdr/trunk/make-special-vdr Sun Nov 1 23:22:43 2009
@@ -1,5 +1,6 @@
-#
-# make-special-vdr.sh by Thomas Günther <tom at toms-cafe.de>
+#!/bin/sh
+#
+# make-special-vdr by Thomas Günther <tom at toms-cafe.de>
#
# Description:
#
@@ -12,54 +13,38 @@
# user and group are 'vdr' for the special packages too. The suffix of recording
# files remains also '.vdr'.
#
-# Necessary adaptions in the debian source packages:
-#
-# The special packages are built from the same source packages as the standard
-# packages. The make-special-vdr.sh script is called from "debian/rules" instead
-# of the normal make. In the first line of "debian/rules" "#! /usr/bin/make -f"
-# has to be replaced with "#! /bin/sh debian/make-special-vdr.sh" for the vdr
-# package respectively with "#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh"
-# for a vdr plugin package.
-#
# Usage:
#
# The name of the special package is specified by the environment variable
# SPECIAL_VDR_SUFFIX. E.g., the vdrdevel variation is built with
-# SPECIAL_VDR_SUFFIX=devel fakeroot dpkg-buildpackage -us -uc -tc
-#
-# The plugin packages don't include make-special-vdr.sh themselves. Instead they
-# use /usr/share/vdr-dev/make-special-vdr.sh installed by the vdr-dev package.
-#
-# If the installed make-special-vdr.sh version of vdr-dev is to old to build the
-# special variation of a particular vdr plugin package, a newer version of
-# make-special-vdr.sh can be specified by the environment variable
-# MAKE_SPECIAL_VDR, e.g.
-# export MAKE_SPECIAL_VDR=/home/tom/make-special-vdr.sh
-# SPECIAL_VDR_SUFFIX=devel fakeroot dpkg-buildpackage -us -uc -tc
-#
-# If the newer version of make-special-vdr.sh is installed with the
-# vdr...-dev package (i.e. the special variation of the vdr-dev package, e.g.
-# vdrdevel-dev), it is called automatically. In this case MAKE_SPECIAL_VDR
-# isn't necessary.
-#
-# In order to build the standard vdr packages the environment variable
-# SPECIAL_VDR_SUFFIX has to be empty or not set.
+# SPECIAL_VDR_SUFFIX=devel fakeroot dpkg-buildpackage -Rmake-special-vdr
+# or
+# SPECIAL_VDR_SUFFIX=devel fakeroot make-special-vdr binary
+#
+# If SPECIAL_VDR_SUFFIX is not set SPECIAL_VDR_SUFFIX=devel is used as default
+# value, i.e., the vdrdevel variation is also built with
+# fakeroot dpkg-buildpackage -Rmake-special-vdr
+# or
+# fakeroot make-special-vdr binary
+#
+# The script make-special-vdr works as substitute for debian/rules.
#
# Implementation details:
#
-# If SPECIAL_VDR_SUFFIX is set and not empty make-special-vdr.sh does following
-# steps:
+# If make-special-vdr is called with arguments other than "clean" it performs
+# following steps:
# 1. Create the subdirectory ".save".
# 2. Copy all files and directories into ".save".
# 3. Substitute "vdr" in the contents of all files (recursively) except for
-# "debian/changelog", "debian/make-special-vdr.sh", all files in
-# "debian/plugin-template", and all files in ".save".
+# "debian/changelog", 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
+#
+# If make-special-vdr is called with the argument "clean" all original files and
# directories are restored form ".save" and the subdirectory ".save" is removed.
#
# History:
@@ -135,33 +120,31 @@
# - Removed prepare_mediamvp (plugin deprecated)
# - Removed prepare_osdteletext and other code for old plugin versions
# - Added prepare_webvideo
+#
+# 2009-11-01: Version 1.4
+# - Renamed make-special-vdr.sh to make-special-vdr
+# - Changed usage of make-special-vdr by using the -R option of
+# dpkg-builpackage etc. (source package adaption not needed any more)
+# - Removed handling of MAKE_SPECIAL_VDR
+# - Removed search of newer script version
+# - Added "devel" as default value of SPECIAL_VDR_SUFFIX
+# - Updated prepare_common for new svdrposd plugin
main()
{
set -e
+ # Default value of SPECIAL_VDR_SUFFIX: devel
+ [ "${SPECIAL_VDR_SUFFIX}" ] || export SPECIAL_VDR_SUFFIX=devel
echo "$0" "$@" \
"SPECIAL_VDR_SUFFIX='${SPECIAL_VDR_SUFFIX}'" \
- "MAKE_SPECIAL_VDR='${MAKE_SPECIAL_VDR}'" \
"NO_CHECKBUILDDEPS='${NO_CHECKBUILDDEPS}'"
- if [ "$0" != "/usr/share/vdr-dev/make-special-vdr.sh" -a \
- "$0" != "${MAKE_SPECIAL_VDR}" ]; then
- # Use MAKE_SPECIAL_VDR only for plugin packages
- export MAKE_SPECIAL_VDR=
- elif [ -z "${MAKE_SPECIAL_VDR}" ]; then
- # Check for newer version of make-special-vdr.sh in special package
- export MAKE_SPECIAL_VDR=$(newer_version_in_special_package)
- fi
- if [ -z "${SPECIAL_VDR_SUFFIX}" ]; then
- # Original make if SPECIAL_VDR_SUFFIX is not set
- /usr/bin/make -f "$@"
- elif [ "${MAKE_SPECIAL_VDR}" -a "$0" != "${MAKE_SPECIAL_VDR}" ]; then
- # Call newer version of make-special-vdr.sh provided by MAKE_SPECIAL_VDR
- /bin/sh "${MAKE_SPECIAL_VDR}" "$@"
+ if check_package "make-special-vdr"; then
+ /usr/bin/make -f debian/rules "$@"
elif ! check_clean_arg "$@"; then
# Make special variation: prepare the package before make
prepare
- /usr/bin/make -f "$@"
+ /usr/bin/make -f debian/rules "$@"
else
# Clean prepared package
cleanup
@@ -258,12 +241,12 @@
echo "prepare_common: substitute vdr -> vdr${SPECIAL_VDR_SUFFIX}"
SUBST="s.vdr.vdr${SPECIAL_VDR_SUFFIX}.g; \
s.make-special-vdr${SPECIAL_VDR_SUFFIX}.make-special-vdr.g; \
- s./bin/sh /usr/share/vdr${SPECIAL_VDR_SUFFIX}-dev/make-special-vdr./bin/sh /usr/share/vdr-dev/make-special-vdr.g; \
s.Source: vdr${SPECIAL_VDR_SUFFIX}.Source: vdr.g; \
s.\<vdr${SPECIAL_VDR_SUFFIX}c\>.vdrc.g; \
s.\<vdr${SPECIAL_VDR_SUFFIX}cd\>.vdrcd.g; \
s.\<vdr${SPECIAL_VDR_SUFFIX}rip\>.vdrrip.g; \
s.\<svdr${SPECIAL_VDR_SUFFIX}pext\>.svdrpext.g; \
+ s.\<svdr${SPECIAL_VDR_SUFFIX}posd\>.svdrposd.g; \
s.\<svdr${SPECIAL_VDR_SUFFIX}pservice\>.svdrpservice.g; \
s.\<svdrpservice-dev\>.vdr${SPECIAL_VDR_SUFFIX}-svdrpservice-dev.g; \
s/\<svdrpservice.h\>/vdr${SPECIAL_VDR_SUFFIX}_svdrpservice.h/g; \
@@ -305,7 +288,6 @@
FILES=$(/usr/bin/find ./ -type f -not -regex "./${SAVE_DIR}/.*" \
-not -regex "./debian/changelog" \
-not -regex "./debian/copyright" \
- -not -regex "./debian/make-special-vdr.sh" \
-not -regex "./debian/plugin-template/.*" \
-not -regex "./debian/.vdr-patches.*" \
-not -regex "./changelog" \
@@ -549,8 +531,8 @@
echo
echo "To build vdr${SPECIAL_VDR_SUFFIX} plugin packages use the environment variable"
echo "SPECIAL_VDR_SUFFIX, e.g.:"
-echo " SPECIAL_VDR_SUFFIX=${SPECIAL_VDR_SUFFIX} fakeroot dpkg-buildpackage -us -uc -tc"
-echo "See /usr/share/vdr-dev/make-special-vdr.sh for details."
+echo " SPECIAL_VDR_SUFFIX=${SPECIAL_VDR_SUFFIX} fakeroot dpkg-buildpackage -us -uc -tc -Rmake-special-vdr"
+echo "See /usr/bin/make-special-vdr for details."
EOF
/bin/sed -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
--- debian/debianize-vdr${SPECIAL_VDR_SUFFIX}plugin
@@ -865,15 +847,6 @@
EOF
}
-newer_version_in_special_package()
-{
- NORM="/usr/share/vdr-dev/make-special-vdr.sh"
- SPEC="/usr/share/vdr${SPECIAL_VDR_SUFFIX}-dev/make-special-vdr.sh"
- if [ -f "${SPEC}" -a "${SPEC}" -nt "${NORM}" ]; then
- echo "${SPEC}"
- fi
-}
-
cleanup()
{
if [ -e "${SAVE_DIR}" ]; then
More information about the pkg-vdr-dvb-changes
mailing list