Commit ba4061b4 authored by Maximiliano Curia's avatar Maximiliano Curia Committed by Tobias Frost

Import Debian changes 1.0.2-12.1

tvtime (1.0.2-12.1) unstable; urgency=medium

  * Non-maintainer upload.
  * Update home.diff patch. (Closes: #732207)
parent adfb61c3
tvtime (1.0.2-12.1) unstable; urgency=medium
* Non-maintainer upload.
* Update home.diff patch. (Closes: #732207)
-- Maximiliano Curia <maxy@debian.org> Fri, 25 Apr 2014 18:08:48 +0200
tvtime (1.0.2-12) unstable; urgency=low
* QA upload, orphaning this package, see #728576.
......
diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' -x '*.swp' ../orig/tvtime-1.0.2/src/tvtime-command.c ./src/tvtime-command.c
--- ../orig/tvtime-1.0.2/src/tvtime-command.c 2003-10-29 18:59:10.000000000 +0100
+++ ./src/tvtime-command.c 2013-12-15 10:37:12.000000000 +0100
Index: tvtime/src/tvtime-command.c
===================================================================
--- tvtime.orig/src/tvtime-command.c 2014-04-25 17:27:37.935860003 +0200
+++ tvtime/src/tvtime-command.c 2014-04-25 17:27:37.931859906 +0200
@@ -39,6 +39,9 @@
int main( int argc, char **argv )
......@@ -11,10 +12,20 @@ diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' -x '*.swp' ../or
int nc = tvtime_num_commands();
config_t *cfg;
FILE *fifo;
diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' -x '*.swp' ../orig/tvtime-1.0.2/src/tvtime-configure.c ./src/tvtime-configure.c
--- ../orig/tvtime-1.0.2/src/tvtime-configure.c 2003-10-29 18:59:10.000000000 +0100
+++ ./src/tvtime-configure.c 2013-12-15 10:37:29.000000000 +0100
@@ -35,6 +35,9 @@
Index: tvtime/src/tvtime-configure.c
===================================================================
--- tvtime.orig/src/tvtime-configure.c 2014-04-25 17:27:37.935860003 +0200
+++ tvtime/src/tvtime-configure.c 2014-04-25 17:36:42.644717220 +0200
@@ -19,6 +19,8 @@
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <string.h>
+#include <stdlib.h>
#include <fcntl.h>
#include <unistd.h>
#ifdef HAVE_CONFIG_H
@@ -35,6 +37,9 @@
int main( int argc, char **argv )
{
......@@ -24,10 +35,19 @@ diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' -x '*.swp' ../or
config_t *cfg;
/*
diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' -x '*.swp' ../orig/tvtime-1.0.2/src/tvtime-scanner.c ./src/tvtime-scanner.c
--- ../orig/tvtime-1.0.2/src/tvtime-scanner.c 2005-09-08 04:56:38.000000000 +0200
+++ ./src/tvtime-scanner.c 2013-12-15 10:37:41.000000000 +0100
@@ -42,6 +42,9 @@
Index: tvtime/src/tvtime-scanner.c
===================================================================
--- tvtime.orig/src/tvtime-scanner.c 2014-04-25 17:27:37.935860003 +0200
+++ tvtime/src/tvtime-scanner.c 2014-04-25 17:36:20.736208769 +0200
@@ -24,6 +24,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <string.h>
+#include <stdlib.h>
#include <fcntl.h>
#include <unistd.h>
#ifdef HAVE_CONFIG_H
@@ -42,6 +43,9 @@
int main( int argc, char **argv )
{
......@@ -37,9 +57,10 @@ diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' -x '*.swp' ../or
config_t *cfg;
station_mgr_t *stationmgr = 0;
videoinput_t *vidin;
diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' -x '*.swp' ../orig/tvtime-1.0.2/src/tvtime.c ./src/tvtime.c
--- ../orig/tvtime-1.0.2/src/tvtime.c 2005-09-08 04:55:54.000000000 +0200
+++ ./src/tvtime.c 2013-12-15 10:37:53.000000000 +0100
Index: tvtime/src/tvtime.c
===================================================================
--- tvtime.orig/src/tvtime.c 2014-04-25 17:27:37.935860003 +0200
+++ tvtime/src/tvtime.c 2014-04-25 17:27:37.935860003 +0200
@@ -2643,6 +2643,9 @@
int main( int argc, char **argv )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment