r4163 - vdr/vdr/trunk/debian
Thomas Günther
tom-guest at alioth.debian.org
Sun Feb 11 21:26:56 CET 2007
Author: tom-guest
Date: 2007-02-11 21:26:55 +0100 (Sun, 11 Feb 2007)
New Revision: 4163
Modified:
vdr/vdr/trunk/debian/changelog
vdr/vdr/trunk/debian/make-special-vdr.sh
Log:
Upgraded make-special-vdr.sh to version 0.4 (updated for new vompserver release)
Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog 2007-02-04 15:43:39 UTC (rev 4162)
+++ vdr/vdr/trunk/debian/changelog 2007-02-11 20:26:55 UTC (rev 4163)
@@ -16,8 +16,8 @@
* Updated debianize-vdrplugin for Debian Etch
[ Thomas Günther ]
- * Upgraded make-special-vdr.sh to version 0.3 (fixed detection of *.vdr files
- in burn plugin)
+ * Upgraded make-special-vdr.sh to version 0.4 (fixed detection of *.vdr files
+ in burn plugin, updated for new vompserver release)
-- Tobias Grimm <tg at e-tobi.net> Sat, 3 Feb 2007 02:32:43 +0100
Modified: vdr/vdr/trunk/debian/make-special-vdr.sh
===================================================================
--- vdr/vdr/trunk/debian/make-special-vdr.sh 2007-02-04 15:43:39 UTC (rev 4162)
+++ vdr/vdr/trunk/debian/make-special-vdr.sh 2007-02-11 20:26:55 UTC (rev 4163)
@@ -66,10 +66,16 @@
#
# 2007-01-24: Version 0.3
# - Fixed detection of *.vdr files in burn plugin
+#
+# 2007-02-11: Version 0.4
+# - Updated prepare_vompserver for new vompserver release
+# - Fixed prepare_vdrc
+# - Exit immediately on errors
main()
{
+ set -e
echo "$0" "$@" \
"SPECIAL_VDR_SUFFIX='${SPECIAL_VDR_SUFFIX}'" \
"MAKE_SPECIAL_VDR='${MAKE_SPECIAL_VDR}'" \
@@ -589,8 +595,8 @@
--- debian/control
+++ debian/control
@@ -12,1 +12,3 @@
--Depends: ${vdr${SPECIAL_VDR_SUFFIX}:Depends}, ${shlibs:Depends}
-+Depends: ${vdr${SPECIAL_VDR_SUFFIX}:Depends}, ${shlibs:Depends}
+-Depends: ${shlibs:Depends}, ${vdr${SPECIAL_VDR_SUFFIX}:Depends}
++Depends: ${shlibs:Depends}, ${vdr${SPECIAL_VDR_SUFFIX}:Depends}
+Conflicts: vdr${SPECIAL_VDR_SUFFIX}-plugin-vdrc
+Replaces: vdr${SPECIAL_VDR_SUFFIX}-plugin-vdrc
EOF
@@ -634,12 +640,10 @@
prepare_vompserver()
{
echo "prepare_vompserver: use vompclient from standard package"
+ SUBST="s/vdr${SPECIAL_VDR_SUFFIX}-vompclient-mvp/vdr-vompclient-mvp/g"
+ subst_in_files "${SUBST}" "debian/control"
+
/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 @@
More information about the pkg-vdr-dvb-changes
mailing list