r8894 - in /vdr/vdr-plugin-prefermenu/trunk/debian: ./ patches/ source/

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Sat Apr 9 11:53:12 UTC 2011 

Author: tiber-guest
Date: Sat Apr  9 11:53:03 2011
New Revision: 8894

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8894
Log:
* Build-depend on vdr-dev >= 1.7.17
* Updated debian/copyright
* Standards-Version: 3.9.1
* Switched to debhelper 7 and dropped cdbs

Added:
    vdr/vdr-plugin-prefermenu/trunk/debian/patches/01_Makefile-fPIC-fix.patch
      - copied unchanged from r8686, vdr/vdr-plugin-prefermenu/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
    vdr/vdr-plugin-prefermenu/trunk/debian/patches/02_Makefile-GNU_SOURCE-fix.patch
      - copied, changed from r8686, vdr/vdr-plugin-prefermenu/trunk/debian/patches/02_Makefile-GNU_SOURCE-fix.dpatch
    vdr/vdr-plugin-prefermenu/trunk/debian/patches/90_prefermenu-0.6.6-1.5.3+SetAreas-bugfix.patch
      - copied, changed from r8686, vdr/vdr-plugin-prefermenu/trunk/debian/patches/90_prefermenu-0.6.6-1.5.3+SetAreas-bugfix.dpatch
    vdr/vdr-plugin-prefermenu/trunk/debian/patches/series
      - copied, changed from r8686, vdr/vdr-plugin-prefermenu/trunk/debian/patches/00list
    vdr/vdr-plugin-prefermenu/trunk/debian/source/
    vdr/vdr-plugin-prefermenu/trunk/debian/source/format
Removed:
    vdr/vdr-plugin-prefermenu/trunk/debian/README.source
    vdr/vdr-plugin-prefermenu/trunk/debian/patches/00list
    vdr/vdr-plugin-prefermenu/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
    vdr/vdr-plugin-prefermenu/trunk/debian/patches/02_Makefile-GNU_SOURCE-fix.dpatch
    vdr/vdr-plugin-prefermenu/trunk/debian/patches/90_prefermenu-0.6.6-1.5.3+SetAreas-bugfix.dpatch
Modified:
    vdr/vdr-plugin-prefermenu/trunk/debian/changelog
    vdr/vdr-plugin-prefermenu/trunk/debian/compat
    vdr/vdr-plugin-prefermenu/trunk/debian/control
    vdr/vdr-plugin-prefermenu/trunk/debian/copyright
    vdr/vdr-plugin-prefermenu/trunk/debian/rules

Modified: vdr/vdr-plugin-prefermenu/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-prefermenu/trunk/debian/changelog?rev=8894&op=diff
==============================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/changelog Sat Apr  9 11:53:03 2011
@@ -1,3 +1,12 @@
+vdr-plugin-prefermenu (0.6.6-28) unstable; urgency=low
+
+  * Build-depend on vdr-dev >= 1.7.17
+  * Updated debian/copyright
+  * Standards-Version: 3.9.1
+  * Switched to debhelper 7 and dropped cdbs
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 09 Apr 2011 13:45:49 +0200
+
 vdr-plugin-prefermenu (0.6.6-27) unstable; urgency=low
 
   * Build-depend on vdr-dev >= 1.6.0-16

Modified: vdr/vdr-plugin-prefermenu/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-prefermenu/trunk/debian/compat?rev=8894&op=diff
==============================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/compat (original)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/compat Sat Apr  9 11:53:03 2011
@@ -1,1 +1,1 @@
-5
+7

Modified: vdr/vdr-plugin-prefermenu/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-prefermenu/trunk/debian/control?rev=8894&op=diff
==============================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/control (original)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/control Sat Apr  9 11:53:03 2011
@@ -3,8 +3,8 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-16)
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.0.50~), vdr-dev (>= 1.7.17)
+Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-prefermenu/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-prefermenu/trunk/
 Homepage: http://www.olivierjacques.com/vdr/prefermenu/

Modified: vdr/vdr-plugin-prefermenu/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-prefermenu/trunk/debian/copyright?rev=8894&op=diff
==============================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/copyright Sat Apr  9 11:53:03 2011
@@ -14,7 +14,7 @@
     (C) 2002 - 2006 Maxime Guilbot, Olivier Jacques
 
 Copyright (Debian packaging):
-    (C) 2003 - 2010 Tobias Grimm, Thomas Günther, Thomas Schmidt
+    (C) 2003 - 2011 Tobias Grimm, Thomas Günther, Thomas Schmidt
 
 License:
     This program is free software; you can redistribute it and/or modify

Copied: vdr/vdr-plugin-prefermenu/trunk/debian/patches/02_Makefile-GNU_SOURCE-fix.patch (from r8686, vdr/vdr-plugin-prefermenu/trunk/debian/patches/02_Makefile-GNU_SOURCE-fix.dpatch)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-prefermenu/trunk/debian/patches/02_Makefile-GNU_SOURCE-fix.patch?rev=8894&op=diff
==============================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/patches/02_Makefile-GNU_SOURCE-fix.dpatch (original)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/patches/02_Makefile-GNU_SOURCE-fix.patch Sat Apr  9 11:53:03 2011
@@ -6,10 +6,12 @@
 ## DP: add -D_GNU_SOURCE to enable GNU extensions
 
 @DPATCH@
