[SCM] vdr-plugin-epgsearch packaging repository branch, master, updated. debian/1.0.0+git20120325-1
etobi
git at e-tobi.net
Tue Apr 3 18:08:48 UTC 2012
The following commit has been merged in the master branch:
commit bda6e2f17c819c8473f0435559414eedf5a2a74f
Author: etobi <git at e-tobi.net>
Date: Sun Mar 25 14:08:50 2012 +0200
New Upstream Snapshot (commit 65f1e50)
diff --git a/debian/changelog b/debian/changelog
index c962689..ff86204 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-vdr-plugin-epgsearch (1.0.0-5) unstable; urgency=low
+vdr-plugin-epgsearch (1.0.0+git20120325-1) unstable; urgency=low
+ * New Upstream Snapshot (commit 65f1e50)
* Build-depend on vdr-dev (>= 1.7.26)
* Standards-Version: 3.9.3
* Added debian/rules get-vcs-snapshot
diff --git a/debian/patches/01_debian-defaults.patch b/debian/patches/01_debian-defaults.patch
index 09f52f9..2f6710d 100644
--- a/debian/patches/01_debian-defaults.patch
+++ b/debian/patches/01_debian-defaults.patch
@@ -9,111 +9,11 @@
## DP: Modifies some debian-specific default settings.
@DPATCH@
-Index: vdr-plugin-epgsearch-1.0.0/doc/de/epgsearch.1.txt
+Index: vdr-plugin-epgsearch/epgsearchsetup.c
===================================================================
---- vdr-plugin-epgsearch-1.0.0.orig/doc/de/epgsearch.1.txt 2011-09-11 19:58:48.000000000 +0200
-+++ vdr-plugin-epgsearch-1.0.0/doc/de/epgsearch.1.txt 2011-09-18 19:57:06.000000000 +0200
-@@ -87,9 +87,9 @@
-
- -m file, --mailcmd=file
- das externe Kommando fuer 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
-@@ -706,7 +706,7 @@
-
- 1.4.7 Email-Benachrichtigungen
-
-- (Bitte sicherstellen, dass 'sendEmail.pl' im Pfad der ausfuehrbaren
-+ (Bitte sicherstellen, dass 'sendEmail' im Pfad der ausfuehrbaren
- Dateien liegt und 'epgsearchupdmail.templ' und
- 'epgsearchconflmail.templ' im Konfig-Verzeichnis von epgsearch
- existieren!)
-@@ -749,7 +749,7 @@
- - 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.
-@@ -777,7 +777,7 @@
- Konfigurations-Dateien moeglich ist.
-
- Nach Angabe der Email-Konto-Daten bitte mit 'Test' pruefen, 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.
-
-Index: vdr-plugin-epgsearch-1.0.0/doc/en/epgsearch.1.txt
-===================================================================
---- vdr-plugin-epgsearch-1.0.0.orig/doc/en/epgsearch.1.txt 2011-09-11 19:58:48.000000000 +0200
-+++ vdr-plugin-epgsearch-1.0.0/doc/en/epgsearch.1.txt 2011-09-18 19:57:06.000000000 +0200
-@@ -81,8 +81,8 @@
-
- -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
-- sure that it has the same parameter interface as sendEmail.pl.
-+ 'sendEmail'. If you are using a different command or script make
-+ sure that it has the same parameter interface as sendEmail.
-
- CONTENT
- 1. Description
-@@ -665,7 +665,7 @@
-
- 1.4.7 Email notification
-
-- Please make sure, that 'sendEmail.pl' is in the path of your
-+ Please make sure, that 'sendEmail' is in the path of your
- executables and that the 'epgsearchupdmail.templ' and
- 'epgsearchconflmail.templ' exists in epgsearch's configurations
- directory!
-@@ -705,7 +705,7 @@
- - 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
-@@ -729,7 +729,9 @@
- 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
- function is not available for method 'sendmail'.
-
-Index: vdr-plugin-epgsearch-1.0.0/doc/en/epgsearch.4.txt
-===================================================================
---- vdr-plugin-epgsearch-1.0.0.orig/doc/en/epgsearch.4.txt 2011-09-11 19:58:49.000000000 +0200
-+++ vdr-plugin-epgsearch-1.0.0/doc/en/epgsearch.4.txt 2011-09-18 19:57:06.000000000 +0200
-@@ -761,7 +761,7 @@
- 13. Email notification
- If you want to get email notifications about timers
- added/modified/removed by the search timer thread or about timer
-- conflicts, first copy the script 'sendEmail.pl' to the place where your
-+ conflicts, first 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.
-Index: vdr-plugin-epgsearch-1.0.0/epgsearchsetup.c
-===================================================================
---- vdr-plugin-epgsearch-1.0.0.orig/epgsearchsetup.c 2011-09-04 20:33:31.000000000 +0200
-+++ vdr-plugin-epgsearch-1.0.0/epgsearchsetup.c 2011-09-18 19:57:06.000000000 +0200
-@@ -126,7 +126,7 @@
+--- vdr-plugin-epgsearch.orig/epgsearchsetup.c 2012-03-25 14:10:26.000000000 +0200
++++ vdr-plugin-epgsearch/epgsearchsetup.c 2012-03-25 14:11:19.000000000 +0200
+@@ -121,7 +121,7 @@
FavoritesMenuMode[3] = tr("before 'next'");
MailMethod[0] = "sendmail";
@@ -122,8 +22,8 @@ Index: vdr-plugin-epgsearch-1.0.0/epgsearchsetup.c
Setup();
}
-@@ -885,7 +885,7 @@
- AddHelp(tr("Help$Specify the email adress where notifications should be sent to."));
+@@ -876,7 +876,7 @@
+ AddHelp(tr("Help$Specify the email address where notifications should be sent to."));
Add(new cMenuEditStraItem(tr("Mail method"), &data->mailViaScript, 2, MailMethod));
- AddHelp(tr("Help$Specify here the method to use when sending mails.\nYou can choose between\n - 'sendmail': requires a properly configured email system\n - 'SendEmail.pl': simple script for mail delivery"));
@@ -131,10 +31,10 @@ Index: vdr-plugin-epgsearch-1.0.0/epgsearchsetup.c
if (data->mailViaScript)
{
-Index: vdr-plugin-epgsearch-1.0.0/mail.c
+Index: vdr-plugin-epgsearch/mail.c
===================================================================
---- vdr-plugin-epgsearch-1.0.0.orig/mail.c 2011-09-04 20:33:31.000000000 +0200
-+++ vdr-plugin-epgsearch-1.0.0/mail.c 2011-09-18 19:57:06.000000000 +0200
+--- vdr-plugin-epgsearch.orig/mail.c 2012-03-25 14:10:26.000000000 +0200
++++ vdr-plugin-epgsearch/mail.c 2012-03-25 14:11:19.000000000 +0200
@@ -40,7 +40,7 @@
extern bool isUTF8;
using namespace std;
@@ -152,4 +52,4 @@ Index: vdr-plugin-epgsearch-1.0.0/mail.c
+ if (mailCmd == "sendEmail") // beautify output for standard script
ScriptArgs += " | cut -d\" \" -f 6-";
- cCommand cmd;
+ cCommand cmd;
--
vdr-plugin-epgsearch packaging repository
More information about the pkg-vdr-dvb-changes
mailing list