r461 - in vdr/vdr/trunk/debian: . themes

Thomas Schmidt pkg-vdr-dvb-changes@lists.alioth.debian.org
Fri, 15 Apr 2005 21:20:59 +0000 

Author: tschmidt
Date: 2005-04-15 21:20:59 +0000 (Fri, 15 Apr 2005)
New Revision: 461

Added:
   vdr/vdr/trunk/debian/commands.update-recordings.conf
   vdr/vdr/trunk/debian/themes/
   vdr/vdr/trunk/debian/themes/sttng-blue.theme
   vdr/vdr/trunk/debian/themes/sttng-cool.theme
Modified:
   vdr/vdr/trunk/debian/README.Debian
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/control
   vdr/vdr/trunk/debian/copyright
   vdr/vdr/trunk/debian/vdr-dev.install
   vdr/vdr/trunk/debian/vdr.docs
   vdr/vdr/trunk/debian/vdr.install
   vdr/vdr/trunk/debian/watch
Log:
vdr: Changes suggested by Thomas G?\195?\131?\197?\146nther <tom@toms-cafe.de>
      + debian/watch: Updated to show the newest developer versions
      + Install PLUGINS.html in vdr-dev only
      + Install libsi header files in package vdr-dev
      + Added XB-VDR-Patchlevel-field in debian/control to vdr-dev too
      + Changed a few typos in README.Debian
      + Added commands.update-recordings.conf from vdrdevel to have a 
        command for updating the recordings list manually
      + Added "Blue LCARS" and "Cool" themes from vdrdevel


Modified: vdr/vdr/trunk/debian/README.Debian
===================================================================
--- vdr/vdr/trunk/debian/README.Debian	2005-04-13 18:39:48 UTC (rev 460)
+++ vdr/vdr/trunk/debian/README.Debian	2005-04-15 21:20:59 UTC (rev 461)
@@ -29,7 +29,7 @@
 /usr/lib/vdr/plugins the appropriate command line argument -P<plugin_name>
 will be created automatically. 
 
-If a file /var/lib/vdr/plugins/plugin.<plugin_name>.conf exists, it will be
+If a file /etc/vdr/plugins/plugin.<plugin_name>.conf exists, it will be
 parsed for command line arguments for the specified plugin. This file may
 contain comments preceeded by a "#" and the command line arguments may also be
 distributed across several lines.
@@ -52,7 +52,7 @@
 commands.<descriptor>.conf and reccmds.<descriptor>.conf found in
 /usr/share/vdr/command-hooks/. <descriptor> normally should be the name of
 the package, that wants to add these commands to VDR. The order of the 
-commands can be definded in the files order.commands.conf and order.reccmds.conf
+commands can be defined in the files order.commands.conf and order.reccmds.conf
 in /etc/vdr/command-hooks/.
 
 If the author of a package wants the user to be able to customize the commands
@@ -60,7 +60,7 @@
 and only symlinked to /usr/share/vdr/command-hooks/.
 
 For a description of the command file syntax, refer to commands.conf and
-reccmds.conf in the vdr documention.
+reccmds.conf in the vdr documentation.
 
 Commands added by the user, should go to commands.custom.conf and
 reccmds.custom.conf in /etc/vdr/command-hooks/. These files contain also some
@@ -111,7 +111,7 @@
 
 If you press the power key on your remote control, VDR executes a script 
 provided by the command line option -s. By default, this script will
-execute all files in /usr/share/vdr/command-hooks in their alphabetical order. 
+execute all files in /usr/share/vdr/shutdown-hooks/ in their alphabetical order. 
 If a file in there is not executable, it is treated as a shell script. These
 so called "Shutdown Hooks" should follow this naming scheme:
 
@@ -124,7 +124,7 @@
 script. I.e. the first parameter is the start time of the next timer. Please
 refer to the vdr documentation for the other parameters.
 
-After all shutdown hooks have been process, VDR will be terminated and the
+After all shutdown hooks have been processed, VDR will be terminated and the
 machine will be shut down.
 
 A shutdown hook may abort the shutdown process by exiting with an errorlevel
@@ -134,7 +134,7 @@
 
 ABORT_MESSAGE=<message to display>
 
