r5444 - in /vdr/vdr-plugin-prefermenu/trunk/debian: changelog copyright patches/00list patches/90_prefermenu-0.6.6-1.5.3+SetAreas-bugfix.dpatch patches/90_prefermenu-0.6.6-1.5.3.dpatch

tom-guest at users.alioth.debian.org tom-guest at users.alioth.debian.org
Thu Sep 27 21:16:22 UTC 2007


Author: tom-guest
Date: Thu Sep 27 21:16:21 2007
New Revision: 5444

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=5444
Log:
Replaced 90_prefermenu-0.6.6-1.5.3.dpatch with 90_prefermenu-0.6.6-1.5.3+SetAreas-bugfix.dpatch

Added:
    vdr/vdr-plugin-prefermenu/trunk/debian/patches/90_prefermenu-0.6.6-1.5.3+SetAreas-bugfix.dpatch
      - copied, changed from r4930, vdr/vdr-plugin-prefermenu/trunk/debian/patches/90_prefermenu-0.6.6-1.5.3.dpatch
Removed:
    vdr/vdr-plugin-prefermenu/trunk/debian/patches/90_prefermenu-0.6.6-1.5.3.dpatch
Modified:
    vdr/vdr-plugin-prefermenu/trunk/debian/changelog
    vdr/vdr-plugin-prefermenu/trunk/debian/copyright
    vdr/vdr-plugin-prefermenu/trunk/debian/patches/00list

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=5444&op=diff
==============================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/changelog Thu Sep 27 21:16:21 2007
@@ -1,3 +1,11 @@
+vdr-plugin-prefermenu (0.6.6-15) unstable; urgency=low
+
+  * Replaced 90_prefermenu-0.6.6-1.5.3.dpatch with
+    90_prefermenu-0.6.6-1.5.3+SetAreas-bugfix.dpatch
+  * Added full license disclaimer and copyright years to debian/copyright
+
+ -- Thomas Günther <tom at toms-cafe.de>  Thu, 27 Sep 2007 22:58:30 +0200
+
 vdr-plugin-prefermenu (0.6.6-14) unstable; urgency=low
 
   * Release for vdrdevel 1.5.9

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=5444&op=diff
==============================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/copyright Thu Sep 27 21:16:21 2007
@@ -1,33 +1,39 @@
-This package was debianized by Thomas Schmidt <tschmidt at debian.org> on
-Thu, 13 Sept 2003 10:30:00 +0200.
+Upstream Homepage:
+    http://www.olivierjacques.com/vdr/prefermenu/
 
-It was downloaded from http://www.olivierjacques.com/vdr/prefermenu
-
-Upstream Authors: Maxime Guilbot <maxime.guilbot at online.fr>
-                  Olivier Jacques <vdr at olivierjacques.com>
+Upstream Authors:
+    Maxime Guilbot <maxime.guilbot at online.fr>
+    Olivier Jacques <vdr at olivierjacques.com>
 
 Debian Maintainers:
-
-  Tobias Grimm <tg at e-tobi.net>
-  Thomas Schmidt <tschmidt at debian.org>
-  Thomas Günther <tom at toms-cafe.de>
+    Tobias Grimm <tg at e-tobi.net>
+    Thomas Günther <tom at toms-cafe.de>
+    Thomas Schmidt <tschmidt at debian.org>
 
 Copyright:
+    (C) 2002 - 2006 Maxime Guilbot, Olivier Jacques
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
+Copyright (Debian packaging):
+    (C) 2003 - 2007 Tobias Grimm, Thomas Günther, Thomas Schmidt
 
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+License:
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
 
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the  Free Software 
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-  MA 02110-1301, USA.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
- see /usr/share/common-licenses/GPL
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+    The complete text of the GNU General Public License can be found
+    in /usr/share/common-licenses/GPL on most Debian systems.
+
+License (Debian packaging):
+    The Debian packaging is licensed under the GPL, version 2 or any
+    later version, see /usr/share/common-licenses/GPL.

Modified: vdr/vdr-plugin-prefermenu/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-prefermenu/trunk/debian/patches/00list?rev=5444&op=diff
==============================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/patches/00list Thu Sep 27 21:16:21 2007
@@ -1,3 +1,3 @@
 01_Makefile-fPIC-fix
 02_Makefile-GNU_SOURCE-fix
-90_prefermenu-0.6.6-1.5.3
+90_prefermenu-0.6.6-1.5.3+SetAreas-bugfix

Copied: vdr/vdr-plugin-prefermenu/trunk/debian/patches/90_prefermenu-0.6.6-1.5.3+SetAreas-bugfix.dpatch (from r4930, vdr/vdr-plugin-prefermenu/trunk/debian/patches/90_prefermenu-0.6.6-1.5.3.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.dpatch?rev=5444&op=diff
==============================================================================
--- vdr/vdr-plugin-prefermenu/trunk/debian/patches/90_prefermenu-0.6.6-1.5.3.dpatch (original)
+++ vdr/vdr-plugin-prefermenu/trunk/debian/patches/90_prefermenu-0.6.6-1.5.3+SetAreas-bugfix.dpatch Thu Sep 27 21:16:21 2007
@@ -1,6 +1,6 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 90_prefermenu-0.6.6-1.5.3.dpatch by Thomas Günther <tom at toms-cafe.de>
-## http://toms-cafe.de/vdr/download/prefermenu-0.6.6-1.5.3.diff
+## 90_prefermenu-0.6.6-1.5.3+SetAreas-bugfix.dpatch by Thomas Günther <tom at toms-cafe.de>
+## http://toms-cafe.de/vdr/download/prefermenu-0.6.6-1.5.3+SetAreas-bugfix.diff
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Changes for VDR >= 1.5.3.
@@ -22,8 +22,9 @@
    }
    osd=cOsdProvider::NewOsd(config.originx, config.originy);
    if (osd) {
+-    tArea Area = { 0, 0, config.width+LINEHEIGHT, config.height-1, 4};
 +    const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height();
-     tArea Area = { 0, 0, config.width+LINEHEIGHT, config.height-1, 4};
++    tArea Area = { 0, 0, ((config.width+LINEHEIGHT) & ~0x01) - 1, config.height-1, 4};
      osd->SetAreas(&Area, 1);
      DrawPreferMenu(0,0);
 @@ -168,6 +169,7 @@




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