r8357 - in /vdr/make-special-vdr/trunk: debian/changelog make-special-vdr

[tom-guest at users.alioth.debian.org]

Author: tom-guest
Date: Sun Jan 24 18:59:50 2010
New Revision: 8357

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8357
Log:
* Updated prepare_webvideo for new webvideo release 0.2.0
* Updated prepare_xineliboutput

Modified:
    vdr/make-special-vdr/trunk/debian/changelog
    vdr/make-special-vdr/trunk/make-special-vdr

Modified: vdr/make-special-vdr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/make-special-vdr/trunk/debian/changelog?rev=8357&op=diff
==============================================================================
--- vdr/make-special-vdr/trunk/debian/changelog (original)
+++ vdr/make-special-vdr/trunk/debian/changelog Sun Jan 24 18:59:50 2010
@@ -1,3 +1,10 @@
+make-special-vdr (1.9) experimental; urgency=low
+
+  * Updated prepare_webvideo for new webvideo release 0.2.0
+  * Updated prepare_xineliboutput
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 24 Jan 2010 19:58:05 +0100
+
 make-special-vdr (1.8) experimental; urgency=low
 
   * Updated prepare_graphtft

Modified: vdr/make-special-vdr/trunk/make-special-vdr
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/make-special-vdr/trunk/make-special-vdr?rev=8357&op=diff
==============================================================================
--- vdr/make-special-vdr/trunk/make-special-vdr (original)
+++ vdr/make-special-vdr/trunk/make-special-vdr Sun Jan 24 18:59:50 2010
@@ -143,6 +143,10 @@
 #
 #    2010-01-11: Version 1.8
 #       - Updated prepare_graphtft
+#
+#    2010-01-24: Version 1.9
+#       - Updated prepare_webvideo for new webvideo release 0.2.0
+#       - Updated prepare_xineliboutput
 
 
 main()
@@ -817,7 +821,7 @@
 prepare_webvideo()
 {
     echo "prepare_webvideo: rename vdr-plugin -> vdr${SPECIAL_VDR_SUFFIX}-plugin"
-    /bin/mv "vdr-plugin" "vdr${SPECIAL_VDR_SUFFIX}-plugin"
+    /bin/mv "src/vdr-plugin" "src/vdr${SPECIAL_VDR_SUFFIX}-plugin"
 }
 
 prepare_xine()
@@ -843,21 +847,21 @@
     subst_in_files "${SUBST}" "debian/control"
 
     /bin/sed -e "s/\${VERSION}/$(grep 'static const char \*VERSION *=' xineliboutput.c | cut -d'"' -f2)/g" \
-             -e "s/\${SPECIAL_VDR_SUFFIX_UPPER}/$(echo "${SPECIAL_VDR_SUFFIX}" | tr "[:lower:]" "[:upper:]")/g" \
+             -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' >> debian/vdr${SPECIAL_VDR_SUFFIX}-plugin-xineliboutput.links
+usr/lib/vdr/plugins/libxineliboutput-fbfe.so.${VERSION}  usr/lib/vdr${SPECIAL_VDR_SUFFIX}/plugins/libxineliboutput-fbfe.so.${VERSION}
+usr/lib/vdr/plugins/libxineliboutput-sxfe.so.${VERSION}  usr/lib/vdr${SPECIAL_VDR_SUFFIX}/plugins/libxineliboutput-sxfe.so.${VERSION}
+EOF
+
+    /bin/sed -e "s/\${SPECIAL_VDR_SUFFIX_UPPER}/$(echo "${SPECIAL_VDR_SUFFIX}" | tr "[:lower:]" "[:upper:]")/g" \
              -e "s/\${SPECIAL_VDR_SUFFIX}/${SPECIAL_VDR_SUFFIX}/g" <<'EOF' | /usr/bin/patch -p0 -F0
---- debian/vdr${SPECIAL_VDR_SUFFIX}-plugin-xineliboutput.links  1970-01-01 00:00:00.000000000 +0000
-+++ debian/vdr${SPECIAL_VDR_SUFFIX}-plugin-xineliboutput.links
-@@ -0,0 +1,2 @@
-+usr/lib/vdr/plugins/libxineliboutput-fbfe.so.${VERSION}  usr/lib/vdr${SPECIAL_VDR_SUFFIX}/plugins/libxineliboutput-fbfe.so.${VERSION}
-+usr/lib/vdr/plugins/libxineliboutput-sxfe.so.${VERSION}  usr/lib/vdr${SPECIAL_VDR_SUFFIX}/plugins/libxineliboutput-sxfe.so.${VERSION}
 --- config.c
 +++ config.c
-@@ -317,1 +317,1 @@
+@@ -328,1 +328,1 @@
 -  "vdr${SPECIAL_VDR_SUFFIX}",
 +  "vdr",
 --- configure
 +++ configure
-@@ -424,1 +425,1 @@
+@@ -426,1 +426,1 @@
 -echo "XINELIBOUTPUT_VDRPLUGIN=$HAVE_VDR" >> $makefile
 +echo "XINELIBOUTPUT_VDRPLUGIN=$HAVE_VDR${SPECIAL_VDR_SUFFIX_UPPER}" >> $makefile
 EOF