[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.42-2_etobi1-5-gcee9e7f

[etobi]

The following commit has been merged in the e-tobi branch:
commit aab51dc8dc607446c772f831b37a29c527795762
Merge: 19cbab4904379df565d71966829f0895e2ca693d 0d8e535af3f15bfbf043080b5a6ec4c76f59c3ae
Author: etobi <git at e-tobi.net>
Date:   Sun Mar 31 13:45:41 2013 +0200

    Merge branch 'master' into e-tobi
    
    Conflicts:
    	debian/abi-version
    	debian/changelog
    	debian/patches/series
    	debian/patches/vdr-1.7.42-fixpendingtimers.diff

diff --combined debian/abi-version
index e76ed77,2a167fb..f9dde7a
--- a/debian/abi-version
+++ b/debian/abi-version
@@@ -1,1 -1,1 +1,1 @@@
- vdr-abi-1.7.42-multipatch
 -vdr-abi-2.0.0-debian
++vdr-abi-2.0.0-multipatch
diff --combined debian/changelog
index b395cfa,f5c9145..ecfab5e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,17 +1,17 @@@
 -vdr (2.0.0-1) UNRELEASED; urgency=low
++vdr (2.0.0-1) unstable; urgency=low
+ 
+   * New upstream release
+   * Dropped vdr-1.7.42-fixpendingtimers.diff - fixed upstream
+ 
 - -- Tobias Grimm <etobi at debian.org>  Sun, 31 Mar 2013 13:41:03 +0200
++ -- Tobias Grimm <etobi at debian.org>  Sun, 31 Mar 2013 13:45:00 +0200
+ 
 -vdr (1.7.42-2) unstable; urgency=low
 +vdr (1.7.42-2~etobi1) unstable; urgency=low
  
    * Added vdr-1.7.42-fixpendingtimers.diff
  
   -- Tobias Grimm <etobi at debian.org>  Tue, 26 Mar 2013 21:52:54 +0100
  
 -vdr (1.7.42-1) unstable; urgency=low
 +vdr (1.7.42-1~etobi1) unstable; urgency=low
  
    * New upstream release
    * Standards-Version: 3.9.4
@@@ -12,7 -19,7 +19,7 @@@
  
   -- Tobias Grimm <etobi at debian.org>  Sat, 23 Mar 2013 21:17:06 +0100
  
 -vdr (1.7.41-1) unstable; urgency=low
 +vdr (1.7.41-1~etobi1) unstable; urgency=low
  
    * New upstream release
    * Improved plugin loading now allows one to explicitly load specific plugins
@@@ -23,17 -30,7 +30,17 @@@
  
   -- Tobias Grimm <etobi at debian.org>  Sun, 17 Mar 2013 19:06:49 +0100
  
 -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
@@@ -44,13 -41,10 +51,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/patches/series
index 7bfcada,c223546..cfc095b
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -3,30 -3,3 +3,27 @@@
  12_osdbase-maxitems.patch
  
  99_ncursesw-include.patch
 +
 +# Patch needed for the ttxtsubs plugin.
 +opt-27_ttxtsubs.patch
 +
 +# Speed up zapping channels.
 +# opt-29_syncearly.patch
 +
 +# Patch that shows if there is a valid setup value left or right with < and >.
 +# opt-35_setup-show-valid.patch
 +
 +# Patch needed for the menuorg plugin.
 +opt-37-x_menuorg.patch
 +
 +# Patch to show an info, if it is possible to record an event in the timer-info.
 +opt-41-x_timer-info.patch
 +
 +# Patch to allow plugins to replace the VDR mainmenus
 +opt-42-x_MainMenuHooks.patch
 +
 +# Patch needed for the yaepg plugin.
 +opt-45_yaepg.patch
 +
 +# Patch required for the GraphTFT plugin
 +opt-50_graphtft.patch
- 
- vdr-1.7.42-fixpendingtimers.diff
- 

-- 
vdr packaging repository