---- vdr-plugin-pvr350-0.0.2/Makefile.orig	Thu Feb 26 01:11:15 2004
-+++ vdr-plugin-pvr350-0.0.2/Makefile	Thu Feb 26 01:11:34 2004
-@@ -43,6 +43,7 @@
- INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
+Index: vdr-plugin-prefermenu-0.6.6/Makefile
+===================================================================
+--- vdr-plugin-prefermenu-0.6.6.orig/Makefile	2011-04-09 13:51:33.000000000 +0200
++++ vdr-plugin-prefermenu-0.6.6/Makefile	2011-04-09 13:51:34.000000000 +0200
+@@ -46,6 +46,7 @@
+ endif
  
  DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 +DEFINES += -D_GNU_SOURCE

Copied: vdr/vdr-plugin-prefermenu/trunk/debian/patches/90_prefermenu-0.6.6-1.5.3+SetAreas-bugfix.patch (from r8686, vdr/vdr-plugin-prefermenu/trunk/debian/patches/90_prefermenu-0.6.6-1.5.3+SetAreas-bugfix.dpatch)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-prefermenu/trunk/debian/patches/90_prefermenu-0.6.6-1.5.3%2BSetAreas-bugfix.patch?rev=8894&op=diff
==============================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/patches/90_prefermenu-0.6.6-1.5.3+SetAreas-bugfix.dpatch (original)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/patches/90_prefermenu-0.6.6-1.5.3+SetAreas-bugfix.patch Sat Apr  9 11:53:03 2011
@@ -6,8 +6,10 @@
 ## DP: Changes for VDR >= 1.5.3.
 
 @DPATCH@
---- prefermenu-0.6.6/prefermenu.c
-+++ prefermenu-0.6.6/prefermenu.c
+Index: vdr-plugin-prefermenu-0.6.6/prefermenu.c
+===================================================================
+--- vdr-plugin-prefermenu-0.6.6.orig/prefermenu.c	2005-01-11 20:09:40.000000000 +0100
++++ vdr-plugin-prefermenu-0.6.6/prefermenu.c	2011-04-09 13:51:46.000000000 +0200
 @@ -75,6 +75,7 @@
    }
    // Clean up the file with current VDR channels.conf
@@ -16,9 +18,11 @@
    config.height= (config.lines * (LINEHEIGHT+BORDERSIZE+2))+BORDERSIZE;
    return new cPreferOsd;
  }
---- prefermenu-0.6.6/preferosd.c
-+++ prefermenu-0.6.6/preferosd.c
-@@ -60,6 +60,7 @@
+Index: vdr-plugin-prefermenu-0.6.6/preferosd.c
+===================================================================
+--- vdr-plugin-prefermenu-0.6.6.orig/preferosd.c	2006-05-06 15:19:28.000000000 +0200
++++ vdr-plugin-prefermenu-0.6.6/preferosd.c	2011-04-09 13:51:46.000000000 +0200
+@@ -60,7 +60,8 @@
    }
    osd=cOsdProvider::NewOsd(config.originx, config.originy);
    if (osd) {
@@ -27,6 +31,7 @@
 +    tArea Area = { 0, 0, ((config.width+LINEHEIGHT) & ~0x01) - 1, config.height-1, 4};
      osd->SetAreas(&Area, 1);
      DrawPreferMenu(0,0);
+     DisplayPreferMenu();
 @@ -168,6 +169,7 @@
  {
    if (current > 1) {
@@ -61,8 +66,10 @@
  
    // XXX The margin is hardcoded for now
    // TODO: make it more flexible
---- prefermenu-0.6.6/preferosd.h
-+++ prefermenu-0.6.6/preferosd.h
+Index: vdr-plugin-prefermenu-0.6.6/preferosd.h
+===================================================================
+--- vdr-plugin-prefermenu-0.6.6.orig/preferosd.h	2006-05-04 21:59:17.000000000 +0200
++++ vdr-plugin-prefermenu-0.6.6/preferosd.h	2011-04-09 13:51:46.000000000 +0200
 @@ -4,8 +4,6 @@
  #include <vdr/plugin.h>
  

Copied: vdr/vdr-plugin-prefermenu/trunk/debian/patches/series (from r8686, vdr/vdr-plugin-prefermenu/trunk/debian/patches/00list)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-prefermenu/trunk/debian/patches/series?rev=8894&op=diff
==============================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/patches/series Sat Apr  9 11:53:03 2011
@@ -1,3 +1,3 @@
-01_Makefile-fPIC-fix
-02_Makefile-GNU_SOURCE-fix
-90_prefermenu-0.6.6-1.5.3+SetAreas-bugfix
+01_Makefile-fPIC-fix.patch
+02_Makefile-GNU_SOURCE-fix.patch
+90_prefermenu-0.6.6-1.5.3+SetAreas-bugfix.patch

Modified: vdr/vdr-plugin-prefermenu/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-prefermenu/trunk/debian/rules?rev=8894&op=diff
==============================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/rules (original)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/rules Sat Apr  9 11:53:03 2011
@@ -1,17 +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
 
-MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=.
+MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale
 
-common-build-arch::
-	$(MAKE) all $(MAKE_OPTIONS)
+%:
+	dh $@
 
-clean::
+override_dh_auto_build:
+	dh_auto_build -- all $(MAKE_OPTIONS)
+
+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

Added: vdr/vdr-plugin-prefermenu/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-prefermenu/trunk/debian/source/format?rev=8894&op=file
==============================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/source/format (added)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/source/format Sat Apr  9 11:53:03 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the pkg-vdr-dvb-changes mailing list