[SCM] vdr-plugin-timeline packaging repository branch, master, updated. debian/1.0.141-kw160-4-2-ga097d63

[etobi]

The following commit has been merged in the master branch:
commit a097d6381a9f42ada5c821c4a36b4f61fae69beb
Author: etobi <git at e-tobi.net>
Date:   Fri May 18 02:46:25 2012 +0200

    Standards-Version: 3.9.3
    
    * Standards-Version: 3.9.3
    * Switched to debhelper 7 and dropped cdbs

diff --git a/debian/changelog b/debian/changelog
index 8183292..b6047c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 vdr-plugin-timeline (1.0.141-kw160-5) experimental; urgency=low
 
   * Adapted for VDR 1.7.27
+  * Standards-Version: 3.9.3
+  * Switched to debhelper 7 and dropped cdbs
 
  -- Tobias Grimm <etobi at debian.org>  Fri, 18 May 2012 02:42:06 +0200
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 6fa6fed..5bb58f2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: video
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <etobi at debian.org>, Thomas Schmidt <tschmidt at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>= 5), cdbs, vdr-dev (>= 1.6.0-5)
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.0.50~), vdr-dev (>= 1.7.27), gettext
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-vdr-dvb/vdr-plugin-timeline.git
 Vcs-Browser: http://git.debian.org/?p=pkg-vdr-dvb/vdr-plugin-timeline.git
 
diff --git a/debian/copyright b/debian/copyright
index cff92f0..7cf5f22 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,7 +17,7 @@ Copyright:
 Copyright (Debian packaging):
     (C) 2003        Arthur Weber
     (C) 2004        Peter Siering
-    (C) 2004 - 2008 Tobias Grimm, Thomas Günther, Thomas Schmidt
+    (C) 2004 - 2012 Tobias Grimm, Thomas Günther, Thomas Schmidt
 
 License:
     This program is free software; you can redistribute it and/or modify
diff --git a/debian/install b/debian/install
index 5d7b494..4df5ddb 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1,2 @@
 libvdr-timeline.so.*    usr/lib/vdr/plugins/
+locale                  usr/share/
diff --git a/debian/patches/vdr-1.7.27.patch b/debian/patches/vdr-1.7.27.patch
index 3b35fe4..39ddca1 100644
--- a/debian/patches/vdr-1.7.27.patch
+++ b/debian/patches/vdr-1.7.27.patch
@@ -1,7 +1,7 @@
 Index: vdr-plugin-timeline/i18n.c
 ===================================================================
---- vdr-plugin-timeline.orig/i18n.c	2012-05-18 02:41:24.000000000 +0200
-+++ vdr-plugin-timeline/i18n.c	2012-05-18 02:41:36.000000000 +0200
+--- vdr-plugin-timeline.orig/i18n.c	2012-05-18 02:41:48.000000000 +0200
++++ vdr-plugin-timeline/i18n.c	2012-05-18 02:55:28.000000000 +0200
 @@ -7,6 +7,7 @@
   *
   */
@@ -10,3 +10,19 @@ Index: vdr-plugin-timeline/i18n.c
  #if APIVERSNUM < 10507
  #include "i18n.h"
  
+Index: vdr-plugin-timeline/checkerOsd.c
+===================================================================
+--- vdr-plugin-timeline.orig/checkerOsd.c	2012-05-18 02:41:24.000000000 +0200
++++ vdr-plugin-timeline/checkerOsd.c	2012-05-18 02:57:05.000000000 +0200
+@@ -350,11 +350,6 @@
+ 									for(int i=cDevice::NumDevices()-1;i>=0 && nofree;i--)
+ 									{
+ 										cdt=cDevice::GetDevice(i);
+-										if (cdt->IsPrimaryDevice() && !timelineCfg.ignorePrimary)
+-										{
+-											if (Setup.PrimaryLimit>ct2->Priority())
+-												continue;
+-										}
+ 										
+ 										if (cdt->ProvidesChannel(ch2) && cd1->DeviceNumber()!=cdt->DeviceNumber())
+ 										{
diff --git a/debian/rules b/debian/rules
index 7d001e2..9f487b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,20 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-#include /usr/share/cdbs/1/rules/dpatch.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-DEB_INSTALL_CHANGELOGS_ALL = HISTORY
+MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale
 
-MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. \
-               LOCALEDIR=debian/tmp/usr/share/locale
+%:
+	dh $@
 
-common-build-arch::
-	$(MAKE) all $(MAKE_OPTIONS)
+override_dh_auto_build:
+	dh_auto_build -- all $(MAKE_OPTIONS)
 
-cleanbuilddir::
+override_dh_auto_clean:
 	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
-	rm -f libvdr-*.so.*
+	rm -rf locale libvdr-*.so.*
 
-common-binary-predeb-arch::
+override_dh_gencontrol:
 	sh /usr/share/vdr-dev/dependencies.sh
+	dh_gencontrol
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
vdr-plugin-timeline packaging repository