r7753 - in /vdr/vdr-plugin-dvd/trunk/debian: ./ patches/
tom-guest at users.alioth.debian.org
tom-guest at users.alioth.debian.org
Sat May 2 15:34:55 UTC 2009
Author: tom-guest
Date: Sat May 2 15:34:55 2009
New Revision: 7753
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7753
Log:
* New Upstream Snapshot
* Adapted 04_vdr-dvd_resume.dpatch
* Adapted 10_dvd.c.dpatch
* Adapted 11_allow-non-existing-dvd-drive.dpatch
* Added 12_dvd-fixed-german-spelling.dpatch
* Added gettext to Build-Depends
* Added installation of locale files
* Added ${misc:Depends}
* Bumped standards version to 3.8.1
* Updated debian/copyright
* Changed section to "video"
* Added get-orig-source target to debian/rules to download the newest
cvs-snapshot
* Fixed command-with-path-in-maintainer-script
Added:
vdr/vdr-plugin-dvd/trunk/debian/patches/12_dvd-fixed-german-spelling.dpatch
Modified:
vdr/vdr-plugin-dvd/trunk/debian/changelog
vdr/vdr-plugin-dvd/trunk/debian/control
vdr/vdr-plugin-dvd/trunk/debian/copyright
vdr/vdr-plugin-dvd/trunk/debian/install
vdr/vdr-plugin-dvd/trunk/debian/patches/00list
vdr/vdr-plugin-dvd/trunk/debian/patches/04_vdr-dvd_resume.dpatch
vdr/vdr-plugin-dvd/trunk/debian/patches/10_dvd.c.dpatch
vdr/vdr-plugin-dvd/trunk/debian/patches/11_allow-non-existing-dvd-drive.dpatch
vdr/vdr-plugin-dvd/trunk/debian/postinst
vdr/vdr-plugin-dvd/trunk/debian/prerm
vdr/vdr-plugin-dvd/trunk/debian/rules
Modified: vdr/vdr-plugin-dvd/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/changelog?rev=7753&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/changelog Sat May 2 15:34:55 2009
@@ -1,3 +1,22 @@
+vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-1) unstable; urgency=low
+
+ * New Upstream Snapshot
+ * Adapted 04_vdr-dvd_resume.dpatch
+ * Adapted 10_dvd.c.dpatch
+ * Adapted 11_allow-non-existing-dvd-drive.dpatch
+ * Added 12_dvd-fixed-german-spelling.dpatch
+ * Added gettext to Build-Depends
+ * Added installation of locale files
+ * Added ${misc:Depends}
+ * Bumped standards version to 3.8.1
+ * Updated debian/copyright
+ * Changed section to "video"
+ * Added get-orig-source target to debian/rules to download the newest
+ cvs-snapshot
+ * Fixed command-with-path-in-maintainer-script
+
+ -- Thomas Günther <tom at toms-cafe.de> Sat, 02 May 2009 17:17:45 +0200
+
vdr-plugin-dvd (0.3.6~b03+cvs20070813-12) unstable; urgency=low
* Added 11_allow-non-existing-dvd-drive,dpatch to fix problem with VDR beeing
Modified: vdr/vdr-plugin-dvd/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/control?rev=7753&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/control (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/control Sat May 2 15:34:55 2009
@@ -1,5 +1,5 @@
Source: vdr-plugin-dvd
-Section: misc
+Section: video
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>
@@ -7,16 +7,17 @@
cdbs,
dpatch,
vdr-dev (>= 1.6.0-5),
+ gettext,
libdvdnav-dev (>=4.1.2-3),
liba52-0.7.4-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/
Homepage: http://sourceforge.net/projects/dvdplugin
Package: vdr-plugin-dvd
Architecture: any
-Depends: ${shlibs:Depends}, ${vdr:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}
Suggests: libdvdcss2
Description: DVD playback plugin for VDR
This plugin for VDR allows to play back DVD Video discs
Modified: vdr/vdr-plugin-dvd/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/copyright?rev=7753&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/copyright Sat May 2 15:34:55 2009
@@ -14,29 +14,31 @@
Copyright:
(C) 2001 - 2002 Andreas Schultz
+
+Copyright (parts of dvbspu.[ch]):
(C) 2000 Samuel Hocevar, Michel Lespinasse
Copyright (Debian packaging):
- (C) 2002 - 2008 Tobias Grimm, Thomas Günther, Thomas Schmidt
+ (C) 2002 - 2009 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; version 2 dated June, 1991.
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
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.
- 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.
+ 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.
+ in /usr/share/common-licenses/GPL-2 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.
+ later version, see /usr/share/common-licenses/GPL-2.
Modified: vdr/vdr-plugin-dvd/trunk/debian/install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/install?rev=7753&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/install (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/install Sat May 2 15:34:55 2009
@@ -1,3 +1,4 @@
libvdr-dvd.so.* usr/lib/vdr/plugins/
debian/plugin.dvd.conf etc/vdr/plugins/
debian/vdr-plugin-dvd.groups usr/share/vdr/groups.d/
+debian/tmp/usr/share/locale
Modified: vdr/vdr-plugin-dvd/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/patches/00list?rev=7753&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/00list Sat May 2 15:34:55 2009
@@ -2,3 +2,4 @@
05_stdint
10_dvd.c
11_allow-non-existing-dvd-drive
+12_dvd-fixed-german-spelling
Modified: vdr/vdr-plugin-dvd/trunk/debian/patches/04_vdr-dvd_resume.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/patches/04_vdr-dvd_resume.dpatch?rev=7753&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/04_vdr-dvd_resume.dpatch (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/04_vdr-dvd_resume.dpatch Sat May 2 15:34:55 2009
@@ -4,14 +4,15 @@
##
## Thomas Günther <tom at toms-cafe.de>:
## - adapted to dvd plugin version cvs20070813
+## - adapted to dvd plugin version cvs20090426.0013
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch to resume a dvd where it was interupted by the user.
@DPATCH@
-diff -Naurp dvd-0.3.6~b03+cvs20070813/Makefile dvd-0.3.6~b03+cvs20070813-resume/Makefile
---- dvd-0.3.6~b03+cvs20070813/Makefile 2007-08-27 18:09:14.000000000 +0000
-+++ dvd-0.3.6~b03+cvs20070813-resume/Makefile 2007-08-27 18:33:53.000000000 +0000
+diff -Naurp vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/Makefile vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013-resume/Makefile
+--- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/Makefile 2008-12-23 16:49:04.000000000 +0000
++++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013-resume/Makefile 2009-04-26 01:08:57.000000000 +0000
@@ -64,6 +64,10 @@ CXXFLAGS += -O3
LDFLAGS += -O3 -Wl,--retain-symbols-file,retain-sym
endif
@@ -23,9 +24,9 @@
### The object files (add further files here):
OBJS = $(PLUGIN).o dvddev.o player-dvd.o control-dvd.o dvdspu.o \
-diff -Naurp dvd-0.3.6~b03+cvs20070813/player-dvd.c dvd-0.3.6~b03+cvs20070813-resume/player-dvd.c
---- dvd-0.3.6~b03+cvs20070813/player-dvd.c 2007-08-27 18:09:14.000000000 +0000
-+++ dvd-0.3.6~b03+cvs20070813-resume/player-dvd.c 2007-08-27 18:41:01.000000000 +0000
+diff -Naurp vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/player-dvd.c vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013-resume/player-dvd.c
+--- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/player-dvd.c 2009-01-18 13:58:42.000000000 +0000
++++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013-resume/player-dvd.c 2009-05-01 22:42:23.000000000 +0000
@@ -21,6 +21,8 @@
#include <vdr/thread.h>
#include <vdr/device.h>
@@ -262,7 +263,7 @@
clearSeenSubpStream();
clearSeenAudioTrack();
-@@ -334,6 +549,8 @@ cDvdPlayer::~cDvdPlayer()
+@@ -333,6 +548,8 @@ cDvdPlayer::~cDvdPlayer()
if(aspect_str)
free(aspect_str);
@@ -271,7 +272,7 @@
}
void cDvdPlayer::setController (cDvdPlayerControl *ctrl )
-@@ -567,6 +784,100 @@ uint64_t cDvdPlayer::delay_ticks(uint64_
+@@ -566,6 +783,100 @@ uint64_t cDvdPlayer::delay_ticks(uint64_
#endif
}
@@ -372,7 +373,7 @@
void cDvdPlayer::Action(void) {
memset(event_buf, 0, sizeof(uint8_t)*4096);
-@@ -636,6 +947,13 @@ void cDvdPlayer::Action(void) {
+@@ -635,6 +946,13 @@ void cDvdPlayer::Action(void) {
bool firstClear = true;
@@ -386,7 +387,7 @@
while(running && nav) {
if (!pframe) {
-@@ -1112,6 +1430,22 @@ void cDvdPlayer::Action(void) {
+@@ -1110,6 +1428,22 @@ void cDvdPlayer::Action(void) {
SetTitleInfoString();
SetTitleString();
SetAspectString();
@@ -409,7 +410,7 @@
break;
case DVDNAV_CELL_CHANGE: {
DEBUG_NAV("%s:%d:NAV CELL CHANGE\n", __FILE__, __LINE__);
-@@ -1132,6 +1466,11 @@ void cDvdPlayer::Action(void) {
+@@ -1130,6 +1464,11 @@ void cDvdPlayer::Action(void) {
// cell change .. game over ..
changeNavSubpStreamOnceInSameCell=false;
SetTitleInfoString();
@@ -421,68 +422,75 @@
break;
}
case DVDNAV_NAV_PACKET: {
-@@ -1874,7 +2213,16 @@ void cDvdPlayer::Stop(void)
- if(!DVDActiveAndRunning()) return;
-
- if( running && nav ) {
-- dvdnav_stop(nav);
-+ // we will stop replay now. Its time to save the current possition
-+ // for later resuming.
-+ SaveResume();
-+
-+ dvdnav_stop(nav);
-+
-+ // don't know why Stop() is called twice, but this prevents from
-+ // twice save resume data and calling dvdnav_stop() twice.
-+ // Comments from maintainers are welcome.
-+ running = false;
+@@ -1887,8 +2226,18 @@ void cDvdPlayer::Stop(void)
+ if (!DVDActiveAndRunning())
+ return;
+
+- if (running && nav)
++ if (running && nav) {
++ // we will stop replay now. Its time to save the current possition
++ // for later resuming.
++ SaveResume();
++
+ dvdnav_stop(nav);
++
++ // don't know why Stop() is called twice, but this prevents from
++ // twice save resume data and calling dvdnav_stop() twice.
++ // Comments from maintainers are welcome.
++ running = false;
++ }
+ }
+
+ void cDvdPlayer::Play(void)
+@@ -2204,24 +2553,41 @@ void cDvdPlayer::NextAngle(void)
+ GotoAngle(++angleNumber);
+ }
+
+-int cDvdPlayer::GotoTitle(int Title)
++// GotoTitle now optionally takes a chapter to seek to in the given title.
++int cDvdPlayer::GotoTitle(int Title, int Chapter /*= 1*/)
+ {
+ int titleNumbers;
++ int targetTitle = Title;
++ int chapterNumber;
+ if (!DVDActiveAndRunning())
+ return -1;
+ LOCK_THREAD;
+ DEBUG_NAV("DVD NAV SPU clear & empty %s:%d\n", __FILE__, __LINE__);
+ Empty();
+
++ // check if the given title is in the title range of this dvd
+ dvdnav_get_number_of_titles(nav, &titleNumbers);
+
+ if (Title > titleNumbers)
+- Title = 1;
++ targetTitle = 1;
+ if (Title <= 0)
+- Title = titleNumbers;
++ targetTitle = titleNumbers;
++
++ // if given title is in the bounds of this dvd's title range
++ if (Title == targetTitle) {
++ // check if the chapter is in the title's chapter range
++ dvdnav_get_number_of_parts(nav, Title, &chapterNumber);
++ if (Chapter > chapterNumber)
++ Chapter = 1;
++ if (Chapter <= 0)
++ Chapter = chapterNumber;
++ } else {
++ // otherwise reset it to the first chapter.
++ Chapter = 1;
++ }
+
+ if (stillTimer == 0) {
+- dvdnav_part_play(nav, Title, 1);
++ dvdnav_part_play(nav, Title, Chapter);
+ // dvdnav_title_play(nav, Title);
}
- }
-
-@@ -2189,22 +2537,36 @@ void cDvdPlayer::NextAngle()
- (void) GotoAngle(++cur_angle);
- }
-
--int cDvdPlayer::GotoTitle(int title)
-+// GotoTitle now optionally takes a chapter to seek to in the given title.
-+int cDvdPlayer::GotoTitle(int title, int chapter /*= 1*/)
- {
- int titleNumber;
-+ int targetTitle = title;
-+ int chapterNumber;
- if(!DVDActiveAndRunning()) return -1;
- LOCK_THREAD;
- DEBUG_NAV("DVD NAV SPU clear & empty %s:%d\n", __FILE__, __LINE__);
- Empty();
-
-+ // check if the given title is in the title range of this dvd
- dvdnav_get_number_of_titles(nav, &titleNumber);
-+ if(title>titleNumber) targetTitle=1;
-+ if(title<=0) targetTitle=titleNumber;
-
-- if(title>titleNumber) title=1;
-- if(title<=0) title=titleNumber;
-+ // if given title is in the bounds of this dvd's title range
-+ if (title == targetTitle) {
-+ // check if the chapter is in the title's chapter range
-+ dvdnav_get_number_of_parts(nav, title, &chapterNumber);
-+ if (chapter>chapterNumber) chapter=1;
-+ if (chapter<=0) chapter=chapterNumber;
-+ } else {
-+ // otherwise reset it to the first chapter.
-+ chapter = 1;
-+ }
-
- if (stillTimer == 0)
- {
-- dvdnav_part_play(nav, title, 1);
-+ dvdnav_part_play(nav, title, chapter);
- // dvdnav_title_play(nav, title);
- }
-
-diff -Naurp dvd-0.3.6~b03+cvs20070813/player-dvd.h dvd-0.3.6~b03+cvs20070813-resume/player-dvd.h
---- dvd-0.3.6~b03+cvs20070813/player-dvd.h 2007-08-27 18:09:14.000000000 +0000
-+++ dvd-0.3.6~b03+cvs20070813-resume/player-dvd.h 2007-08-27 18:33:53.000000000 +0000
+
+diff -Naurp vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/player-dvd.h vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013-resume/player-dvd.h
+--- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/player-dvd.h 2007-09-17 19:04:43.000000000 +0000
++++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013-resume/player-dvd.h 2009-05-01 22:41:48.000000000 +0000
@@ -52,6 +52,7 @@ class IntegerListObject : public cListOb
class cDvdPlayerControl ;
@@ -491,10 +499,11 @@
class cDvdPlayer : public cPlayer, cThread {
private:
-@@ -183,6 +184,31 @@ class cDvdPlayer : public cPlayer, cThre
- int playPacket(unsigned char *&cache_buf, bool trickMode, bool noAudio);
- void playSPU(int spuId, unsigned char *data, int datalen);
-
+@@ -184,6 +185,32 @@ class cDvdPlayer : public cPlayer, cThre
+ int GetAudioStreamNumbers(void) const ;
+ uint16_t GetSubtitleLanguageCode(int Channel) const;
+ int GetSubtitleStreamNumbers(void) const ;
++
+ //resuming
+ /**
+ * the resume database
@@ -523,13 +532,13 @@
protected: //Player
virtual void Activate(bool On);
virtual void Action(void);
-@@ -313,7 +339,8 @@ public:
+@@ -316,7 +343,8 @@ public:
*
* return set title ..
*/
-- int GotoTitle(int title);
-+ // GotoTitle now optionally takes a chapter to seek to in the given title.
-+ int GotoTitle(int title, int chapter = 1);
+- int GotoTitle(int Title);
++ // GotoTitle now optionally takes a chapter to seek to in the given title
++ int GotoTitle(int Title, int Chapter = 1);
/**
* jump to the previous Title (rotate)
Modified: vdr/vdr-plugin-dvd/trunk/debian/patches/10_dvd.c.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/patches/10_dvd.c.dpatch?rev=7753&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/10_dvd.c.dpatch (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/10_dvd.c.dpatch Sat May 2 15:34:55 2009
@@ -5,15 +5,14 @@
## DP: Removes stderr output on correctly parsed -C parameter
@DPATCH@
-
---- vdr-plugin-dvd-0.3.4-rc4.orig/dvd.c
-+++ vdr-plugin-dvd-0.3.4-rc4/dvd.c
-@@ -41,7 +41,7 @@
- while ((c = getopt_long(argc, argv, "C:", long_options, NULL)) != -1) {
+--- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/dvd.c
++++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/dvd.c
+@@ -73,7 +73,7 @@
+ #endif
switch (c) {
- case 'C':
-- fprintf(stderr, "arg: %s\n", optarg);
-+ // fprintf(stderr, "arg: %s\n", optarg);
- cDVD::SetDeviceName(optarg);
- if (!cDVD::DriveExists()) {
- fprintf(stderr, "vdr: DVD drive not found: %s\n", optarg);
+ case 'C':
+- fprintf(stderr, "arg: %s\n", optarg);
++ // fprintf(stderr, "arg: %s\n", optarg);
+ cDVD::SetDeviceName(optarg);
+ if (!cDVD::DriveExists()) {
+ esyslog("vdr: DVD drive not found: %s", optarg);
Modified: vdr/vdr-plugin-dvd/trunk/debian/patches/11_allow-non-existing-dvd-drive.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/patches/11_allow-non-existing-dvd-drive.dpatch?rev=7753&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/11_allow-non-existing-dvd-drive.dpatch (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/11_allow-non-existing-dvd-drive.dpatch Sat May 2 15:34:55 2009
@@ -6,17 +6,15 @@
## DP: just log a warning and continue.
@DPATCH@
-diff -urNad vdr-plugin-dvd-0.3.6~b03+cvs20070813~/dvd.c vdr-plugin-dvd-0.3.6~b03+cvs20070813/dvd.c
---- vdr-plugin-dvd-0.3.6~b03+cvs20070813~/dvd.c 2004-06-30 08:18:24.000000000 +0200
-+++ vdr-plugin-dvd-0.3.6~b03+cvs20070813/dvd.c 2008-11-29 11:00:10.000000000 +0100
-@@ -55,8 +55,8 @@
- fprintf(stderr, "arg: %s\n", optarg);
- cDVD::SetDeviceName(optarg);
- if (!cDVD::DriveExists()) {
-- fprintf(stderr, "vdr: DVD drive not found: %s\n", optarg);
-- return false;
-+ fprintf(stderr, "vdr: WARNING - DVD drive not found: %s\n", optarg);
-+ esyslog("WARNING - DVD drive not found: %s\n", optarg);
- }
- break;
- default:
+--- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/dvd.c
++++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/dvd.c
+@@ -76,8 +76,7 @@
+ fprintf(stderr, "arg: %s\n", optarg);
+ cDVD::SetDeviceName(optarg);
+ if (!cDVD::DriveExists()) {
+- esyslog("vdr: DVD drive not found: %s", optarg);
+- return false;
++ esyslog("WARNING - DVD drive not found: %s\n", optarg);
+ }
+ break;
+ default:
Added: vdr/vdr-plugin-dvd/trunk/debian/patches/12_dvd-fixed-german-spelling.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/patches/12_dvd-fixed-german-spelling.dpatch?rev=7753&op=file
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/12_dvd-fixed-german-spelling.dpatch (added)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/12_dvd-fixed-german-spelling.dpatch Sat May 2 15:34:55 2009
@@ -1,0 +1,71 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_dvd-fixed-german-spelling.dpatch by Thomas Günther <tom at toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixed spelling errors in german translation.
+
+ at DPATCH@
+--- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/i18n.c
++++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/i18n.c
+@@ -125,7 +125,7 @@
+ },
+ {
+ "Setup.DVD$Preferred menu language", // English
+- "Bevorzugte Spache für Menüs", // Deutsch
++ "Bevorzugte Sprache für Menüs", // Deutsch
+ "Prednostni jezik za menije", // Slovenski
+ "menu - linguaggio preferito", // Italiano
+ "Taalkeuze voor menu", // Nederlands
+@@ -177,7 +177,7 @@ const tI18nPhrase DvdPhrases[] = {
+ },
+ {
+ "Setup.DVD$Preferred subtitle language", // English
+- "Bevorzugte Spache für Untertitel", // Deutsch
++ "Bevorzugte Sprache für Untertitel", // Deutsch
+ "Prednostni jezik za podnapise", // Slovenski
+ "sottotitoli - linguaggio preferito", // Italiano
+ "Taalkeuze voor ondertitels", // Nederlands
+@@ -333,7 +333,7 @@ const tI18nPhrase DvdPhrases[] = {
+ },
+ {
+ "Error.DVD$Error opening DVD!", // English
+- "Fehler beim öffnen der DVD!", // Deutsch
++ "Fehler beim Öffnen der DVD!", // Deutsch
+ "Napaka pri odpiranju DVD-ja!", // Slovenski
+ "", // Italiano
+ "Fout bij het openen van de DVD!", // Nederlands
+@@ -359,7 +359,7 @@ const tI18nPhrase DvdPhrases[] = {
+ },
+ {
+ "Error.DVD$Error fetching data from DVD!", // English
+- "Fehler beim lesen von der DVD!", // Deutsch
++ "Fehler beim Lesen von der DVD!", // Deutsch
+ "Napaka pri branju podatkov iz DVD-ja!", // Slovenski
+ "", // Italiano
+ "Error bij het verkrijgen van data van de DVD!", // Nederlands
+--- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/po/de_DE.po
++++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/po/de_DE.po
+@@ -25,19 +25,19 @@
+ msgstr "DVD"
+
+ msgid "Error.DVD$Error opening DVD!"
+-msgstr "Fehler beim öffnen der DVD!"
++msgstr "Fehler beim Öffnen der DVD!"
+
+ msgid "Error.DVD$Error fetching data from DVD!"
+-msgstr "Fehler beim lesen von der DVD!"
++msgstr "Fehler beim Lesen von der DVD!"
+
+ msgid "Setup.DVD$Preferred menu language"
+-msgstr "Bevorzugte Spache für Menüs"
++msgstr "Bevorzugte Sprache für Menüs"
+
+ msgid "Setup.DVD$Preferred audio language"
+ msgstr "Bevorzugte Sprache für Dialog"
+
+ msgid "Setup.DVD$Preferred subtitle language"
+-msgstr "Bevorzugte Spache für Untertitel"
++msgstr "Bevorzugte Sprache für Untertitel"
+
+ msgid "Setup.DVD$Player region code"
+ msgstr "Regionalkode für DVD Spieler"
Modified: vdr/vdr-plugin-dvd/trunk/debian/postinst
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/postinst?rev=7753&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/postinst (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/postinst Sat May 2 15:34:55 2009
@@ -15,7 +15,7 @@
fi
# Make vdr a member of the groups required by the plugin
- /bin/sh /usr/lib/vdr/vdr-groups.sh --add vdr-plugin-dvd
+ sh /usr/lib/vdr/vdr-groups.sh --add vdr-plugin-dvd
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
Modified: vdr/vdr-plugin-dvd/trunk/debian/prerm
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/prerm?rev=7753&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/prerm (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/prerm Sat May 2 15:34:55 2009
@@ -24,7 +24,7 @@
# remove vdr from the groups required by this plugin, if no other
# packages need vdr to be a member in these groups
- /bin/sh /usr/lib/vdr/vdr-groups.sh --remove vdr-plugin-dvd
+ sh /usr/lib/vdr/vdr-groups.sh --remove vdr-plugin-dvd
;;
upgrade|deconfigure)
;;
@@ -42,5 +42,3 @@
#DEBHELPER#
exit 0
-
-
Modified: vdr/vdr-plugin-dvd/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/rules?rev=7753&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/rules (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/rules Sat May 2 15:34:55 2009
@@ -5,7 +5,8 @@
DEB_INSTALL_CHANGELOGS_ALL = HISTORY
-MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=.
+MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. \
+ LOCALEDIR=debian/tmp/usr/share/locale
common-build-arch::
$(MAKE) all $(MAKE_OPTIONS)
@@ -17,3 +18,10 @@
common-binary-predeb-arch::
sh /usr/share/vdr-dev/dependencies.sh
+VERSION_ID = $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/\+cvs.*//')+cvs$(shell date --utc +%0Y%0m%0d.%0k%0M)
+get-orig-source::
+ echo Downloading $(DEB_SOURCE_PACKAGE) $(VERSION_ID) from cvs...
+ cvs -d:pserver:anonymous at dvdplugin.cvs.sourceforge.net:/cvsroot/dvdplugin export -D NOW -d $(DEB_SOURCE_PACKAGE)-$(VERSION_ID) dvd
+ tar czf ../$(DEB_SOURCE_PACKAGE)_$(VERSION_ID).orig.tar.gz $(DEB_SOURCE_PACKAGE)-$(VERSION_ID)
+ rm -rf $(DEB_SOURCE_PACKAGE)-$(VERSION_ID)
+ dch -v "$(VERSION_ID)-1" "New Upstream Snapshot"
More information about the pkg-vdr-dvb-changes
mailing list