-If the shutdown should only be deferred (i.e. because some background process,
+If the shutdown should only be deferred (e.g. because some background process,
 is still active), the shutdown hook may write to stdout:
 
 TRY_AGAIN=<minutes to wait before next shutdown request>
@@ -148,6 +148,7 @@
 
 SHUTDOWNCMD=<new shutdown command>
 
+
 Optional Patches
 ----------------
 
@@ -169,11 +170,11 @@
 If you decide to compile your own patched vdr packages, you should set
 PLUGIN_CHECK_PATCHLEVEL="yes" in /etc/default/vdr. With this enabled, vdr
 will only load plugins, that have been compiled with the correct vdr patch. This
-checking is done by using a custom control field called "vdr-patchlevel". When
+checking is done by using a custom control field called "VDR-Patchlevel". When
 compiling vdr with some optional patches enabled, these patches will be listed
 in this control field and added to vdr-dev as /usr/include/vdr/patchlevel.
-When compiling a plugin, this patchlevel file is added as the "vdr-patchlevel"
-control field to the plugins binary package. By comparing the "vdr-patchlevel"
+When compiling a plugin, this patchlevel file is added as the "VDR-Patchlevel"
+control field to the plugins binary package. By comparing the "VDR-Patchlevel"
 field of vdr and the plugin packages, the vdr package can decide whether to
 load a plugin or not.
 

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2005-04-13 18:39:48 UTC (rev 460)
+++ vdr/vdr/trunk/debian/changelog	2005-04-15 21:20:59 UTC (rev 461)
@@ -7,6 +7,15 @@
       + Removed 01_gcc3.4-FTBFS-fix.dpatch
       + Removed 09_amd64_epg.dpatch
     - Use LD_ASSUME_KERNEL=2.4.1 when calling vdr in plugins-loader.sh
+    - Changes suggested by Thomas Günther <tom@toms-cafe.de>
+      + debian/watch: Updated to show the newest developer versions
+      + Install PLUGINS.html in vdr-dev only
+      + Install libsi header files in package vdr-dev
+      + Added XB-VDR-Patchlevel-field in debian/control to vdr-dev too
+      + Changed a few typos in README.Debian
+      + Added commands.update-recordings.conf from vdrdevel to have a 
+        command for updating the recordings list manually
+      + Added "Blue LCARS" and "Cool" themes from vdrdevel
   * Tobias Grimm <tg@e-tobi.net>
     - Don't restrict root capabilities with --allow-root anymore
     - Passing $OPTIONS to binary compatibility test in plugin loader now

Added: vdr/vdr/trunk/debian/commands.update-recordings.conf
===================================================================
--- vdr/vdr/trunk/debian/commands.update-recordings.conf	2005-04-13 18:39:48 UTC (rev 460)
+++ vdr/vdr/trunk/debian/commands.update-recordings.conf	2005-04-15 21:20:59 UTC (rev 461)
@@ -0,0 +1 @@
+Aufnahmen-Liste aktualisieren   : /usr/bin/touch /var/lib/video/.update

Modified: vdr/vdr/trunk/debian/control
===================================================================
--- vdr/vdr/trunk/debian/control	2005-04-13 18:39:48 UTC (rev 460)
+++ vdr/vdr/trunk/debian/control	2005-04-15 21:20:59 UTC (rev 461)
@@ -38,6 +38,7 @@
  .
  This package contains the header files of VDR.
  You need this package to be able to build vdr-plugins!
+XB-VDR-Patchlevel: ${patchlevel}
 
 Package: vdr-plugin-sky
 Architecture: any 

Modified: vdr/vdr/trunk/debian/copyright
===================================================================
--- vdr/vdr/trunk/debian/copyright	2005-04-13 18:39:48 UTC (rev 460)
+++ vdr/vdr/trunk/debian/copyright	2005-04-15 21:20:59 UTC (rev 461)
@@ -21,7 +21,16 @@
   jumpplay  -  Torsten Kunkel <vdr@tkunkel.de> (initial version)
                Thomas Günther <tom@toms-cafe.de> (actual version)
 
+Theme Authors:
+  Blue LCARS - (debian/themes/sttng-blue.theme) from Sascha Volkenandt
+               <sascha@akv-soft.de> was downloaded from 
+	       http://www.magoa.net/sttng-blue.theme
 
+  Cool       - (debian/themes/sttng-cool.theme) from 
+               clocker@vdrportal.de, downloaded from 
+	       http://vdrportal.de/board/thread.php?postid=260715#post260715
+
+
 Copyright:
 
    This package is free software; you can redistribute it and/or modify

Added: vdr/vdr/trunk/debian/themes/sttng-blue.theme
===================================================================
--- vdr/vdr/trunk/debian/themes/sttng-blue.theme	2005-04-13 18:39:48 UTC (rev 460)
+++ vdr/vdr/trunk/debian/themes/sttng-blue.theme	2005-04-15 21:20:59 UTC (rev 461)
@@ -0,0 +1,62 @@
+Description = Blue LCARS
+clrBackground = 7F000000
+clrButtonRedFg = FFFCFCFC
+clrButtonRedBg = FFFC1414
+clrButtonGreenFg = FF000000
+clrButtonGreenBg = FF24FC24
+clrButtonYellowFg = FF000000
+clrButtonYellowBg = FFFCC024
+clrButtonBlueFg = FFFCFCFC
+clrButtonBlueBg = FF0000FC
+clrMessageFrame = FF598ACD
+clrMessageStatusFg = FF000000
+clrMessageStatusBg = FF00FCFC
+clrMessageInfoFg = FF000000
+clrMessageInfoBg = FF9C9CFF
+clrMessageWarningFg = FF000000
+clrMessageWarningBg = FFFCC024
+clrMessageErrorFg = FFFCFCFC
+clrMessageErrorBg = FFFC1414
+clrVolumeFrame = FF598ACD
+clrVolumeSymbol = FF000000
+clrVolumeBarUpper = FF38359E
+clrVolumeBarLower = FF9FCEFF
+clrChannelFrame = FF598ACD
+clrChannelName = FF000000
+clrChannelDate = FF000000
+clrChannelSymbolOn = FF000000
+clrChannelSymbolOff = FF5A7CA2
+clrChannelSymbolRecFg = FFFCFCFC
+clrChannelSymbolRecBg = FFFC1414
+clrChannelEpgTime = FF000000
+clrChannelEpgTitle = FF00FCFC
+clrChannelEpgShortText = FFFCC024
+clrChannelTimebarSeen = FF38359E
+clrChannelTimebarRest = FF9FCEFF
+clrMenuFrame = FF598ACD
+clrMenuTitle = FF000000
+clrMenuDate = FF000000
+clrMenuItemCurrentFg = FF000000
+clrMenuItemCurrentBg = FF9C9CFF
+clrMenuItemSelectable = FF9C9CFF
+clrMenuItemNonSelectable = FF00FCFC
+clrMenuEventTime = FFFCC024
+clrMenuEventVps = FF000000
+clrMenuEventTitle = FF00FCFC
+clrMenuEventShortText = FFFCC024
+clrMenuEventDescription = FF00FCFC
+clrMenuScrollbarTotal = FF38359E
+clrMenuScrollbarShown = FF00FCFC
+clrMenuScrollbarArrow = FF000000
+clrMenuText = FF00FCFC
+clrReplayFrame = FF598ACD
+clrReplayTitle = FF000000
+clrReplayMode = FF000000
+clrReplayCurrent = FF000000
+clrReplayTotal = FF000000
+clrReplayJump = FF000000
+clrReplayProgressSeen = FF9FCEFF
+clrReplayProgressRest = FF38359E
+clrReplayProgressSelected = FFFC1414
+clrReplayProgressMark = FF000000
+clrReplayProgressCurrent = FFFC1414

Added: vdr/vdr/trunk/debian/themes/sttng-cool.theme
===================================================================
--- vdr/vdr/trunk/debian/themes/sttng-cool.theme	2005-04-13 18:39:48 UTC (rev 460)
+++ vdr/vdr/trunk/debian/themes/sttng-cool.theme	2005-04-15 21:20:59 UTC (rev 461)
@@ -0,0 +1,62 @@
+Description = Cool
+clrBackground = 80000000
+clrButtonRedFg = FFFFFFFF
+clrButtonRedBg = C0C00000
+clrButtonGreenFg = FFFFFFFF
+clrButtonGreenBg = C000C000
+clrButtonYellowFg = FF000000
+clrButtonYellowBg = C0C0C000
+clrButtonBlueFg = FFFFFFFF
+clrButtonBlueBg = C00000C0
+clrMessageFrame = C0004080
+clrMessageStatusFg = FFFFFFFF
+clrMessageStatusBg = C000C000
+clrMessageInfoFg = FFFFFFFF
+clrMessageInfoBg = C00080FF
+clrMessageWarningFg = FF000000
+clrMessageWarningBg = C0C0C000
+clrMessageErrorFg = FFFFFFFF
+clrMessageErrorBg = C0C00000
+clrVolumeFrame = C0004080
+clrVolumeSymbol = FFFFFFFF
+clrVolumeBarUpper = C00080FF
+clrVolumeBarLower = C0C0C000
+clrChannelFrame = C0004080
+clrChannelName = FFFFFFFF
+clrChannelDate = FFFFFFFF
+clrChannelSymbolOn = FFE0E000
+clrChannelSymbolOff = FFB0B0B0
+clrChannelSymbolRecFg = FFFFFFFF
+clrChannelSymbolRecBg = C0C00000
+clrChannelEpgTime = FFFFFFFF
+clrChannelEpgTitle = FFE0E000
+clrChannelEpgShortText = FFB0B0B0
+clrChannelTimebarSeen = FFE0E000
+clrChannelTimebarRest = FFB0B0B0
+clrMenuFrame = C0004080
+clrMenuTitle = FFFFFFFF
+clrMenuDate = FFFFFFFF
+clrMenuItemCurrentFg = FFFFFFFF
+clrMenuItemCurrentBg = C00080FF
+clrMenuItemSelectable = FFFFFFFF
+clrMenuItemNonSelectable = FFB0B0B0
+clrMenuEventTime = FFE0E000
+clrMenuEventVps = FFFFFFFF
+clrMenuEventTitle = FFE0E000
+clrMenuEventShortText = FFE0E000
+clrMenuEventDescription = FFFFFFFF
+clrMenuScrollbarTotal = C00080FF
+clrMenuScrollbarShown = C0C0C000
+clrMenuScrollbarArrow = FFFFFFFF
+clrMenuText = FFFFFFFF
+clrReplayFrame = C0004080
+clrReplayTitle = FFE0E000
+clrReplayMode = FFFFFFFF
+clrReplayCurrent = FFFFFFFF
+clrReplayTotal = FFE0E000
+clrReplayJump = FFE0E000
+clrReplayProgressSeen = C00080FF
+clrReplayProgressRest = 80000000
+clrReplayProgressSelected = C0C00000
+clrReplayProgressMark = FFFFFFFF
+clrReplayProgressCurrent = FFFFFFFF

Modified: vdr/vdr/trunk/debian/vdr-dev.install
===================================================================
--- vdr/vdr/trunk/debian/vdr-dev.install	2005-04-13 18:39:48 UTC (rev 460)
+++ vdr/vdr/trunk/debian/vdr-dev.install	2005-04-15 21:20:59 UTC (rev 461)
@@ -1,5 +1,7 @@
 *.h 				usr/include/vdr/
 
+libsi/*.h                   	usr/include/vdr/libsi/
+
 debian/debianize-vdrplugin  	usr/bin/
 debian/plugin-template/     	usr/share/vdr-dev/
 

Modified: vdr/vdr/trunk/debian/vdr.docs
===================================================================
--- vdr/vdr/trunk/debian/vdr.docs	2005-04-13 18:39:48 UTC (rev 460)
+++ vdr/vdr/trunk/debian/vdr.docs	2005-04-15 21:20:59 UTC (rev 461)
@@ -2,5 +2,4 @@
 CONTRIBUTORS
 MANUAL
 INSTALL
-PLUGINS.html
 UPDATE-1.2.0

Modified: vdr/vdr/trunk/debian/vdr.install
===================================================================
--- vdr/vdr/trunk/debian/vdr.install	2005-04-13 18:39:48 UTC (rev 460)
+++ vdr/vdr/trunk/debian/vdr.install	2005-04-15 21:20:59 UTC (rev 461)
@@ -13,8 +13,9 @@
 debian/order.commands.conf etc/vdr/command-hooks/
 debian/order.reccmds.conf  etc/vdr/command-hooks/
 
-debian/commands.custom.conf etc/vdr/command-hooks/
-debian/reccmds.custom.conf  etc/vdr/command-hooks/
+debian/commands.custom.conf 		etc/vdr/command-hooks/
+debian/commands.update-recordings.conf 	etc/vdr/command-hooks/
+debian/reccmds.custom.conf  		etc/vdr/command-hooks/
 
 debian/config-loader.sh   usr/lib/vdr
 debian/plugin-loader.sh   usr/lib/vdr
@@ -29,6 +30,8 @@
 debian/vdr-recordingaction usr/lib/vdr/
 debian/R90.custom          etc/vdr/recording-hooks/
 
+debian/themes/*.theme       var/lib/vdr/themes/
+
 debian/vdr-shutdown         usr/lib/vdr/
 debian/vdr-shutdown-message usr/lib/vdr/
 debian/vdr-shutdown.wrapper usr/lib/vdr/

Modified: vdr/vdr/trunk/debian/watch
===================================================================
--- vdr/vdr/trunk/debian/watch	2005-04-13 18:39:48 UTC (rev 460)
+++ vdr/vdr/trunk/debian/watch	2005-04-15 21:20:59 UTC (rev 461)
@@ -1,2 +1,2 @@
 version=2
-ftp://ftp.cadsoft.de/vdr/ vdr.*-([\d+\.]+|\d+)\.tar(\.gz|\.bz2) debian uupdate
+ftp://ftp.cadsoft.de/vdr/Developer/ vdr.*-([\d+\.]+|\d+)\.tar\.bz2