[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.17-1_ctvdr1-19-g8bac8c1

[etobi]

The following commit has been merged in the e-tobi branch:
commit 5e3ccfe912cd2c3a37260aebfa068b55876b3783
Merge: e59c1b2d2f3b05be1ff23a17138770dea62f9751 63facbe9083812e79e9225b5c659d700ed92fb2d
Author: etobi <git at e-tobi.net>
Date:   Sun Apr 10 11:44:40 2011 +0200

    Merge branch 'master' into e-tobi
    
    Conflicts:
    	debian/vdr.install

diff --combined debian/vdr.install
index 787e46c,97311e8..0eb8127
--- a/debian/vdr.install
+++ b/debian/vdr.install
@@@ -1,50 -1,33 +1,41 @@@
  vdr                                     usr/bin/
  debian/runvdr                           usr/sbin/
  
- debian/config-loader.sh                 usr/lib/vdr
- debian/commands-loader.sh               usr/lib/vdr/
+ epg2html.pl                             usr/lib/vdr/
+ svdrpsend.pl                            usr/lib/vdr/
+ debian/config-loader.sh                 usr/lib/vdr/
  debian/plugin-loader.sh                 usr/lib/vdr/
+ debian/commands-loader.sh               usr/lib/vdr/
+ debian/vdr-groups.sh                    usr/lib/vdr/
+ debian/vdr-recordingaction              usr/lib/vdr/
+ debian/vdr-shutdown                     usr/lib/vdr/
+ debian/vdr-shutdown-message             usr/lib/vdr/
+ debian/vdr-shutdown.wrapper             usr/lib/vdr/
  
  diseqc.conf                             etc/vdr/
  keymacros.conf                          etc/vdr/
  sources.conf                            etc/vdr/
  svdrphosts.conf                         etc/vdr/
- 
+ debian/vdr.groups                       etc/vdr/
+ debian/R90.custom                       etc/vdr/recording-hooks/
+ debian/S90.custom                       etc/vdr/shutdown-hooks/
  debian/order.conf                       etc/vdr/plugins/
- 
  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.update-recordings.conf  usr/share/vdr/command-hooks/
- debian/commands.ctvdr.conf              usr/share/vdr/command-hooks/
- debian/commands.shutdownvdr.conf        usr/share/vdr/command-hooks/
  
- debian/vdr-recordingaction              usr/lib/vdr/
+ debian/themes/*.theme                   var/lib/vdr/themes/
  
- debian/R90.custom                       etc/vdr/recording-hooks/
+ debian/lintian/vdr                      usr/share/lintian/overrides/
+ locale                                  usr/share/
 +
++debian/commands.ctvdr.conf              usr/share/vdr/command-hooks/
++debian/commands.shutdownvdr.conf        usr/share/vdr/command-hooks/
 +debian/ctvdrwrapper                     usr/lib/vdr/
 +debian/ctvdrinfo                        usr/bin/
 +debian/ctvdrsysinfo                     usr/bin/
 +debian/poweroffvdr                      usr/bin/
- 
 +debian/vdraptrefresh                    usr/sbin/
- 
- epg2html.pl                             usr/lib/vdr/
- svdrpsend.pl                            usr/lib/vdr/
- 
- debian/lintian/vdr                      usr/share/lintian/overrides/
- 
- 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/
- debian/S90.custom                       etc/vdr/shutdown-hooks/
- 
- debian/vdr-groups.sh                    usr/lib/vdr/
- debian/vdr.groups                       etc/vdr/
- 
- locale                                  usr/share/

-- 
vdr packaging repository