[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.40-1_etobi1-4-gb7a6434

[etobi]

The following commit has been merged in the e-tobi branch:
commit fe22a9942f81d8be97a646b27421227ed04792b6
Merge: ad54010fb6ee928ae9c53933e0e8579347c62e55 7e653bde906169691de3cc42dc45339bcc373631
Author: etobi <git at e-tobi.net>
Date:   Wed Mar 13 22:06:15 2013 +0100

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

diff --combined debian/changelog
index 00483e0,d2131fd..8d67f74
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,4 +1,14 @@@
 -vdr (1.7.40-1) unstable; urgency=low
 +vdr (1.7.40-1~etobi1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Updated ttxtsubs patch from ttxtsubs plugin version 0.3.0
 +  * Delete /var/lib/vdr/channels.conf(.terr|.cable) in postrm
++  * Clean up /var/lib/vdr/themes when purging package
++  * vdr-dbg and vdr-plugin-*-dbg now install the debug symbols
 +
 + -- Tobias Grimm <etobi at debian.org>  Sun, 10 Mar 2013 18:42:30 +0100
 +
 +vdr (1.7.39-1~etobi1) unstable; urgency=low
  
    * New upstream release
    * Dropped 11_sortrecordings.patch - The recording list sorting now is as it is
@@@ -17,13 -9,10 +19,13 @@@
    * Dropped Added 16_channels.conf.terr-fix.patch - fixed upstream
    * Switch to debhelper/compat 9
    * Make use of dh and VDR's install target to simplify debian/rules
 -  * Clean up /var/lib/vdr/themes when purging package
 -  * vdr-dbg and vdr-plugin-*-dbg now install the debug symbols
 +  * Refreshed the patches and dropped the following ones:
 +    - opt-20_liemikuutio.patch
 +    - opt-22-x_edit_marks.patch
 +    - opt-24_jumpplay.patch
 +    - opt-50_graphtft-liemikuutio.patch
  
 - -- Tobias Grimm <etobi at debian.org>  Wed, 23 Jan 2013 22:47:45 +0100
 + -- Tobias Grimm <etobi at debian.org>  Sun, 03 Mar 2013 09:24:30 +0100
  
  vdr (1.7.28-1) unstable; urgency=low
  
diff --combined debian/rules
index 54b8069,d466a6b..d31d3d8
--- a/debian/rules
+++ b/debian/rules
@@@ -15,12 -15,10 +15,12 @@@ MAKE_OPTIONS = PREFIX=$(PREFIX) VIDEODI
  override_dh_auto_build:
  	dh_auto_build -- $(MAKE_OPTIONS)
  	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o debian/vdr-shutdown.wrapper debian/vdr-shutdown-wrapper.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o debian/ctvdrwrapper debian/ctvdrwrapper.c
  
  override_dh_auto_clean:
  	dh_auto_clean
  	rm -f debian/vdr-shutdown.wrapper
 +	rm -f debian/ctvdrwrapper
  	rm -f debian/patchinfo
  
  override_dh_auto_install:
@@@ -35,13 -33,18 +35,18 @@@ override_dh_install: patchinf
  	    install -D PLUGINS/src/$$example/README debian/vdr-plugin-examples/usr/share/doc/vdr-plugin-examples/README.$$example; \
  	done
  
+ override_dh_strip:
+ 	dh_strip -p vdr --dbg-package=vdr-dbg
+ 	dh_strip -p vdr-plugin-dvbsddevice --dbg-package=vdr-plugin-dvbsddevice-dbg
+ 	dh_strip -p vdr-plugin-dvbhddevice --dbg-package=vdr-plugin-dvbhddevice-dbg
+ 	dh_strip
  
  override_dh_installchangelogs:
  	dh_installchangelogs -pvdr HISTORY
  	dh_installchangelogs -pvdr-plugin-dvbsddevice PLUGINS/src/dvbsddevice/HISTORY
  	dh_installchangelogs -pvdr-plugin-dvbhddevice PLUGINS/src/dvbhddevice/HISTORY
  	dh_installchangelogs -pvdr-plugin-examples
- 	dh_installchangelogs -pvdr-dev
+ 	dh_installchangelogs
  
  patchinfo:
  	sh debian/extract-patchinfo >debian/patchinfo
diff --combined debian/vdr.postrm
index 43c53a2,f516490..9dbc969
--- a/debian/vdr.postrm
+++ b/debian/vdr.postrm
@@@ -25,10 -25,8 +25,11 @@@ case "$1" i
          rm -f /var/cache/vdr/reccmds.conf > /dev/null 2>&1 || true
          rm -f /var/cache/vdr/epg.data > /dev/null 2>&1 || true
          rm -f /var/lib/vdr/channels.conf > /dev/null 2>&1 || true
 +        rm -f /var/lib/vdr/channels.conf.terr > /dev/null 2>&1 || true
 +        rm -f /var/lib/vdr/channels.conf.cable > /dev/null 2>&1 || true
+         rm -rf /var/lib/vdr/themes > /dev/null 2>&1 || true
          rm -f /var/lib/vdr/remote.conf > /dev/null 2>&1 || true
 +        rm -f /var/lib/vdr/remote.*.conf > /dev/null 2>&1 || true
          rm -f /var/lib/vdr/setup.conf > /dev/null 2>&1 || true
          rm -f /var/lib/vdr/timers.conf > /dev/null 2>&1 || true
      ;;

-- 
vdr packaging repository