changed to use pgk_preinstall, comment and warning by use channellist in vdr-setup.xml

Package-Manager: portage-2.0.54

4 files changed, 26 insertions, 15 deletions

diff --git a/media-plugins/vdr-setup/ChangeLog b/media-plugins/vdr-setup/ChangeLog
index 073ef0594d95..ee0a6339d76e 100644
--- a/media-plugins/vdr-setup/ChangeLog
+++ b/media-plugins/vdr-setup/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-setup
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/ChangeLog,v 1.1 2006/02/05 15:57:23 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/ChangeLog,v 1.2 2006/02/19 23:06:29 hd_brummy Exp $
+
+  19 Feb 2006; Joerg Bornkessel <hd_brummy@gentoo.org> files/vdr-setup.xml,
+  vdr-setup-0.2.3.ebuild:
+  changed to use pgk_preinst, comment and warnig by use channellist in
+  vdr-setup.xml
 
 *vdr-setup-0.2.3 (05 Feb 2006)
 
diff --git a/media-plugins/vdr-setup/Manifest b/media-plugins/vdr-setup/Manifest
index 3f3ea23ce3c6..48688d2c5b65 100644
--- a/media-plugins/vdr-setup/Manifest
+++ b/media-plugins/vdr-setup/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 74de37098349b36b5479beb05ed9c975 ChangeLog 457
+MD5 2a52bbfcb833714728eac978f4e7bfb6 ChangeLog 647
 MD5 7e7798b807c8766b6331d33684ac3b98 files/digest-vdr-setup-0.2.3 63
 MD5 4dd1e551d51e11df975e6743ea2ead01 files/vdr-setup-0.2.3-gentoo.diff 6713
-MD5 2ce67b2d428954f9b4a08684cadd5a19 files/vdr-setup.xml 8128
+MD5 13134d72f70ed4077f1783e4b9640e0c files/vdr-setup.xml 8338
 MD5 b76f00a750adf92ee7defa4febc4b88d metadata.xml 544
-MD5 b64eaab7127bb0d8e396bfb5c20946ae vdr-setup-0.2.3.ebuild 1698
+MD5 8f022e87ee9ece56950ef705e7780109 vdr-setup-0.2.3.ebuild 1797
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 Comment: no further Information
 
-iD8DBQFD5iBydn07HTTCgIoRAofqAKCzgRhxexxtVrKk+9gvWY6q+lZYaQCgqs2L
-LRsRgEyRvHIxHjrpf6QvVEE=
-=9kQu
+iD8DBQFD+PoIdn07HTTCgIoRAjzzAKCf/7aSMErnGj0RtCzYei6g3zm+BgCfWlJv
+BwbmKRJNJrtRMaEdLRCHsQE=
+=82ey
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-setup/files/vdr-setup.xml b/media-plugins/vdr-setup/files/vdr-setup.xml
index a7bb57ee8b75..92d71acfed8d 100644
--- a/media-plugins/vdr-setup/files/vdr-setup.xml
+++ b/media-plugins/vdr-setup/files/vdr-setup.xml
@@ -119,7 +119,9 @@
       </menu>
       <menu name="Sonstiges">
           <menu name="Edit VDR-Menü" system="VDRMenu" help1="VDR Menü bearbeiten"   help2="setup_editmenu.hlp"/>
-          <entry name="Kanalliste" sysconfig="CHANNELLIST" type="selection" setup="channellist" value="DVB-s_MiniVDR" />
+<!--  - Warning! On use the Entry Channellist; by switch between diffrent Channellist, seted Timer will be distroyed 
+	  - to use the entry, remove the comment signs on beginning and end of line -->
+<!--           <entry name="Kanalliste" sysconfig="CHANNELLIST" type="selection" setup="channellist" value="DVB-s_MiniVDR" />   -->
       </menu>
       <menu name="Kindersicherung">
           <entry name="Geheimcode (0000=AUS)" sysconfig="CHILDLOCK" type="numtext" setup="childlock" value="0000" />
diff --git a/media-plugins/vdr-setup/vdr-setup-0.2.3.ebuild b/media-plugins/vdr-setup/vdr-setup-0.2.3.ebuild
index 5c0259619a21..e0d36469ba74 100644
--- a/media-plugins/vdr-setup/vdr-setup-0.2.3.ebuild
+++ b/media-plugins/vdr-setup/vdr-setup-0.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/vdr-setup-0.2.3.ebuild,v 1.1 2006/02/05 15:57:23 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/vdr-setup-0.2.3.ebuild,v 1.2 2006/02/19 23:06:29 hd_brummy Exp $
 
 inherit vdr-plugin
 
@@ -50,20 +50,24 @@ src_install() {
 	dodoc MANUAL.DE Examples/*.xml
 }
 
+pkg_preinst() {
+
+	if [[ ! -L ${ROOT}/etc/vdr/channels.conf ]]; then
+	cp ${ROOT}/etc/vdr/channels.conf ${IMAGE}/etc/vdr/channels.d/channels.conf.bak
+	cp ${ROOT}/etc/vdr/channels.conf ${IMAGE}/etc/vdr/channels.d/channels.conf
+	fowners vdr:vdr /etc/vdr/channels.d/{channels.conf,channels.conf.bak}
+	fi
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
 
 	echo
 	einfo "Edit /etc/vdr/plugins/setup/*"
-
-	if [[ ! -L /etc/vdr/channels.conf ]]; then
-	cp ${ROOT}/etc/vdr/channels.conf ${ROOT}/etc/vdr/channels.d/channels.conf.bak
-	cp ${ROOT}/etc/vdr/channels.conf ${ROOT}/etc/vdr/channels.d/channels.conf
 	echo
 	ewarn "Setup-Plugin will change the path of your channels.conf"
 	einfo "You will find a backup copy on /etc/vdr/channels/channels.conf.bak"
 	echo
-	fi
 }