vdr/vdr-plugin-statusleds/debian/patches 02_gcc295.dpatch 00list

Tobias Grimm pkg-vdr-dvb-changes@lists.alioth.debian.org
Sat, 27 Nov 2004 01:25:34 +0000


Update of /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-statusleds/debian/patches
In directory haydn:/tmp/cvs-serv8475/patches

Modified Files:
	00list 
Added Files:
	02_gcc295.dpatch 
Log Message:
added include order patch, because of STL conflicts wehen compiling on Woody with Autopid

Index: 00list
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-statusleds/debian/patches/00list,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 00list	23 Nov 2004 01:09:18 -0000	1.2
+++ 00list	27 Nov 2004 01:25:32 -0000	1.3
@@ -1 +1,2 @@
 01_Makefile-fPIC-fix
+02_gcc295

--- NEW FILE: 02_gcc295.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run

## gcc 2.95 patch
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Changes include order to avoid STL conflicts with gcc < 3.0.
## DP: (STL has to be included before any vdr include.)

@DPATCH@
--- vdr-plugin-statusleds-0.2.orig/statusleds.c
+++ vdr-plugin-statusleds-0.2/statusleds.c
@@ -5,7 +5,6 @@
  *
  */
 
-#include "i18n.h"
 #include <unistd.h>
 #include <getopt.h>
 #include <vdr/videodir.h>
@@ -16,6 +15,7 @@
 #include <ctype.h>
 #include <sys/kd.h>
 #include <sys/ioctl.h>
+#include "i18n.h"
 
 extern char **environ;