← Back to branch summary

~ubuntu-branches/debian/sid/openchange/sid

« back to all changes in this revision

Viewing changes to debian/patches/03_no_popt

  • Committer: Package Import Robot
  • Author(s): Jelmer Vernooij
  • Date: 2012-04-12 20:07:57 UTC
  • mfrom: (11 sid)
  • mto: This revision was merged to the branch mainline in revision 12.
  • Revision ID: package-import@ubuntu.com-20120412200757-k933d9trljmxj1l4
Tags: 1:1.0-4
* openchangeserver: Add dependency on openchangeproxy.
* Rebuild against newer version of Samba 4.
* Use dpkg-buildflags.
* Migrate to Git, update Vcs-Git header.
* Switch to debhelper 9.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/03_no_popt
 
1
Description: Avoid samba/popt.h, which is not present in newer Samba versions
 
2
Author: Jelmer Vernooij <jelmer@debian.org>
 
3
Status: Cherrypicked from upstream
 
4
 
 
5
=== modified file 'doc/examples/multiple_notif.c'
 
6
--- old/doc/examples/multiple_notif.c   2010-11-24 17:15:37 +0000
 
7
+++ new/doc/examples/multiple_notif.c   2012-03-15 17:04:10 +0000
 
8
@@ -39,7 +39,7 @@
 
9
 
 
10
 #include <libmapi/libmapi.h>
 
11
 #include <pthread.h> 
 
12
-#include <samba/popt.h>
 
13
+#include <popt.h>
 
14
 
 
15
 #define        DEFAULT_PROFDB  "%s/.openchange/profiles.ldb"
 
16
 
 
17
 
 
18
=== modified file 'mapiproxy/libmapistore/tests/mapistore_test.c'
 
19
--- old/mapiproxy/libmapistore/tests/mapistore_test.c   2012-02-20 14:56:25 +0000
 
20
+++ new/mapiproxy/libmapistore/tests/mapistore_test.c   2012-03-15 17:04:10 +0000
 
21
@@ -23,7 +23,7 @@
 
22
 #include "mapiproxy/libmapistore/mapistore_errors.h"
 
23
 #include <talloc.h>
 
24
 #include <core/ntstatus.h>
 
25
-#include <samba/popt.h>
 
26
+#include <popt.h>
 
27
 #include <param.h>
 
28
 #include <util/debug.h>
 
29
 
 
30
 
 
31
=== modified file 'testprogs/check_fasttransfer.c'
 
32
--- old/testprogs/check_fasttransfer.c  2012-02-24 13:23:22 +0000
 
33
+++ new/testprogs/check_fasttransfer.c  2012-03-15 17:04:10 +0000
 
34
@@ -23,7 +23,7 @@
 
35
 #include "mapiproxy/libmapistore/mapistore.h"
 
36
 #include "mapiproxy/libmapistore/mapistore_errors.h"
 
37
 
 
38
-#include <samba/popt.h>
 
39
+#include <popt.h>
 
40
 #include <ldb.h>
 
41
 #include <talloc.h>
 
42
 #include <inttypes.h>
 
43
 
 
44
=== modified file 'testprogs/test_asyncnotif.c'
 
45
--- old/testprogs/test_asyncnotif.c     2011-10-25 10:05:22 +0000
 
46
+++ new/testprogs/test_asyncnotif.c     2012-03-15 17:04:10 +0000
 
47
@@ -21,7 +21,7 @@
 
48
 
 
49
 #include "libmapi/libmapi.h"
 
50
 
 
51
-#include <samba/popt.h>
 
52
+#include <popt.h>
 
53
 #include <talloc.h>
 
54
 
 
55
 static void popt_openchange_version_callback(poptContext con,
 
56
 
 
57
=== modified file 'utils/backup/openchangemapidump.c'
 
58
--- old/utils/backup/openchangemapidump.c       2011-06-27 21:26:39 +0000
 
59
+++ new/utils/backup/openchangemapidump.c       2012-03-15 17:04:10 +0000
 
60
@@ -21,7 +21,7 @@
 
61
 */
 
62
 
 
63
 #include "libmapi/libmapi.h"
 
64
-#include <samba/popt.h>
 
65
+#include <popt.h>
 
66
 #include <param.h>
 
67
 
 
68
 #include "openchangebackup.h"
 
69
 
 
70
=== modified file 'utils/exchange2mbox.c'
 
71
--- old/utils/exchange2mbox.c   2012-02-27 13:43:33 +0000
 
72
+++ new/utils/exchange2mbox.c   2012-03-15 17:04:10 +0000
 
73
@@ -20,7 +20,7 @@
 
74
 */
 
75
 
 
76
 #include "libmapi/libmapi.h"
 
77
-#include <samba/popt.h>
 
78
+#include <popt.h>
 
79
 #include <ldb.h>
 
80
 
 
81
 #include <sys/types.h>
 
82
 
 
83
=== modified file 'utils/mapiprofile.c'
 
84
--- old/utils/mapiprofile.c     2012-02-27 14:46:02 +0000
 
85
+++ new/utils/mapiprofile.c     2012-03-15 17:04:10 +0000
 
86
@@ -20,7 +20,7 @@
 
87
 */
 
88
 
 
89
 #include "libmapi/libmapi.h"
 
90
-#include <samba/popt.h>
 
91
+#include <popt.h>
 
92
 #include <param.h>
 
93
 #include "openchange-tools.h"
 
94
 
 
95
 
 
96
=== modified file 'utils/mapitest/mapitest.c'
 
97
--- old/utils/mapitest/mapitest.c       2010-12-01 20:59:03 +0000
 
98
+++ new/utils/mapitest/mapitest.c       2012-03-15 17:04:10 +0000
 
99
@@ -22,7 +22,7 @@
 
100
 #include "utils/mapitest/mapitest.h"
 
101
 #include "utils/openchange-tools.h"
 
102
 
 
103
-#include <samba/popt.h>
 
104
+#include <popt.h>
 
105
 #include <param.h>
 
106
 
 
107
 #include "config.h"
 
108
 
 
109
=== modified file 'utils/openchangeclient.c'
 
110
--- old/utils/openchangeclient.c        2012-02-28 14:15:09 +0000
 
111
+++ new/utils/openchangeclient.c        2012-03-15 17:04:10 +0000
 
112
@@ -23,7 +23,7 @@
 
113
 #include "libmapi/libmapi_private.h"
 
114
 #include "libmapi/mapi_nameid.h"
 
115
 #include "libocpf/ocpf.h"
 
116
-#include <samba/popt.h>
 
117
+#include <popt.h>
 
118
 #include <param.h>
 
119
 
 
120
 #include "openchangeclient.h"
 
121
 
 
122
=== modified file 'utils/openchangepfadmin.c'
 
123
--- old/utils/openchangepfadmin.c       2011-06-27 21:26:39 +0000
 
124
+++ new/utils/openchangepfadmin.c       2012-03-15 17:04:10 +0000
 
125
@@ -21,7 +21,7 @@
 
126
 
 
127
 #include "libmapi/libmapi.h"
 
128
 #include "libmapiadmin/libmapiadmin.h"
 
129
-#include <samba/popt.h>
 
130
+#include <popt.h>
 
131
 #include <param.h>
 
132
 
 
133
 #include "openchangepfadmin.h"
 
134