← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/recoll/intrepid

« back to all changes in this revision

Viewing changes to debian/patches/02_gcc-snapshot-missing-headers-fix.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Kartik Mistry
  • Date: 2008-05-29 23:25:40 UTC
  • mfrom: (1.1.5 upstream) (4.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20080529232540-9kuyznin2g8zmjn9
Tags: 1.10.2-1
* New upstream release
  + Updated patch debian/patches/02_gcc-snapshot-missing-headers-fix.dpatch
    Some portions are now merged with upstream
* debian/copyright:
  + Fixed indentation to 80 characters
  + Updated Debian package copyright year

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_gcc-snapshot-missing-headers-fix.dpatch
5
5
 
6
6
@DPATCH@
7
7
 
8
 
--- recoll-1.10.0-orig/qtgui/advsearch_w.cpp    2008-01-27 11:16:58.000000000 +0530
9
 
+++ recoll-1.10.0/qtgui/advsearch_w.cpp 2008-01-27 14:10:16.000000000 +0530
10
 
@@ -17,6 +17,9 @@
11
 
  *   Free Software Foundation, Inc.,
12
 
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
13
 
  */
14
 
+
15
 
+#include <cstdlib>
16
 
+#include <algorithm>
17
 
 #include "advsearch_w.h"
18
 
 
19
 
 #include <qvariant.h>
20
 
diff -ur recoll-1.10.0-orig/qtgui/confgui/confgui.cpp recoll-1.10.0/qtgui/confgui/confgui.cpp
21
 
--- recoll-1.10.0-orig/qtgui/confgui/confgui.cpp        2008-01-27 11:16:59.000000000 +0530
22
 
+++ recoll-1.10.0/qtgui/confgui/confgui.cpp     2008-01-27 14:19:02.000000000 +0530
23
 
@@ -2,7 +2,8 @@
24
 
 static char rcsid[] = "@(#$Id: confgui.cpp,v 1.8 2007/10/25 15:51:02 dockes Exp $ (C) 2005 J.F.Dockes";
 
8
diff -ur recoll-1.10.2-orig/qtgui/confgui/confgui.cpp recoll-1.10.2/qtgui/confgui/confgui.cpp
 
9
--- recoll-1.10.2-orig/qtgui/confgui/confgui.cpp        2008-05-29 23:40:02.000000000 +0530
 
10
+++ recoll-1.10.2/qtgui/confgui/confgui.cpp     2008-05-29 23:41:07.000000000 +0530
 
11
@@ -2,8 +2,8 @@
 
12
 static char rcsid[] = "@(#$Id: confgui.cpp,v 1.9 2008/05/21 07:21:37 dockes Exp $ (C) 2005 J.F.Dockes";
25
13
 #endif
26
 
 
 
14
 
27
15
-#include <stdio.h>
 
16
-#include <stdlib.h>
28
17
+#include <cstdio>
29
18
+#include <cstdlib>
30
 
 
 
19
 
31
20
 #include <qglobal.h>
32
21
 #if QT_VERSION < 0x040000
33
 
diff -ur recoll-1.10.0-orig/qtgui/preview_w.cpp recoll-1.10.0/qtgui/preview_w.cpp
34
 
--- recoll-1.10.0-orig/qtgui/preview_w.cpp      2008-01-27 11:16:58.000000000 +0530
35
 
+++ recoll-1.10.0/qtgui/preview_w.cpp   2008-01-27 14:14:41.000000000 +0530
36
 
@@ -20,7 +20,7 @@
37
 
 #include <unistd.h>
38
 
 #include <time.h>
39
 
 #include <sys/stat.h>
40
 
-
41
 
+#include <cstdlib>
42
 
 #include <list>
43
 
 #include <utility>
44
 
 #ifndef NO_NAMESPACES
45
 
diff -ur recoll-1.10.0-orig/qtgui/reslist.cpp recoll-1.10.0/qtgui/reslist.cpp
46
 
--- recoll-1.10.0-orig/qtgui/reslist.cpp        2008-01-27 11:16:58.000000000 +0530
47
 
+++ recoll-1.10.0/qtgui/reslist.cpp     2008-01-27 13:48:51.000000000 +0530
48
 
@@ -2,6 +2,7 @@
49
 
 static char rcsid[] = "@(#$Id: reslist.cpp,v 1.36 2007/11/15 18:05:00 dockes Exp $ (C) 2005 J.F.Dockes";
50
 
 #endif
51
 
 
52
 
+#include <cstdlib>
53
 
 #include <time.h>
54
 
 
55
 
 #include <qapplication.h>
56