r5399 - in /vdr/vdr-plugin-epgsearch/trunk/debian: changelog control copyright install patches/00list patches/01_debian-defaults.dpatch patches/92_epgsearch-0.9.23-beta1.dpatch rules

tom-guest at users.alioth.debian.org tom-guest at users.alioth.debian.org
Sat Sep 1 15:37:43 UTC 2007 

Author: tom-guest
Date: Sat Sep  1 15:37:43 2007
New Revision: 5399

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=5399
Log:
New upstream beta release 0.9.23~beta18

Removed:
    vdr/vdr-plugin-epgsearch/trunk/debian/patches/92_epgsearch-0.9.23-beta1.dpatch
Modified:
    vdr/vdr-plugin-epgsearch/trunk/debian/changelog
    vdr/vdr-plugin-epgsearch/trunk/debian/control
    vdr/vdr-plugin-epgsearch/trunk/debian/copyright
    vdr/vdr-plugin-epgsearch/trunk/debian/install
    vdr/vdr-plugin-epgsearch/trunk/debian/patches/00list
    vdr/vdr-plugin-epgsearch/trunk/debian/patches/01_debian-defaults.dpatch
    vdr/vdr-plugin-epgsearch/trunk/debian/rules

Modified: vdr/vdr-plugin-epgsearch/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-epgsearch/trunk/debian/changelog?rev=5399&op=diff
==============================================================================
--- vdr/vdr-plugin-epgsearch/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-epgsearch/trunk/debian/changelog Sat Sep  1 15:37:43 2007
@@ -1,3 +1,14 @@
+vdr-plugin-epgsearch (0.9.23~beta18-1) unstable; urgency=low
+
+  * New upstream beta release
+  * Adapted 01_debian-defaults.dpatch
+  * Removed 92_epgsearch-0.9.23-beta1.dpatch
+  * Added gettext to Build-Depends
+  * Added installation of locale files
+  * Corrected license in debian/copyright
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sat,  1 Sep 2007 15:59:08 +0200
+
 vdr-plugin-epgsearch (0.9.22-3) unstable; urgency=low
 
   * Release for vdrdevel 1.5.6

Modified: vdr/vdr-plugin-epgsearch/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-epgsearch/trunk/debian/control?rev=5399&op=diff
==============================================================================
--- vdr/vdr-plugin-epgsearch/trunk/debian/control (original)
+++ vdr/vdr-plugin-epgsearch/trunk/debian/control Sat Sep  1 15:37:43 2007
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.5-1)
+Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.5-1), gettext
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-epgsearch/trunk/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-epgsearch/trunk/

Modified: vdr/vdr-plugin-epgsearch/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-epgsearch/trunk/debian/copyright?rev=5399&op=diff
==============================================================================
--- vdr/vdr-plugin-epgsearch/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-epgsearch/trunk/debian/copyright Sat Sep  1 15:37:43 2007
@@ -1,9 +1,7 @@
-This package was debianized by Roman Müllenschläder <qwasi_1999 at yahoo.de> on
-Tue,  7 Dec 2004 16:57:09 +0100.
+Upstream Homepage:
+    http://winni.vdr-developer.org/epgsearch/
 
-It was downloaded from http://winni.vdr-developer.org/epgsearch/
-
-Upstream Authors: 
+Upstream Authors:
     Christian Wieninger
     Mike Constabel (manpages)
 
@@ -23,11 +21,14 @@
     (C) 1991-2 RSA Data Security, Inc
     (C) 2002 Gary McNickle
 
+Copyright (Debian packaging):
+    (C) 2004 - 2007 Roman Müllenschläder, Tobias Grimm, Thomas Günther,
+                    Thomas Schmidt
+
 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.
+    the Free Software Foundation; version 2 dated June, 1991.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -59,3 +60,7 @@
     without express or implied warranty of any kind.
     These notices must be retained in any copies of any part of this
     documentation and/or software.
+
+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-epgsearch/trunk/debian/install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-epgsearch/trunk/debian/install?rev=5399&op=diff
==============================================================================
--- vdr/vdr-plugin-epgsearch/trunk/debian/install (original)
+++ vdr/vdr-plugin-epgsearch/trunk/debian/install Sat Sep  1 15:37:43 2007
@@ -12,3 +12,5 @@
 
 conf/epgsearchupdmail.templ     etc/vdr/plugins/epgsearch/
 conf/epgsearchconflmail.templ   etc/vdr/plugins/epgsearch/
+
+locale                          usr/share/vdr/

