r7032 - in /dvb/linuxtv-dvb-apps/trunk/debian: changelog patches/04_scanfiles_from_cvs.dpatch patches/05_scanfiles_not_in_cvs_yet.dpatch patches/06_scan_uk-heathfield-fix.dpatch patches/09_x_zap_flush_stdout.dpatch

[msp at users.alioth.debian.org]

Author: msp
Date: Tue Jun 17 11:19:51 2008
New Revision: 7032

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7032
Log:
* Obsolete: 02_av7110_loadkeys-BTN.dpatch 03_budget_ci_loadkeys.dpatch
  - 05_scanfiles_not_in_cvs_yet.dpatch 06_scan_uk-heathfield-fix.dpatch 04_scanfiles_from_cvs.dpatch
* Refresh: 01_README.scan.dpatch 09_x_zap_flush_stdout.dpatch

Removed:
    dvb/linuxtv-dvb-apps/trunk/debian/patches/04_scanfiles_from_cvs.dpatch
    dvb/linuxtv-dvb-apps/trunk/debian/patches/05_scanfiles_not_in_cvs_yet.dpatch
    dvb/linuxtv-dvb-apps/trunk/debian/patches/06_scan_uk-heathfield-fix.dpatch
Modified:
    dvb/linuxtv-dvb-apps/trunk/debian/changelog
    dvb/linuxtv-dvb-apps/trunk/debian/patches/09_x_zap_flush_stdout.dpatch

Modified: dvb/linuxtv-dvb-apps/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/dvb/linuxtv-dvb-apps/trunk/debian/changelog?rev=7032&op=diff
==============================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/changelog (original)
+++ dvb/linuxtv-dvb-apps/trunk/debian/changelog Tue Jun 17 11:19:51 2008
@@ -2,9 +2,9 @@
 
   [ Mark Purcell ]
   * New upstream mercurial (Hg) release
-  * Refresh debian/patches/01_README.scan.dpatch
-  * Obsolete: debian/patches/02_av7110_loadkeys-BTN.dpatch
-  * Obsolete: 03_budget_ci_loadkeys.dpatch
+  * Obsolete: 02_av7110_loadkeys-BTN.dpatch 03_budget_ci_loadkeys.dpatch
+    - 05_scanfiles_not_in_cvs_yet.dpatch 06_scan_uk-heathfield-fix.dpatch 04_scanfiles_from_cvs.dpatch
+  * Refresh: 01_README.scan.dpatch 09_x_zap_flush_stdout.dpatch
 
   [ Thomas Schmidt ]
   * Switched Build-System to cdbs, Build-Depend on cdbs

Modified: dvb/linuxtv-dvb-apps/trunk/debian/patches/09_x_zap_flush_stdout.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/dvb/linuxtv-dvb-apps/trunk/debian/patches/09_x_zap_flush_stdout.dpatch?rev=7032&op=diff
==============================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/patches/09_x_zap_flush_stdout.dpatch (original)
+++ dvb/linuxtv-dvb-apps/trunk/debian/patches/09_x_zap_flush_stdout.dpatch Tue Jun 17 11:19:51 2008
@@ -6,37 +6,25 @@
 ## DP: Make [stc]zap flush stdout after writing status line
 
 @DPATCH@
-diff -urNad linuxtv-dvb-apps-1.1.0/util/szap/czap.c /tmp/dpep.ENs8EE/linuxtv-dvb-apps-1.1.0/util/szap/czap.c
---- linuxtv-dvb-apps-1.1.0/util/szap/czap.c	2004-04-22 13:09:11.000000000 +0200
-+++ /tmp/dpep.ENs8EE/linuxtv-dvb-apps-1.1.0/util/szap/czap.c	2006-04-29 21:50:18.955710000 +0200
-@@ -243,9 +243,10 @@
+diff -urNad linuxtv-dvb-apps-1.1.1+rev1207~/util/szap/czap.c linuxtv-dvb-apps-1.1.1+rev1207/util/szap/czap.c
+--- linuxtv-dvb-apps-1.1.1+rev1207~/util/szap/czap.c	2008-06-17 01:44:38.000000000 +1000
++++ linuxtv-dvb-apps-1.1.1+rev1207/util/szap/czap.c	2008-06-17 20:44:19.000000000 +1000
+@@ -252,9 +252,10 @@
  		if (status & FE_HAS_LOCK)
  			printf("FE_HAS_LOCK");
  
 -		usleep(1000000);
-+        printf("\n");
-+        fflush(stdout);
  
--		printf("\n");
+ 		printf("\n");
++		fflush(stdout);
 +		usleep(1000000);
- 	} while (1);
  
- 	return 0;
-diff -urNad linuxtv-dvb-apps-1.1.0/util/szap/femon.c /tmp/dpep.ENs8EE/linuxtv-dvb-apps-1.1.0/util/szap/femon.c
---- linuxtv-dvb-apps-1.1.0/util/szap/femon.c	2004-04-22 13:09:12.000000000 +0200
-+++ /tmp/dpep.ENs8EE/linuxtv-dvb-apps-1.1.0/util/szap/femon.c	2006-04-29 21:50:18.955710000 +0200
-@@ -81,6 +81,7 @@
- 	 printf("FE_HAS_LOCK");
- 
-       printf("\n");
-+      fflush(stdout);
-       usleep(1000000);
-    } while (1);
- 
-diff -urNad linuxtv-dvb-apps-1.1.0/util/szap/szap.c /tmp/dpep.ENs8EE/linuxtv-dvb-apps-1.1.0/util/szap/szap.c
---- linuxtv-dvb-apps-1.1.0/util/szap/szap.c	2004-04-22 13:09:12.000000000 +0200
-+++ /tmp/dpep.ENs8EE/linuxtv-dvb-apps-1.1.0/util/szap/szap.c	2006-04-29 21:50:18.959710250 +0200
-@@ -216,6 +216,7 @@
+ 		if (exit_after_tuning && (status & FE_HAS_LOCK))
+ 			break;
+diff -urNad linuxtv-dvb-apps-1.1.1+rev1207~/util/szap/szap.c linuxtv-dvb-apps-1.1.1+rev1207/util/szap/szap.c
+--- linuxtv-dvb-apps-1.1.1+rev1207~/util/szap/szap.c	2008-06-17 01:44:38.000000000 +1000
++++ linuxtv-dvb-apps-1.1.1+rev1207/util/szap/szap.c	2008-06-17 20:44:19.000000000 +1000
+@@ -287,6 +287,7 @@
        if (status & FE_HAS_LOCK)
  	 printf("FE_HAS_LOCK");
        printf("\n");
@@ -44,19 +32,3 @@
  
        if (exit_after_tuning && ((status & FE_HAS_LOCK) || (++timeout >= 10)))
           break;
-diff -urNad linuxtv-dvb-apps-1.1.0/util/szap/tzap.c /tmp/dpep.ENs8EE/linuxtv-dvb-apps-1.1.0/util/szap/tzap.c
---- linuxtv-dvb-apps-1.1.0/util/szap/tzap.c	2004-04-22 13:09:12.000000000 +0200
-+++ /tmp/dpep.ENs8EE/linuxtv-dvb-apps-1.1.0/util/szap/tzap.c	2006-04-29 21:50:18.959710250 +0200
-@@ -362,9 +362,10 @@
- 		if (status & FE_HAS_LOCK)
- 			printf("FE_HAS_LOCK");
- 
--		usleep(1000000);
-+        printf("\n");
-+        fflush(stdout);
- 
--		printf("\n");
-+		usleep(1000000);
- 	} while (1);
- 
- 	return 0;