diff -Nru vdr-1.7.27/debian/.vdr-patches vdr-1.7.27/debian/.vdr-patches --- vdr-1.7.27/debian/.vdr-patches 2012-04-05 22:08:15.000000000 +0000 +++ vdr-1.7.27/debian/.vdr-patches 2012-10-16 19:37:25.000000000 +0000 @@ -1,4 +1,4 @@ -debian/patches/opt-20_liemikuutio.patch:c16e40687ca8977dc6a46fb0cf9b6b56 +debian/patches/opt-20_liemikuutio.patch:4a7ed671b678f9000f562e68fb5ef0f3 debian/patches/16_channels.conf.terr-fix.patch:933f8daa6bb6d26c711d0ae987a2b03e debian/patches/opt-55_wareagleicon.patch:571f1e04e882248d68288bf51f1973d6 debian/patches/04_newplugin.patch:5877f4f62dab4f3d437d4eef7cae3ac0 @@ -9,22 +9,22 @@ debian/patches/opt-21_internal-cam-devices.patch:ed6892fdb977c71a140a99d19d6e17b6 debian/patches/11_sortrecordings.patch:3e3a2f988cb7db03f8f56a44012a65f4 debian/patches/opt-41-x_timer-info.patch:d291e8eb2f2cc0aee945201e63eff5bd -debian/patches/xprmtl-01_externalci.patch:d951d85185027f0472099ae7b4f42464 +debian/patches/xprmtl-01_externalci.patch:787b4b1b885d36e218718e321215fefe debian/patches/opt-24_jumpplay.patch:51619bf17b8ed8baf0ff6798548465d6 debian/patches/opt-56_eventdetails_v3.patch:5d2658bed38665451751b5936863ef5d debian/patches/opt-62_hard_link_cutter.patch:cce8eb967ffbbc72d104028d6f750491 -debian/patches/vdr-1.7.24-s2apiwrapper-0.8.patch:260bec5a41fecdb35a9945a82c4f0a9f +debian/patches/vdr-1.7.24-s2apiwrapper-0.8.patch:d4e66f5c513aed5a0b6f8d3db8dd10f7 debian/patches/opt-57_vdr-remote_instant_recordings.patch:bc69e4bb09d5b56067955486d51d7fee debian/patches/99_ncursesw-include.patch:5cd58b4603885b5cb7a85caad49affef debian/patches/82_valgrind.patch:df6bcda3b79a84ee4f9073cb04368963 -debian/patches/opt-61_dynamite.patch:9d1a37236786f7ffe8eb433d915d0c9a +debian/patches/opt-61_dynamite.patch:a3bd81b01954b96b410a8d3626990835 debian/patches/opt-22-x_edit_marks.patch:3b501bb4598204918030116e1c5b0fbf debian/patches/opt-44_rotor.patch:7074fa64fb67ca6ff3438a6c00520977 debian/patches/opt-42-x_MainMenuHooks-v1.0.1.patch:772777cb049f0a603f0c01d9c0527d45 -debian/patches/opt-65_pin.patch:ee569102b8e070bf93e16a90f99aab83 +debian/patches/opt-65_pin.patch:6dfa988b57bc9db362496d9897c016b8 debian/patches/12_osdbase-maxitems.patch:ae3823a4541df438df0746d0b4e551a4 debian/patches/opt-50_graphtft-liemikuutio.patch:2e08d96c748322d5836a1a798d1b9e3f -debian/patches/channelname-fix-1.7.27.patch:03b8f7d61ada95f8b51f2c684e67c02d +debian/patches/channelname-fix-1.7.27.patch:da46f10965e500801f45e9887533a73f debian/patches/opt-63_naludump.patch:9a37379c5c939c03c7ba4a70a9eac828 debian/patches/opt-45_yaepg.patch:b359bda4619c5fbfc6150b53e12087cd debian/patches/06_default_svdrp_port_0.patch:33c39d7b3456c745410ba721d3f898de diff -Nru vdr-1.7.27/debian/changelog vdr-1.7.27/debian/changelog --- vdr-1.7.27/debian/changelog 2012-04-05 22:13:02.000000000 +0000 +++ vdr-1.7.27/debian/changelog 2012-10-16 20:18:45.000000000 +0000 @@ -1,17 +1,22 @@ -vdr (1.7.27-3yavdr0~natty) natty; urgency=high +vdr (1.7.27-5yavdr1~natty) natty; urgency=high * Rebuild for yaVDR 0.4.b - * drop linux-libc-dev (>=2.6.29) - * add s2apiwrapper patch (by Udo Richter) - * Fix bug with wareagle patch and vim 1.7.27 (thx oldmanuk) + * lower linux-libc-dev to (>=2.6.29) + * add s2apiwrapper patch (by Udo Richter) + + -- Frank Neumann Tue, 16 Oct 2012 21:32:31 +0200 + +vdr (1.7.27-5yavdr1~precise) precise; urgency=medium + + * rebuild - -- Frank Neumann Fri, 06 Apr 2012 00:08:22 +0200 + -- Lars Hanisch Thu, 06 Sep 2012 00:04:02 +0200 -vdr (1.7.27-3yavdr0~precise) precise; urgency=medium +vdr (1.7.27-5yavdr0~precise) precise; urgency=medium * Fix bug with wareagle patch and vim 1.7.27 (thx oldmanuk) - -- Holger Schvestka Thu, 05 Apr 2012 21:52:56 +0200 + -- Marco Scholl Sun, 03 Jun 2012 22:11:12 +0200 vdr (1.7.27-2yavdr0~precise) precise; urgency=medium diff -Nru vdr-1.7.27/debian/control vdr-1.7.27/debian/control --- vdr-1.7.27/debian/control 2012-04-05 21:59:15.000000000 +0000 +++ vdr-1.7.27/debian/control 2012-10-16 19:31:20.000000000 +0000 @@ -6,7 +6,7 @@ Origin: ctvdr Build-Depends: debhelper (>= 7.0.50~), libjpeg62-dev, libcap2-dev | libcap-dev, libncursesw5-dev, libfreetype6-dev, libfontconfig-dev, gettext, - txt2man, python, linux-libc-dev (>= 2.6.29), libfribidi-dev + txt2man, python, linux-libc-dev (>= 2.6.29), libfribidi-dev, fakeroot Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/pkg-vdr-dvb/vdr.git Vcs-Browser: http://git.debian.org/?p=pkg-vdr-dvb/vdr.git @@ -68,6 +68,18 @@ output device for the "Full Featured" DVB cards based on the TechnoTrend/Fujitsu-Siemens design. +Package: vdr-plugin-dvbhddevice +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, vdr (= ${binary:Version}) +Description: Plugin that adds support for full featured DVB cards to VDR + Video Disk Recorder (VDR) is a digital sat-receiver program using + Linux and DVB technologies. It allows one to record MPEG2 streams, + as well as output the stream to TV. + . + This package contains the dvbhddevice-plugin, which implements the + output device for the "Full Featured" DVB cards based on the + TechnoTrend design. + Package: vdr-plugin-epgtableid0 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, vdr (= ${binary:Version}) diff -Nru vdr-1.7.27/debian/patches/channelname-fix-1.7.27.patch vdr-1.7.27/debian/patches/channelname-fix-1.7.27.patch --- vdr-1.7.27/debian/patches/channelname-fix-1.7.27.patch 2012-04-01 14:53:33.000000000 +0000 +++ vdr-1.7.27/debian/patches/channelname-fix-1.7.27.patch 2012-10-16 19:25:58.000000000 +0000 @@ -4,11 +4,11 @@ Origin: http://permalink.gmane.org/gmane.linux.vdr/45847 Author: Klaus Schmidinger Last-Update: 2012-03-30 -Index: yavdr-vdr/channels.c +Index: b/channels.c =================================================================== ---- yavdr-vdr.orig/channels.c 2012-04-01 01:31:49.525188254 +0100 -+++ yavdr-vdr/channels.c 2012-04-01 01:32:08.685132269 +0100 -@@ -1008,7 +1008,7 @@ +--- a/channels.c ++++ b/channels.c +@@ -1009,7 +1009,7 @@ if (!maxShortChannelNameLength) { for (cChannel *channel = First(); channel; channel = Next(channel)) { if (!channel->GroupSep()) diff -Nru vdr-1.7.27/debian/patches/opt-20_liemikuutio.patch vdr-1.7.27/debian/patches/opt-20_liemikuutio.patch --- vdr-1.7.27/debian/patches/opt-20_liemikuutio.patch 2012-04-05 22:04:08.000000000 +0000 +++ vdr-1.7.27/debian/patches/opt-20_liemikuutio.patch 2012-10-16 19:23:34.000000000 +0000 @@ -2,9 +2,10 @@ Author: Rolf Ahrenberg Origin: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.7.27-liemikuutio-1.34.patch.gz -diff -Nru vdr-1.7.27-vanilla/config.h vdr-1.7.27-liemikuutio/config.h ---- vdr-1.7.27-vanilla/config.h 2012-03-25 15:17:57.000000000 +0300 -+++ vdr-1.7.27-liemikuutio/config.h 2012-03-25 15:20:40.000000000 +0300 +Index: b/config.h +=================================================================== +--- a/config.h ++++ b/config.h @@ -36,6 +36,8 @@ // plugins to work with newer versions of the core VDR as long as no // VDR header files have changed. @@ -14,9 +15,10 @@ #define MAXPRIORITY 99 #define MINPRIORITY (-MAXPRIORITY) #define LIVEPRIORITY 0 // priority used when selecting a device for live viewing -diff -Nru vdr-1.7.27-vanilla/cutter.c vdr-1.7.27-liemikuutio/cutter.c ---- vdr-1.7.27-vanilla/cutter.c 2012-03-25 15:17:57.000000000 +0300 -+++ vdr-1.7.27-liemikuutio/cutter.c 2012-03-25 15:20:41.000000000 +0300 +Index: b/cutter.c +=================================================================== +--- a/cutter.c ++++ b/cutter.c @@ -8,6 +8,7 @@ */ @@ -54,9 +56,10 @@ char *e = strrchr(s, '.'); if (e) { if (strcmp(e, ".rec") == 0) { -diff -Nru vdr-1.7.27-vanilla/cutter.h vdr-1.7.27-liemikuutio/cutter.h ---- vdr-1.7.27-vanilla/cutter.h 2012-03-25 15:17:57.000000000 +0300 -+++ vdr-1.7.27-liemikuutio/cutter.h 2012-03-25 15:20:41.000000000 +0300 +Index: b/cutter.h +=================================================================== +--- a/cutter.h ++++ b/cutter.h @@ -24,7 +24,7 @@ static bool error; static bool ended; @@ -66,9 +69,10 @@ static void Stop(void); static bool Active(const char *FileName = NULL); ///< Returns true if the cutter is currently active. -diff -Nru vdr-1.7.27-vanilla/filetransfer.c vdr-1.7.27-liemikuutio/filetransfer.c ---- vdr-1.7.27-vanilla/filetransfer.c 1970-01-01 02:00:00.000000000 +0200 -+++ vdr-1.7.27-liemikuutio/filetransfer.c 2012-03-25 15:20:41.000000000 +0300 +Index: b/filetransfer.c +=================================================================== +--- /dev/null ++++ b/filetransfer.c @@ -0,0 +1,278 @@ +/* + * filetransfer.c: The video file transfer facilities @@ -348,9 +352,10 @@ + ended = false; + return result; +} -diff -Nru vdr-1.7.27-vanilla/filetransfer.h vdr-1.7.27-liemikuutio/filetransfer.h ---- vdr-1.7.27-vanilla/filetransfer.h 1970-01-01 02:00:00.000000000 +0200 -+++ vdr-1.7.27-liemikuutio/filetransfer.h 2012-03-25 15:20:41.000000000 +0300 +Index: b/filetransfer.h +=================================================================== +--- /dev/null ++++ b/filetransfer.h @@ -0,0 +1,33 @@ +/* + * filetransfer.h: The video file transfer facilities @@ -385,9 +390,10 @@ + }; + +#endif //__FILETRANSFER_H -diff -Nru vdr-1.7.27-vanilla/HISTORY-liemikuutio vdr-1.7.27-liemikuutio/HISTORY-liemikuutio ---- vdr-1.7.27-vanilla/HISTORY-liemikuutio 1970-01-01 02:00:00.000000000 +0200 -+++ vdr-1.7.27-liemikuutio/HISTORY-liemikuutio 2012-03-25 15:20:41.000000000 +0300 +Index: b/HISTORY-liemikuutio +=================================================================== +--- /dev/null ++++ b/HISTORY-liemikuutio @@ -0,0 +1,165 @@ +----------------------------------- +Liemikuutio for Video Disc Recorder @@ -554,9 +560,10 @@ + +- Updated the filetransfer patch. +- Removed the DVB subtitles hack for old recordings. -diff -Nru vdr-1.7.27-vanilla/Makefile vdr-1.7.27-liemikuutio/Makefile ---- vdr-1.7.27-vanilla/Makefile 2012-03-25 15:17:57.000000000 +0300 -+++ vdr-1.7.27-liemikuutio/Makefile 2012-03-25 15:20:41.000000000 +0300 +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile @@ -41,8 +41,8 @@ SILIB = $(LSIDIR)/libsi.a @@ -568,9 +575,10 @@ receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o shutdown.o\ skinclassic.o skins.o skinsttng.o sourceparams.o sources.o spu.o status.o svdrp.o themes.o thread.o\ timers.o tools.o transfer.o vdr.o videodir.o -diff -Nru vdr-1.7.27-vanilla/menu.c vdr-1.7.27-liemikuutio/menu.c ---- vdr-1.7.27-vanilla/menu.c 2012-03-25 15:17:57.000000000 +0300 -+++ vdr-1.7.27-liemikuutio/menu.c 2012-03-25 15:28:20.000000000 +0300 +Index: b/menu.c +=================================================================== +--- a/menu.c ++++ b/menu.c @@ -18,6 +18,7 @@ #include "config.h" #include "cutter.h" @@ -892,9 +900,10 @@ case kMarkJumpForward|k_Repeat: case kMarkJumpForward: MarkJump(true); break; case kMarkMoveBack|k_Repeat: -diff -Nru vdr-1.7.27-vanilla/menu.h vdr-1.7.27-liemikuutio/menu.h ---- vdr-1.7.27-vanilla/menu.h 2012-03-25 15:17:57.000000000 +0300 -+++ vdr-1.7.27-liemikuutio/menu.h 2012-03-25 15:20:41.000000000 +0300 +Index: b/menu.h +=================================================================== +--- a/menu.h ++++ b/menu.h @@ -101,6 +101,7 @@ bool replaying; cOsdItem *stopReplayItem; @@ -921,9 +930,10 @@ time_t timeoutShow; bool timeSearchActive, timeSearchHide; int timeSearchTime, timeSearchPos; -diff -Nru vdr-1.7.27-vanilla/osdbase.c vdr-1.7.27-liemikuutio/osdbase.c ---- vdr-1.7.27-vanilla/osdbase.c 2012-03-25 15:17:57.000000000 +0300 -+++ vdr-1.7.27-liemikuutio/osdbase.c 2012-03-25 15:20:41.000000000 +0300 +Index: b/osdbase.c +=================================================================== +--- a/osdbase.c ++++ b/osdbase.c @@ -78,6 +78,7 @@ { isMenu = true; @@ -941,7 +951,7 @@ s = buffer; } } -@@ -464,20 +465,60 @@ +@@ -468,20 +469,60 @@ } } @@ -1005,7 +1015,7 @@ return osContinue; } -@@ -516,8 +557,8 @@ +@@ -520,8 +561,8 @@ } } switch (int(Key)) { @@ -1016,9 +1026,10 @@ case kUp|k_Repeat: case kUp: CursorUp(); break; case kDown|k_Repeat: -diff -Nru vdr-1.7.27-vanilla/osdbase.h vdr-1.7.27-liemikuutio/osdbase.h ---- vdr-1.7.27-vanilla/osdbase.h 2012-03-25 15:17:57.000000000 +0300 -+++ vdr-1.7.27-liemikuutio/osdbase.h 2012-03-25 15:20:41.000000000 +0300 +Index: b/osdbase.h +=================================================================== +--- a/osdbase.h ++++ b/osdbase.h @@ -30,6 +30,7 @@ osStopRecord, osStopReplay, @@ -1036,9 +1047,10 @@ void DisplayHelp(bool Force = false); protected: void SetDisplayMenu(void); -diff -Nru vdr-1.7.27-vanilla/po/de_DE.po vdr-1.7.27-liemikuutio/po/de_DE.po ---- vdr-1.7.27-vanilla/po/de_DE.po 2012-03-25 15:17:57.000000000 +0300 -+++ vdr-1.7.27-liemikuutio/po/de_DE.po 2012-03-25 15:20:41.000000000 +0300 +Index: b/po/de_DE.po +=================================================================== +--- a/po/de_DE.po ++++ b/po/de_DE.po @@ -1341,3 +1341,70 @@ #, c-format msgid "VDR will shut down in %s minutes" @@ -1110,9 +1122,10 @@ + +msgid "File already exists - overwrite?" +msgstr "Datei besteht bereits - überschreiben?" -diff -Nru vdr-1.7.27-vanilla/po/fi_FI.po vdr-1.7.27-liemikuutio/po/fi_FI.po ---- vdr-1.7.27-vanilla/po/fi_FI.po 2012-03-25 15:17:57.000000000 +0300 -+++ vdr-1.7.27-liemikuutio/po/fi_FI.po 2012-03-25 15:20:41.000000000 +0300 +Index: b/po/fi_FI.po +=================================================================== +--- a/po/fi_FI.po ++++ b/po/fi_FI.po @@ -1344,3 +1344,70 @@ #, c-format msgid "VDR will shut down in %s minutes" @@ -1184,9 +1197,10 @@ + +msgid "File already exists - overwrite?" +msgstr "Tiedosto on jo olemassa - ylikirjoitetaanko?" -diff -Nru vdr-1.7.27-vanilla/recording.c vdr-1.7.27-liemikuutio/recording.c ---- vdr-1.7.27-vanilla/recording.c 2012-03-25 15:17:57.000000000 +0300 -+++ vdr-1.7.27-liemikuutio/recording.c 2012-03-25 15:20:41.000000000 +0300 +Index: b/recording.c +=================================================================== +--- a/recording.c ++++ b/recording.c @@ -932,6 +932,16 @@ return NULL; } @@ -1222,9 +1236,10 @@ strncpy(ext, DELEXT, strlen(ext)); if (access(recording->FileName(), F_OK) == 0) { recording->deleted = time(NULL); -diff -Nru vdr-1.7.27-vanilla/recording.h vdr-1.7.27-liemikuutio/recording.h ---- vdr-1.7.27-vanilla/recording.h 2012-03-25 15:17:57.000000000 +0300 -+++ vdr-1.7.27-liemikuutio/recording.h 2012-03-25 15:20:41.000000000 +0300 +Index: b/recording.h +=================================================================== +--- a/recording.h ++++ b/recording.h @@ -121,6 +121,7 @@ const char *Title(char Delimiter = ' ', bool NewIndicator = false, int Level = -1) const; const cRecordingInfo *Info(void) const { return info; } @@ -1242,9 +1257,10 @@ void UpdateByName(const char *FileName); int TotalFileSizeMB(void); double MBperMinute(void); -diff -Nru vdr-1.7.27-vanilla/shutdown.c vdr-1.7.27-liemikuutio/shutdown.c ---- vdr-1.7.27-vanilla/shutdown.c 2012-03-25 15:17:57.000000000 +0300 -+++ vdr-1.7.27-liemikuutio/shutdown.c 2012-03-25 15:20:41.000000000 +0300 +Index: b/shutdown.c +=================================================================== +--- a/shutdown.c ++++ b/shutdown.c @@ -17,6 +17,7 @@ #include "channels.h" #include "config.h" @@ -1275,9 +1291,10 @@ cTimer *timer = Timers.GetNextActiveTimer(); time_t Next = timer ? timer->StartTime() : 0; -diff -Nru vdr-1.7.27-vanilla/svdrp.c vdr-1.7.27-liemikuutio/svdrp.c ---- vdr-1.7.27-vanilla/svdrp.c 2012-03-25 15:17:56.000000000 +0300 -+++ vdr-1.7.27-liemikuutio/svdrp.c 2012-03-25 15:20:41.000000000 +0300 +Index: b/svdrp.c +=================================================================== +--- a/svdrp.c ++++ b/svdrp.c @@ -31,6 +31,7 @@ #include "cutter.h" #include "device.h" @@ -1392,9 +1409,10 @@ else if (CMD("NEWC")) CmdNEWC(s); else if (CMD("NEWT")) CmdNEWT(s); else if (CMD("NEXT")) CmdNEXT(s); -diff -Nru vdr-1.7.27-vanilla/svdrp.h vdr-1.7.27-liemikuutio/svdrp.h ---- vdr-1.7.27-vanilla/svdrp.h 2012-03-25 15:17:57.000000000 +0300 -+++ vdr-1.7.27-liemikuutio/svdrp.h 2012-03-25 15:20:41.000000000 +0300 +Index: b/svdrp.h +=================================================================== +--- a/svdrp.h ++++ b/svdrp.h @@ -56,6 +56,7 @@ void PrintHelpTopics(const char **hp); void CmdCHAN(const char *Option); @@ -1411,9 +1429,10 @@ void CmdNEWC(const char *Option); void CmdNEWT(const char *Option); void CmdNEXT(const char *Option); -diff -Nru vdr-1.7.27-vanilla/vdr.c vdr-1.7.27-liemikuutio/vdr.c ---- vdr-1.7.27-vanilla/vdr.c 2012-03-25 15:17:56.000000000 +0300 -+++ vdr-1.7.27-liemikuutio/vdr.c 2012-03-25 15:20:41.000000000 +0300 +Index: b/vdr.c +=================================================================== +--- a/vdr.c ++++ b/vdr.c @@ -45,6 +45,7 @@ #include "dvbdevice.h" #include "eitscan.h" @@ -1422,7 +1441,7 @@ #include "i18n.h" #include "interface.h" #include "keys.h" -@@ -1223,6 +1224,12 @@ +@@ -1248,6 +1249,12 @@ else Skins.Message(mtInfo, tr("Editing process finished")); } @@ -1435,7 +1454,7 @@ } // SIGHUP shall cause a restart: -@@ -1238,7 +1245,7 @@ +@@ -1263,7 +1270,7 @@ ShutdownHandler.countdown.Cancel(); } @@ -1444,7 +1463,7 @@ // Handle housekeeping tasks // Shutdown: -@@ -1285,6 +1292,7 @@ +@@ -1310,6 +1317,7 @@ PluginManager.StopPlugins(); cRecordControls::Shutdown(); @@ -1452,9 +1471,10 @@ cCutter::Stop(); delete Menu; cControl::Shutdown(); -diff -Nru vdr-1.7.27-vanilla/videodir.c vdr-1.7.27-liemikuutio/videodir.c ---- vdr-1.7.27-vanilla/videodir.c 2012-03-25 15:17:57.000000000 +0300 -+++ vdr-1.7.27-liemikuutio/videodir.c 2012-03-25 15:20:41.000000000 +0300 +Index: b/videodir.c +=================================================================== +--- a/videodir.c ++++ b/videodir.c @@ -224,6 +224,22 @@ return NULL; } @@ -1478,9 +1498,10 @@ void RemoveEmptyVideoDirectories(void) { cVideoDirectory Dir; -diff -Nru vdr-1.7.27-vanilla/videodir.h vdr-1.7.27-liemikuutio/videodir.h ---- vdr-1.7.27-vanilla/videodir.h 2012-03-25 15:17:57.000000000 +0300 -+++ vdr-1.7.27-liemikuutio/videodir.h 2012-03-25 15:20:41.000000000 +0300 +Index: b/videodir.h +=================================================================== +--- a/videodir.h ++++ b/videodir.h @@ -22,6 +22,7 @@ bool VideoFileSpaceAvailable(int SizeMB); int VideoDiskSpace(int *FreeMB = NULL, int *UsedMB = NULL); // returns the used disk space in percent diff -Nru vdr-1.7.27/debian/patches/opt-61_dynamite.patch vdr-1.7.27/debian/patches/opt-61_dynamite.patch --- vdr-1.7.27/debian/patches/opt-61_dynamite.patch 2012-04-05 19:50:02.000000000 +0000 +++ vdr-1.7.27/debian/patches/opt-61_dynamite.patch 2012-10-16 19:24:35.000000000 +0000 @@ -4,6 +4,8 @@ Forwarded: no Author: Lars Hanisch +Index: b/ci.c +=================================================================== --- a/ci.c +++ b/ci.c @@ -1571,6 +1571,8 @@ @@ -15,6 +17,8 @@ CamSlots.Del(this, false); DeleteAllConnections(); } +Index: b/ci.h +=================================================================== --- a/ci.h +++ b/ci.h @@ -115,6 +115,8 @@ @@ -26,6 +30,8 @@ }; class cTPDU; +Index: b/device.c +=================================================================== --- a/device.c +++ b/device.c @@ -70,12 +70,22 @@ @@ -312,6 +318,8 @@ +{ + DynamicDeviceProbes.Del(this, false); +} +Index: b/device.h +=================================================================== --- a/device.h +++ b/device.h @@ -171,7 +171,6 @@ @@ -439,6 +447,8 @@ +extern cList DynamicDeviceProbes; + #endif //__DEVICE_H +Index: b/dvbci.c +=================================================================== --- a/dvbci.c +++ b/dvbci.c @@ -10,15 +10,18 @@ @@ -547,6 +557,8 @@ + return new cDvbCiAdapter(Device, Fd, Adapter, Frontend); return NULL; } +Index: b/dvbci.h +=================================================================== --- a/dvbci.h +++ b/dvbci.h @@ -16,16 +16,24 @@ @@ -576,6 +588,8 @@ }; #endif //__DVBCI_H +Index: b/dvbdevice.c +=================================================================== --- a/dvbdevice.c +++ b/dvbdevice.c @@ -287,7 +287,7 @@ @@ -787,9 +801,11 @@ } int cDvbDevice::NumProvidedSystems(void) const +Index: b/dvbdevice.h +=================================================================== --- a/dvbdevice.h +++ b/dvbdevice.h -@@ -107,7 +107,7 @@ +@@ -108,7 +108,7 @@ /// The cDvbDevice implements a DVB device which can be accessed through the Linux DVB driver API. class cDvbDevice : public cDevice { @@ -798,7 +814,7 @@ static cString DvbName(const char *Name, int Adapter, int Frontend); static int DvbOpen(const char *Name, int Adapter, int Frontend, int Mode, bool ReportError = false); private: -@@ -133,12 +133,14 @@ +@@ -134,12 +134,14 @@ mutable bool needsDetachBondedReceivers; bool QueryDeliverySystems(int fd_frontend); public: diff -Nru vdr-1.7.27/debian/patches/opt-65_pin.patch vdr-1.7.27/debian/patches/opt-65_pin.patch --- vdr-1.7.27/debian/patches/opt-65_pin.patch 2012-03-25 17:26:59.000000000 +0000 +++ vdr-1.7.27/debian/patches/opt-65_pin.patch 2012-10-16 19:25:09.000000000 +0000 @@ -2,10 +2,10 @@ Author: Jörg Wendel Origin: http://www.jwendel.de/vdr/ -Index: vdr-1.7.27/device.c +Index: b/device.c =================================================================== ---- vdr-1.7.27.orig/device.c 2012-03-25 14:47:30.464975099 +0200 -+++ vdr-1.7.27/device.c 2012-03-25 14:51:11.774975107 +0200 +--- a/device.c ++++ b/device.c @@ -735,6 +735,12 @@ bool cDevice::SwitchChannel(const cChannel *Channel, bool LiveView) @@ -27,10 +27,10 @@ if (GetDevice(channel, LIVEPRIORITY, true, true)) break; n = channel->Number() + Direction; -Index: vdr-1.7.27/menu.c +Index: b/menu.c =================================================================== ---- vdr-1.7.27.orig/menu.c 2012-03-25 14:51:11.744975107 +0200 -+++ vdr-1.7.27/menu.c 2012-03-25 14:51:11.784975107 +0200 +--- a/menu.c ++++ b/menu.c @@ -938,6 +938,16 @@ Add(new cMenuEditBitItem( tr("VPS"), &data.flags, tfVps)); Add(new cMenuEditIntItem( tr("Priority"), &data.priority, 0, MAXPRIORITY)); @@ -156,10 +156,10 @@ return RecordControls[i]->Process(time(NULL)); } } -Index: vdr-1.7.27/osd.c +Index: b/osd.c =================================================================== ---- vdr-1.7.27.orig/osd.c 2012-03-25 14:39:29.104975081 +0200 -+++ vdr-1.7.27/osd.c 2012-03-25 14:51:11.784975107 +0200 +--- a/osd.c ++++ b/osd.c @@ -1605,6 +1605,7 @@ int cOsd::osdHeight = 0; cVector cOsd::Osds; @@ -168,10 +168,10 @@ cOsd::cOsd(int Left, int Top, uint Level) { -Index: vdr-1.7.27/osd.h +Index: b/osd.h =================================================================== ---- vdr-1.7.27.orig/osd.h 2012-03-25 14:39:29.104975081 +0200 -+++ vdr-1.7.27/osd.h 2012-03-25 14:51:11.784975107 +0200 +--- a/osd.h ++++ b/osd.h @@ -922,6 +922,7 @@ ///< delete pm; ///< } @@ -180,10 +180,10 @@ }; #define MAXOSDIMAGES 64 -Index: vdr-1.7.27/status.c +Index: b/status.c =================================================================== ---- vdr-1.7.27.orig/status.c 2012-03-25 14:39:29.144975081 +0200 -+++ vdr-1.7.27/status.c 2012-03-25 14:51:11.784975107 +0200 +--- a/status.c ++++ b/status.c @@ -153,3 +153,55 @@ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) sm->OsdEventItem(Event, Text, Index, Count); @@ -240,10 +240,10 @@ + return true; + return false; +} -Index: vdr-1.7.27/status.h +Index: b/status.h =================================================================== ---- vdr-1.7.27.orig/status.h 2012-03-25 14:39:29.144975081 +0200 -+++ vdr-1.7.27/status.h 2012-03-25 14:51:11.784975107 +0200 +--- a/status.h ++++ b/status.h @@ -14,6 +14,7 @@ #include "device.h" #include "player.h" @@ -290,10 +290,10 @@ }; #endif //__STATUS_H -Index: vdr-1.7.27/timers.c +Index: b/timers.c =================================================================== ---- vdr-1.7.27.orig/timers.c 2012-02-27 10:38:41.000000000 +0100 -+++ vdr-1.7.27/timers.c 2012-03-25 14:51:11.784975107 +0200 +--- a/timers.c ++++ b/timers.c @@ -47,6 +47,7 @@ stop -= 2400; priority = Pause ? Setup.PausePriority : Setup.DefaultPriority; @@ -368,10 +368,10 @@ // --- cTimers --------------------------------------------------------------- cTimers Timers; -Index: vdr-1.7.27/timers.h +Index: b/timers.h =================================================================== ---- vdr-1.7.27.orig/timers.h 2012-02-20 16:52:57.000000000 +0100 -+++ vdr-1.7.27/timers.h 2012-03-25 14:51:11.794975107 +0200 +--- a/timers.h ++++ b/timers.h @@ -38,6 +38,7 @@ int start; int stop; @@ -396,11 +396,11 @@ void ClrFlags(uint Flags); void InvFlags(uint Flags); bool HasFlags(uint Flags) const; -Index: vdr-1.7.27/vdr.c +Index: b/vdr.c =================================================================== ---- vdr-1.7.27.orig/vdr.c 2012-03-25 14:39:28.704975081 +0200 -+++ vdr-1.7.27/vdr.c 2012-03-25 14:51:11.794975107 +0200 -@@ -60,6 +60,7 @@ +--- a/vdr.c ++++ b/vdr.c +@@ -61,6 +61,7 @@ #include "skinsttng.h" #include "sourceparams.h" #include "sources.h" @@ -408,7 +408,7 @@ #include "themes.h" #include "timers.h" #include "tools.h" -@@ -930,6 +931,7 @@ +@@ -945,6 +946,7 @@ cOsdObject *Interact = Menu ? Menu : cControl::Control(); eKeys key = Interface->GetKey(!Interact || !Interact->NeedsFastResponse()); if (ISREALKEY(key)) { @@ -416,7 +416,7 @@ EITScanner.Activity(); // Cancel shutdown countdown: if (ShutdownHandler.countdown) -@@ -1002,10 +1004,12 @@ +@@ -1017,10 +1019,12 @@ cControl::Control()->Hide(); cPlugin *plugin = cPluginManager::GetPlugin(PluginName); if (plugin) { @@ -429,7 +429,7 @@ else esyslog("ERROR: unknown plugin '%s'", PluginName); } -@@ -1218,9 +1222,11 @@ +@@ -1233,9 +1237,11 @@ // Instant resume of the last viewed recording: case kPlay: if (cReplayControl::LastReplayed()) { diff -Nru vdr-1.7.27/debian/patches/vdr-1.7.24-s2apiwrapper-0.8.patch vdr-1.7.27/debian/patches/vdr-1.7.24-s2apiwrapper-0.8.patch --- vdr-1.7.27/debian/patches/vdr-1.7.24-s2apiwrapper-0.8.patch 2012-04-05 22:00:41.000000000 +0000 +++ vdr-1.7.27/debian/patches/vdr-1.7.24-s2apiwrapper-0.8.patch 2012-10-16 19:20:31.000000000 +0000 @@ -1,6 +1,7 @@ -diff -Naur vdr-1.7.23/channels.c vdr-1.7.23-s2apiwrapper/channels.c ---- vdr-1.7.23/channels.c 2011-08-26 14:44:21.000000000 +0200 -+++ vdr-1.7.23-s2apiwrapper/channels.c 2012-01-15 20:09:12.000000000 +0100 +Index: b/channels.c +=================================================================== +--- a/channels.c ++++ b/channels.c @@ -10,6 +10,7 @@ #include "channels.h" #include @@ -9,10 +10,11 @@ #include "epg.h" #include "libsi/si.h" #include "timers.h" -diff -Naur vdr-1.7.23/dvbdevice.c vdr-1.7.23-s2apiwrapper/dvbdevice.c ---- vdr-1.7.23/dvbdevice.c 2012-01-15 15:31:47.000000000 +0100 -+++ vdr-1.7.23-s2apiwrapper/dvbdevice.c 2012-01-15 20:09:12.000000000 +0100 -@@ -722,7 +722,7 @@ +Index: b/dvbdevice.c +=================================================================== +--- a/dvbdevice.c ++++ b/dvbdevice.c +@@ -724,7 +724,7 @@ memset(&CmdSeq, 0, sizeof(CmdSeq)); CmdSeq.props = Frontend; SETCMD(DTV_CLEAR, 0); @@ -21,7 +23,7 @@ esyslog("ERROR: frontend %d/%d: %m", adapter, frontend); return false; } -@@ -840,7 +840,7 @@ +@@ -842,7 +842,7 @@ return false; } SETCMD(DTV_TUNE, 0); @@ -30,9 +32,10 @@ esyslog("ERROR: frontend %d/%d: %m", adapter, frontend); return false; } -diff -Naur vdr-1.7.23/dvbdevice.h vdr-1.7.23-s2apiwrapper/dvbdevice.h ---- vdr-1.7.23/dvbdevice.h 2012-01-13 12:32:45.000000000 +0100 -+++ vdr-1.7.23-s2apiwrapper/dvbdevice.h 2012-01-15 20:09:12.000000000 +0100 +Index: b/dvbdevice.h +=================================================================== +--- a/dvbdevice.h ++++ b/dvbdevice.h @@ -13,9 +13,10 @@ #include #include @@ -47,9 +50,10 @@ #endif #define MAXDVBDEVICES 8 -diff -Naur vdr-1.7.23/Makefile vdr-1.7.23-s2apiwrapper/Makefile ---- vdr-1.7.23/Makefile 2012-01-14 14:09:10.000000000 +0100 -+++ vdr-1.7.23-s2apiwrapper/Makefile 2012-01-15 20:09:12.000000000 +0100 +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile @@ -40,7 +40,7 @@ SILIB = $(LSIDIR)/libsi.a @@ -59,9 +63,10 @@ dvbplayer.o dvbspu.o dvbsubtitle.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\ lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o\ receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o shutdown.o\ -diff -Naur vdr-1.7.23/nit.c vdr-1.7.23-s2apiwrapper/nit.c ---- vdr-1.7.23/nit.c 2012-01-12 09:43:52.000000000 +0100 -+++ vdr-1.7.23-s2apiwrapper/nit.c 2012-01-15 20:09:12.000000000 +0100 +Index: b/nit.c +=================================================================== +--- a/nit.c ++++ b/nit.c @@ -11,6 +11,7 @@ #include #include "channels.h" @@ -70,9 +75,10 @@ #include "eitscan.h" #include "libsi/section.h" #include "libsi/descriptor.h" -diff -Naur vdr-1.7.23/PLUGINS/src/dvbsddevice/dvbsddevice.c vdr-1.7.23-s2apiwrapper/PLUGINS/src/dvbsddevice/dvbsddevice.c ---- vdr-1.7.23/PLUGINS/src/dvbsddevice/dvbsddevice.c 2011-08-27 13:34:58.000000000 +0200 -+++ vdr-1.7.23-s2apiwrapper/PLUGINS/src/dvbsddevice/dvbsddevice.c 2012-01-15 20:09:12.000000000 +0100 +Index: b/PLUGINS/src/dvbsddevice/dvbsddevice.c +=================================================================== +--- a/PLUGINS/src/dvbsddevice/dvbsddevice.c ++++ b/PLUGINS/src/dvbsddevice/dvbsddevice.c @@ -23,6 +23,8 @@ virtual const char *Description(void) { return DESCRIPTION; } virtual const char *CommandLineHelp(void); @@ -122,9 +128,10 @@ +} + VDRPLUGINCREATOR(cPluginDvbsddevice); // Don't touch this! -diff -Naur vdr-1.7.23/PLUGINS/src/dvbsddevice/dvbsdffdevice.c vdr-1.7.23-s2apiwrapper/PLUGINS/src/dvbsddevice/dvbsdffdevice.c ---- vdr-1.7.23/PLUGINS/src/dvbsddevice/dvbsdffdevice.c 2011-08-27 13:33:57.000000000 +0200 -+++ vdr-1.7.23-s2apiwrapper/PLUGINS/src/dvbsddevice/dvbsdffdevice.c 2012-01-15 20:09:12.000000000 +0100 +Index: b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c +=================================================================== +--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c ++++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c @@ -22,6 +22,7 @@ // --- cDvbSdFfDevice -------------------------------------------------------- @@ -133,7 +140,7 @@ cDvbSdFfDevice::cDvbSdFfDevice(int Adapter, int Frontend, bool OutputOnly) :cDvbDevice(Adapter, Frontend) -@@ -760,12 +761,18 @@ +@@ -749,12 +750,18 @@ int cDvbSdFfDevice::PlayTsVideo(const uchar *Data, int Length) { @@ -154,9 +161,10 @@ } // --- cDvbSdFfDeviceProbe --------------------------------------------------- -diff -Naur vdr-1.7.23/PLUGINS/src/dvbsddevice/dvbsdffdevice.h vdr-1.7.23-s2apiwrapper/PLUGINS/src/dvbsddevice/dvbsdffdevice.h ---- vdr-1.7.23/PLUGINS/src/dvbsddevice/dvbsdffdevice.h 2011-08-27 13:32:42.000000000 +0200 -+++ vdr-1.7.23-s2apiwrapper/PLUGINS/src/dvbsddevice/dvbsdffdevice.h 2012-01-15 20:09:12.000000000 +0100 +Index: b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h +=================================================================== +--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h ++++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h @@ -26,6 +26,8 @@ virtual bool HasDecoder(void) const; virtual bool AvoidRecording(void) const; @@ -166,9 +174,10 @@ // SPU facilities private: -diff -Naur vdr-1.7.23/s2apiwrapper.c vdr-1.7.23-s2apiwrapper/s2apiwrapper.c ---- vdr-1.7.23/s2apiwrapper.c 1970-01-01 01:00:00.000000000 +0100 -+++ vdr-1.7.23-s2apiwrapper/s2apiwrapper.c 2012-01-15 20:09:12.000000000 +0100 +Index: b/s2apiwrapper.c +=================================================================== +--- /dev/null ++++ b/s2apiwrapper.c @@ -0,0 +1,185 @@ +/* + * s2apiwrapper.c: @@ -355,9 +364,10 @@ +} + +#endif // ifdef DVB_S2API_WRAPPER -diff -Naur vdr-1.7.23/s2apiwrapper.h vdr-1.7.23-s2apiwrapper/s2apiwrapper.h ---- vdr-1.7.23/s2apiwrapper.h 1970-01-01 01:00:00.000000000 +0100 -+++ vdr-1.7.23-s2apiwrapper/s2apiwrapper.h 2012-01-15 21:11:14.000000000 +0100 +Index: b/s2apiwrapper.h +=================================================================== +--- /dev/null ++++ b/s2apiwrapper.h @@ -0,0 +1,268 @@ +/* + * s2apiwrapper.h: @@ -627,10 +637,11 @@ +#endif // ifdef DVB_S2API_WRAPPER + +#endif // ifndef __S2API_WRAPPER_H -diff -Naur vdr-1.7.23/vdr.c vdr-1.7.23-s2apiwrapper/vdr.c ---- vdr-1.7.23/vdr.c 2011-12-03 16:35:09.000000000 +0100 -+++ vdr-1.7.23-s2apiwrapper/vdr.c 2012-01-15 20:09:12.000000000 +0100 -@@ -55,6 +55,7 @@ +Index: b/vdr.c +=================================================================== +--- a/vdr.c ++++ b/vdr.c +@@ -54,6 +54,7 @@ #include "osdbase.h" #include "plugin.h" #include "recording.h" @@ -638,7 +649,7 @@ #include "shutdown.h" #include "skinclassic.h" #include "skinsttng.h" -@@ -221,6 +222,7 @@ +@@ -218,6 +219,7 @@ { "config", required_argument, NULL, 'c' }, { "daemon", no_argument, NULL, 'd' }, { "device", required_argument, NULL, 'D' }, @@ -646,7 +657,7 @@ { "edit", required_argument, NULL, 'e' | 0x100 }, { "epgfile", required_argument, NULL, 'E' }, { "filesize", required_argument, NULL, 'f' | 0x100 }, -@@ -268,6 +270,19 @@ +@@ -267,6 +269,19 @@ fprintf(stderr, "vdr: invalid DVB device number: %s\n", optarg); return 2; break; diff -Nru vdr-1.7.27/debian/patches/xprmtl-01_externalci.patch vdr-1.7.27/debian/patches/xprmtl-01_externalci.patch --- vdr-1.7.27/debian/patches/xprmtl-01_externalci.patch 2012-04-05 19:50:02.000000000 +0000 +++ vdr-1.7.27/debian/patches/xprmtl-01_externalci.patch 2012-10-16 19:25:30.000000000 +0000 @@ -2,10 +2,10 @@ Origin: https://github.com/flensrocker/vdr-plugin-dynamite Forwarded: no Author: Lars Hanisch -Index: vdr-1.7.27/ci.h +Index: b/ci.h =================================================================== ---- vdr-1.7.27.orig/ci.h 2012-03-25 14:47:30.464975099 +0200 -+++ vdr-1.7.27/ci.h 2012-03-25 14:51:11.824975107 +0200 +--- a/ci.h ++++ b/ci.h @@ -72,6 +72,7 @@ }; @@ -26,10 +26,10 @@ virtual bool SetIdle(bool Idle, bool TestOnly) { return false; } virtual bool IsIdle(void) const { return false; } }; -Index: vdr-1.7.27/device.h +Index: b/device.h =================================================================== ---- vdr-1.7.27.orig/device.h 2012-03-25 14:47:30.474975099 +0200 -+++ vdr-1.7.27/device.h 2012-03-25 14:51:11.824975107 +0200 +--- a/device.h ++++ b/device.h @@ -795,7 +795,14 @@ /// sure the returned data points to a TS packet and automatically /// re-synchronizes after broken packets. @@ -57,10 +57,10 @@ }; /// A plugin that want to create devices handled by the dynamite-plugin needs to create -Index: vdr-1.7.27/dvbci.c +Index: b/dvbci.c =================================================================== ---- vdr-1.7.27.orig/dvbci.c 2012-03-25 14:47:30.474975099 +0200 -+++ vdr-1.7.27/dvbci.c 2012-03-25 14:51:11.824975107 +0200 +--- a/dvbci.c ++++ b/dvbci.c @@ -22,23 +22,8 @@ adapter = Adapter; frontend = Frontend; @@ -165,10 +165,10 @@ +{ + DvbCiAdapterProbes.Del(this, false); } -Index: vdr-1.7.27/dvbci.h +Index: b/dvbci.h =================================================================== ---- vdr-1.7.27.orig/dvbci.h 2012-03-25 14:47:30.474975099 +0200 -+++ vdr-1.7.27/dvbci.h 2012-03-25 14:51:11.824975107 +0200 +--- a/dvbci.h ++++ b/dvbci.h @@ -31,9 +31,33 @@ cDvbCiAdapter(cDevice *Device, int Fd, int Adapter = -1, int Frontend = -1); public: @@ -203,10 +203,10 @@ +extern cList DvbCiAdapterProbes; + #endif //__DVBCI_H -Index: vdr-1.7.27/dvbdevice.c +Index: b/dvbdevice.c =================================================================== ---- vdr-1.7.27.orig/dvbdevice.c 2012-03-25 14:47:30.474975099 +0200 -+++ vdr-1.7.27/dvbdevice.c 2012-03-25 14:51:11.824975107 +0200 +--- a/dvbdevice.c ++++ b/dvbdevice.c @@ -1106,9 +1106,8 @@ // Common Interface: @@ -234,11 +234,11 @@ return fd_dvr >= 0; } -Index: vdr-1.7.27/dvbdevice.h +Index: b/dvbdevice.h =================================================================== ---- vdr-1.7.27.orig/dvbdevice.h 2012-03-25 14:50:28.174975106 +0200 -+++ vdr-1.7.27/dvbdevice.h 2012-03-25 14:51:11.824975107 +0200 -@@ -127,7 +127,7 @@ +--- a/dvbdevice.h ++++ b/dvbdevice.h +@@ -128,7 +128,7 @@ int deliverySystems[MAXDELIVERYSYSTEMS]; int numDeliverySystems; int numModulations; @@ -247,7 +247,7 @@ static cMutex bondMutex; cDvbDevice *bondedDevice; mutable bool needsDetachBondedReceivers; -@@ -227,7 +227,7 @@ +@@ -228,7 +228,7 @@ // Receiver facilities private: diff -Nru vdr-1.7.27/debian/rules vdr-1.7.27/debian/rules --- vdr-1.7.27/debian/rules 2012-03-25 17:26:59.000000000 +0000 +++ vdr-1.7.27/debian/rules 2012-06-03 19:44:00.000000000 +0000 @@ -56,9 +56,6 @@ # Backup po files find PLUGINS po -name "*.po" -exec test ! -f {}.backup \; -exec cp {} {}.backup \; - # disable dvbhddevice - -mv PLUGINS/src/dvbhddevice PLUGINS/src/_dvbhddevice - # build unoptimized vdr with debugging symbols $(MAKE) -j$(NJOBS) all $(MAKE_OPTIONS) VDRDEBUG=yes DEB_BUILD_OPTIONS=nostrip,noopt cp vdr vdr-dbg diff -Nru vdr-1.7.27/debian/vdr-dev.dirs vdr-1.7.27/debian/vdr-dev.dirs --- vdr-1.7.27/debian/vdr-dev.dirs 1970-01-01 00:00:00.000000000 +0000 +++ vdr-1.7.27/debian/vdr-dev.dirs 2012-06-03 19:29:20.000000000 +0000 @@ -0,0 +1 @@ +usr/include/vdr/libhdffcmd diff -Nru vdr-1.7.27/debian/vdr-dev.install vdr-1.7.27/debian/vdr-dev.install --- vdr-1.7.27/debian/vdr-dev.install 2012-03-25 17:26:59.000000000 +0000 +++ vdr-1.7.27/debian/vdr-dev.install 2012-06-03 19:29:12.000000000 +0000 @@ -1,16 +1,16 @@ -*.h usr/include/vdr/ - -libsi/*.h usr/include/vdr/libsi/ - -debian/debianize-vdrplugin usr/bin/ -debian/plugin-template/ usr/share/vdr-dev/ - -vdr-newplugin usr/bin/ - -debian/lintian/vdr-dev usr/share/lintian/overrides/ - -debian/dependencies.sh usr/share/vdr-dev/ - -debian/vdrdbg-buildpackage usr/bin/ -Make.config usr/include/vdr/ -Make.global usr/include/vdr/ +*.h usr/include/vdr/ +libsi/*.h usr/include/vdr/libsi/ +debian/debianize-vdrplugin usr/bin/ +debian/plugin-template/ usr/share/vdr-dev/ +vdr-newplugin usr/bin/ +debian/lintian/vdr-dev usr/share/lintian/overrides/ +debian/dependencies.sh usr/share/vdr-dev/ +debian/vdrdbg-buildpackage usr/bin/ +Make.config usr/include/vdr/ +Make.global usr/include/vdr/ +PLUGINS/src/dvbsddevice/*.h usr/include/vdr/ +PLUGINS/src/dvbhddevice/dvbhdffdevice.h usr/include/vdr/ +PLUGINS/src/dvbhddevice/hdffcmd.h usr/include/vdr/ +PLUGINS/src/dvbhddevice/hdffmsgdef.h usr/include/vdr/ +PLUGINS/src/dvbhddevice/hdffosd.h usr/include/vdr/ +PLUGINS/src/dvbhddevice/libhdffcmd/*.h usr/include/vdr/libhdffcmd/ diff -Nru vdr-1.7.27/debian/vdr-plugin-dvbhddevice.docs vdr-1.7.27/debian/vdr-plugin-dvbhddevice.docs --- vdr-1.7.27/debian/vdr-plugin-dvbhddevice.docs 1970-01-01 00:00:00.000000000 +0000 +++ vdr-1.7.27/debian/vdr-plugin-dvbhddevice.docs 2012-06-03 19:30:08.000000000 +0000 @@ -0,0 +1 @@ +PLUGINS/src/dvbhddevice/README diff -Nru vdr-1.7.27/debian/vdr-plugin-dvbhddevice.install vdr-1.7.27/debian/vdr-plugin-dvbhddevice.install --- vdr-1.7.27/debian/vdr-plugin-dvbhddevice.install 1970-01-01 00:00:00.000000000 +0000 +++ vdr-1.7.27/debian/vdr-plugin-dvbhddevice.install 2012-06-03 19:30:42.000000000 +0000 @@ -0,0 +1 @@ +PLUGINS/lib/libvdr-dvbhddevice.so.* usr/lib/vdr/plugins/ diff -Nru vdr-1.7.27/debian/vdr-plugin-dvbsddevice.install vdr-1.7.27/debian/vdr-plugin-dvbsddevice.install --- vdr-1.7.27/debian/vdr-plugin-dvbsddevice.install 2012-03-25 17:26:59.000000000 +0000 +++ vdr-1.7.27/debian/vdr-plugin-dvbsddevice.install 2012-06-03 19:30:47.000000000 +0000 @@ -1 +1 @@ -PLUGINS/lib/libvdr-dvbsddevice.so.* usr/lib/vdr/plugins/ +PLUGINS/lib/libvdr-dvbsddevice.so.* usr/lib/vdr/plugins/