Modified: vdr/vdr-plugin-epgsearch/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-epgsearch/trunk/debian/patches/00list?rev=5399&op=diff
==============================================================================
--- vdr/vdr-plugin-epgsearch/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-epgsearch/trunk/debian/patches/00list Sat Sep  1 15:37:43 2007
@@ -1,3 +1,1 @@
 01_debian-defaults
-
-92_epgsearch-0.9.23-beta1

Modified: vdr/vdr-plugin-epgsearch/trunk/debian/patches/01_debian-defaults.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-epgsearch/trunk/debian/patches/01_debian-defaults.dpatch?rev=5399&op=diff
==============================================================================
--- vdr/vdr-plugin-epgsearch/trunk/debian/patches/01_debian-defaults.dpatch (original)
+++ vdr/vdr-plugin-epgsearch/trunk/debian/patches/01_debian-defaults.dpatch Sat Sep  1 15:37:43 2007
@@ -1,42 +1,107 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 01_debian-defaults.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## Thomas Günther <tom at toms-cafe.de>:
+##   - adapted to epgsearch-0.9.23.beta18
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Modifies some debian-specific default settings.
 
 @DPATCH@
-diff -urNad vdr-plugin-epgsearch-0.9.18~/doc/de/epgsearch.1.txt vdr-plugin-epgsearch-0.9.18/doc/de/epgsearch.1.txt
---- vdr-plugin-epgsearch-0.9.18~/doc/de/epgsearch.1.txt	2006-10-01 10:44:38.000000000 +0200
-+++ vdr-plugin-epgsearch-0.9.18/doc/de/epgsearch.1.txt	2006-10-21 15:37:20.000000000 +0200
-@@ -87,9 +87,9 @@
+--- epgsearch-0.9.23.beta18/doc/de/epgsearch.1.txt
++++ epgsearch-0.9.23.beta18/doc/de/epgsearch.1.txt
+@@ -87,9 +87,9 @@ OPTIONEN
  
         -m file,  --mailcmd=file
-            das externe Kommando für den Emailversand. Als Standard wird
--           'sendEmail.pl' benutzt. Wenn ein abweichendes Kommando oder Skript
-+           'sendEmail' benutzt. Wenn ein abweichendes Kommando oder Skript
+            das externe Kommando für den Emailversand. Als Standard wird
+-           ’sendEmail.pl’ benutzt. Wenn ein abweichendes Kommando oder Skript
++           ’sendEmail’ benutzt. Wenn ein abweichendes Kommando oder Skript
             verwendet wird, muss sichergestellt sein, dass das gleiche
 -           Paramter-Interface verwendet wird, wie bei sendEmail.pl.
 +           Paramter-Interface verwendet wird, wie bei sendEmail.
  
  Inhalt
          1.    Beschreibung
