[SCM] vdr-plugin-osdpip packaging repository branch, master, updated. upstream/0.1.1-5-gff2b5c1

[etobi]

The following commit has been merged in the master branch:
commit ff2b5c105b759c3fa1a0b76f8b4dd315424ec820
Author: etobi <git at e-tobi.net>
Date:   Wed May 16 22:47:42 2012 +0200

    New upstream release
    
    * New upstream release
    * Standards-Version: 3.9.3
    * Build-depend in vdr-dev (>= 1.7.27)

diff --git a/debian/changelog b/debian/changelog
index 07d26bf..3af037d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vdr-plugin-osdpip (0.1.2-1) experimental; urgency=low
+
+  * New upstream release
+  * Standards-Version: 3.9.3
+  * Build-depend in vdr-dev (>= 1.7.27)
+
+ -- Tobias Grimm <etobi at debian.org>  Wed, 16 May 2012 22:43:59 +0200
+
 vdr-plugin-osdpip (0.1.1-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index c02e5c6..04da73f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,14 @@ Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>, Thomas Schmidt <tschmidt at debian.org>
 Origin: ctvdr
-Build-Depends: debhelper (>= 7), cdbs, vdr-dev (>= 1.6.0-5), pkg-config, libavcodec-dev, libswscale-dev, gettext
-Standards-Version: 3.8.4
-Homepage: http://home.arcor.de/andreas.regel/files
+Build-Depends: debhelper (>= 7.0.50~), vdr-dev (>= 1.7.27), pkg-config, libavcodec-dev, libswscale-dev, gettext
+Standards-Version: 3.9.3
+Homepage: http://projects.vdr-developer.org/projects/plg-osdpip
 
 Package: vdr-plugin-osdpip
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}
 Description: OSD Picture-in-Picture-PlugIn for VDR
- OSD Picture-in-Picture is a PlugIn that displays the current channel in a 
- small box on the screen (default upper right corner). You can switch up and 
+ OSD Picture-in-Picture is a PlugIn that displays the current channel in a
+ small box on the screen (default upper right corner). You can switch up and
  down now, watching the progress of the previous channel in the box.
diff --git a/debian/copyright b/debian/copyright
index 410bc42..164ea55 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -31,7 +31,7 @@ Copyright (remux.c, remux.h - taken from VDR-1.6.0):
     (C) 2001 - 2008 Klaus Schmidinger <Klaus.Schmidinger at tvdr.de>
 
 Copyright (Debian packaging):
-    (C) 2004 - 2010 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 bb1b20a..165de2e 100644
--- a/debian/install
+++ b/debian/install
@@ -1,2 +1,2 @@
 libvdr-osdpip.so.*              usr/lib/vdr/plugins/
-debian/tmp/usr/share/locale
+locale                          usr/share/
diff --git a/debian/rules b/debian/rules
index bd4c399..6c9a1b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,20 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.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 STRIP=/bin/true
 
-MAKE_OPTIONS = 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

-- 
vdr-plugin-osdpip packaging repository