[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.39-1_etobi1-7-g0b74b02

[etobi]

The following commit has been merged in the e-tobi branch:
commit bc20f8ece2ad10a1c8cb03f686a5527dac020374
Merge: e5e333dc3a39e4e4525fe107225a7a891115351d be46969812f9baad8575eae6b39d6c7de558f8e3
Author: etobi <git at e-tobi.net>
Date:   Sun Mar 10 18:43:07 2013 +0100

    Merge branch 'master' into e-tobi
    
    Conflicts:
    	debian/.vdr-patches
    	debian/abi-version
    	debian/changelog
    	debian/patches/04_newplugin.patch
    	debian/patches/06_default_svdrp_port_0.patch
    	debian/patches/12_osdbase-maxitems.patch
    	debian/patches/99_ncursesw-include.patch

diff --combined debian/.vdr-patches
index 6c1dafb,bb7b8fd..4f2bd30
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@@ -1,10 -1,4 +1,10 @@@
 +debian/patches/opt-41-x_timer-info.patch:415aa18fc7f2400f5001a7b214c04164
- debian/patches/12_osdbase-maxitems.patch:7aa7360f9c75a23d1fb2cb5cdb12ab10
++debian/patches/12_osdbase-maxitems.patch:2453ebb246e91f62943386e196a8233b
 +debian/patches/opt-45_yaepg.patch:a028d6cbd970660a72241b5948a46f0c
- debian/patches/04_newplugin.patch:1ef4b4fe16ad73193dca00cecf1b51ca
+ debian/patches/04_newplugin.patch:be5169037184e60fe7265891bb8f9f94
 +debian/patches/opt-27_ttxtsubs.patch:f6005824f5c15d5e2f4f618c81b946f9
 +debian/patches/opt-42-x_MainMenuHooks.patch:01c3bd247fff0ee6f3530a5e80a608e7
- debian/patches/06_default_svdrp_port_0.patch:0860916fa856d9e905c9855f672e0478
+ debian/patches/06_default_svdrp_port_0.patch:9c0f2bdcf5f05ae8f112bf2a31a63d91
 -debian/patches/12_osdbase-maxitems.patch:2453ebb246e91f62943386e196a8233b
 +debian/patches/opt-50_graphtft.patch:79e72730327c802a656a49d25b3d2873
 +debian/patches/opt-37-x_menuorg.patch:9068e26643a0ac1a2a9991d42b4a202c
- debian/patches/99_ncursesw-include.patch:244b4795307260d6a25d422d37265a90
+ debian/patches/99_ncursesw-include.patch:a1a84fdba449583cb1759209419a413a
diff --combined debian/abi-version
index cf4e7db,25e7cac..f68e039
--- a/debian/abi-version
+++ b/debian/abi-version
@@@ -1,1 -1,1 +1,1 @@@
- vdr-abi-1.7.39-multipatch
 -vdr-abi-1.7.40-debian
++vdr-abi-1.7.40-multipatch
diff --combined debian/changelog
index 6e8418e,879cbf8..4d882e3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,10 @@@
 -vdr (1.7.40-1) unstable; urgency=low
++vdr (1.7.40-1~etobi1) unstable; urgency=low
++
++  * New upstream release
++
++ -- 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
@@@ -9,13 -9,8 +15,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
 +  * 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 095442d,ffcdb35..54b8069
--- a/debian/rules
+++ b/debian/rules
@@@ -3,28 -3,26 +3,28 @@@
  # Uncomment this to turn on verbose mode.
  #export DH_VERBOSE=1
  
- CXXFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
- CXXFLAGS += $(shell dpkg-buildflags --get CXXFLAGS)
- 
- export VIDEODIR = /var/lib/video
- export LIBDIR = /usr/lib/vdr/plugins
+ CXXFLAGS += $(CPPFLAGS)
+ PREFIX = /usr
+ VIDEODIR = /var/lib/video
+ LIBDIR = /usr/lib/vdr/plugins
+ MAKE_OPTIONS = PREFIX=$(PREFIX) VIDEODIR=$(VIDEODIR) LIBDIR=$(LIBDIR)
  
  %:
  	dh $@
  
  override_dh_auto_build:
- 	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:
- 	dh_auto_install -- PREFIX=/usr
+ 	dh_auto_install -- $(MAKE_OPTIONS)
  
  override_dh_install: patchinfo
  	dh_install --fail-missing -Xlibvdr-epgtableid0.so
@@@ -50,4 -48,4 +50,4 @@@ check-patches
  	python debian/patchcheck.py -c $(PATCHCHECKOPTION)
  
  accept-patches:
- 	python debian/patchcheck.py -u $(PATCHCHECKOPTION)
+ 	python debian/patchcheck.py -u $(PATCHCHECKOPTION)

-- 
vdr packaging repository