-diff -urNad vdr-plugin-epgsearch-0.9.18~/doc/en/epgsearch.1.txt vdr-plugin-epgsearch-0.9.18/doc/en/epgsearch.1.txt
---- vdr-plugin-epgsearch-0.9.18~/doc/en/epgsearch.1.txt	2006-10-01 10:44:39.000000000 +0200
-+++ vdr-plugin-epgsearch-0.9.18/doc/en/epgsearch.1.txt	2006-10-21 15:37:09.000000000 +0200
-@@ -81,8 +81,8 @@
+@@ -652,7 +652,7 @@ Inhalt
+ 
+        1.4.7 Email-Benachrichtigungen
+ 
+-       (Bitte sicherstellen, dass ’sendEmail.pl’ im Pfad der ausführbaren
++       (Bitte sicherstellen, dass ’sendEmail’ im Pfad der ausführbaren
+        Dateien liegt und ’epgsearchupdmail.templ’ und ’epgsearchcon‐
+        flmail.templ’ im Konfig-Verzeichnis von epgsearch existieren!)
+ 
+@@ -687,7 +687,7 @@ Inhalt
+        - Mail-Methode:
+            Zur Auswahl stehen
+ 
+-             - sendEmail.pl: ein einfaches Skript, das auch auf Systemen ohne
++             - sendEmail: ein einfaches Skript, das auch auf Systemen ohne
+                konfigurierten Mailserver den Versand von Emails erlaubt. Das Skript wird
+                mit epgsearch ausgeliefert und sollte im $PATH liegen.
+              - sendmail: setzt ein korrekt aufgesetzes Mailsystem voraus.
+@@ -715,7 +715,7 @@ Inhalt
+            rations-Dateien möglich ist.
+ 
+        Nach Angabe der Email-Konto-Daten bitte mit ’Test’ prüfen, ob alles
+-       funktioniert. Wenn mit ’sendEmail.pl’ gearbeitet wird, sollte am Ende
++       funktioniert. Wenn mit ’sendEmail’ gearbeitet wird, sollte am Ende
+        der Test-Ausgabe etwas wie ’Email sent successfully’ auftauchen. Die
+        Testfunktion gibt es bei der Methode ’sendmail’ leider nicht.
+ 
+--- epgsearch-0.9.23.beta18/doc/en/epgsearch.1.txt
++++ epgsearch-0.9.23.beta18/doc/en/epgsearch.1.txt
+@@ -81,8 +81,8 @@ OPTIONS
  
         -m file,  --mailcmd=file
             the external command to be used for mail delivery. The default uses
--           'sendEmail.pl'. If you are using a different command or script make
+-           ’sendEmail.pl’. If you are using a different command or script make
 -           sure that it has the same parameter interface as sendEmail.pl.
-+           'sendEmail'. If you are using a different command or script make
++           ’sendEmail’. If you are using a different command or script make
 +           sure that it has the same parameter interface as sendEmail.
  
  CONTENT
          1.    Description
-diff -urNad vdr-plugin-epgsearch-0.9.18~/mail.c vdr-plugin-epgsearch-0.9.18/mail.c
---- vdr-plugin-epgsearch-0.9.18~/mail.c	2006-09-29 12:36:44.000000000 +0200
-+++ vdr-plugin-epgsearch-0.9.18/mail.c	2006-10-21 15:35:16.000000000 +0200
+@@ -626,7 +626,7 @@ CONTENT
+ 
+        1.4.7 Email notification
+ 
+-       Please make sure, that ’sendEmail.pl’ is in the path of your executa‐
++       Please make sure, that ’sendEmail’ is in the path of your executa‐
+        bles and that the ’epgsearchupdmail.templ’ and ’epgsearchcon‐
+        flmail.templ’ exists in epgsearch’s configurations directory!
+ 
+@@ -659,7 +659,7 @@ CONTENT
+        - Mail method:
+            You can choose between:
+ 
+-             - sendEmail.pl: this is a simply script shipped with epgsearch, that allows
++             - sendEmail: this is a simply script shipped with epgsearch, that allows
+                mail delivery also on systems without a configured mail server. Please
+                copy it to your $PATH
+              - sendmail: requires a properly configured mail system
+@@ -683,7 +683,7 @@ CONTENT
+            are visible to non authorized persons.
+ 
+        After the account setup, check if it works with ’Test’. If you are
+-       using ’sendEmail.pl’ for mail delivery, there should be something like
++       using ’sendEmail’ for mail delivery, there should be something like
+        ’Email sent successfully’ at the end of the test output. The test func‐
+        tion is not available for method ’sendmail’.
+ 
+--- epgsearch-0.9.23.beta18/doc/en/epgsearch.4.txt
++++ epgsearch-0.9.23.beta18/doc/en/epgsearch.4.txt
+@@ -699,7 +699,7 @@ CONTENT
+ 13. Email notification
+        If you want to get email notifications about timers added/modi‐
+        fied/removed by the search timer thread or about timer conflicts, first
+-       copy the script ’sendEmail.pl’ to the place where your executables are
++       copy the script ’sendEmail’ to the place where your executables are
+        (e.g. /usr/local/bin) and then configure your email account in the
+        setup. Press ’Test’ to check if it works. There should be something
+        like ’Email successfully sent’ at the end of the output.  The content
+--- epgsearch-0.9.23.beta18/mail.c
++++ epgsearch-0.9.23.beta18/mail.c
 @@ -10,7 +10,7 @@
  
  using namespace std;
@@ -46,7 +111,7 @@
  
  // ----------------------
  // cMailTimerNotification
-@@ -131,7 +131,7 @@
+@@ -170,7 +170,7 @@ bool cMailNotifier::SendMail()
  bool cMailNotifier::ExecuteMailScript(string ScriptArgs)
  {
      string mailCmd = MailCmd;

Modified: vdr/vdr-plugin-epgsearch/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-epgsearch/trunk/debian/rules?rev=5399&op=diff
==============================================================================
--- vdr/vdr-plugin-epgsearch/trunk/debian/rules (original)
+++ vdr/vdr-plugin-epgsearch/trunk/debian/rules Sat Sep  1 15:37:43 2007
@@ -24,7 +24,7 @@
 endif
 
 MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. \
-               INCLUDES=-I/usr/include/vdr
+               INCLUDES=-I/usr/include/vdr LOCALEDIR=locale
 
 configure: configure-stamp
 configure-stamp: patch-stamp
@@ -44,6 +44,7 @@
 	rm -f build-stamp configure-stamp
 	-$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
 	rm -f libvdr-*.so.*
+	rm -rf locale
 	dh_clean
 
 install: build

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