Package: kopanocore / 8.7.0-3

Use-install-layout-deb.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
Date: Sat, 3 Nov 2018 13:41:31 +0100
Subject: Use install-layout=deb

---
 ECtools/backup/Makefile.am        | 2 +-
 ECtools/cli/Makefile.am           | 4 ++--
 ECtools/migration-pst/Makefile.am | 4 ++--
 ECtools/presence/Makefile.am      | 4 ++--
 ECtools/rest/Makefile.am          | 4 ++--
 ECtools/search/Makefile.am        | 4 ++--
 ECtools/spamd/Makefile.am         | 4 ++--
 ECtools/utils/Makefile.am         | 4 ++--
 swig/python/Makefile.am           | 4 ++--
 swig/python/kopano/Makefile.am    | 4 ++--
 swig/python/zarafa/Makefile.am    | 4 ++--
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/ECtools/backup/Makefile.am b/ECtools/backup/Makefile.am
index 0f7cace..d1cce9c 100644
--- a/ECtools/backup/Makefile.am
+++ b/ECtools/backup/Makefile.am
@@ -13,7 +13,7 @@ install-exec-local:
 	cp -a kopano_backup/version.py staging/kopano_backup/
 	cd staging/ && ${PYTHON} setup.py \
 		build --build-base="${abs_builddir}/build" \
-		install -f $${DESTDIR+--root=${DESTDIR}} \
+		install --install-layout=deb -f $${DESTDIR+--root=${DESTDIR}} \
 		--prefix ${prefix} --install-purelib ${pythondir}
 	rm -Rf build staging
 
diff --git a/ECtools/cli/Makefile.am b/ECtools/cli/Makefile.am
index eba452f..fcb145b 100644
--- a/ECtools/cli/Makefile.am
+++ b/ECtools/cli/Makefile.am
@@ -13,8 +13,8 @@ install-exec-local:
 	cp -a kopano_cli/version.py staging/kopano_cli/
 	cd staging/ && ${PYTHON} setup.py \
 		build --build-base="${abs_builddir}/build" \
-		install -f $${DESTDIR+--root=${DESTDIR}} \
-		--prefix ${prefix} --install-purelib ${pythondir}
+		install --install-layout=deb -f $${DESTDIR+--root=${DESTDIR}} \
+		${NULL}
 	rm -Rf build
 
 uninstall-local:
diff --git a/ECtools/migration-pst/Makefile.am b/ECtools/migration-pst/Makefile.am
index f728cf8..cb0aa85 100644
--- a/ECtools/migration-pst/Makefile.am
+++ b/ECtools/migration-pst/Makefile.am
@@ -14,8 +14,8 @@ install-exec-local:
 	cp -a kopano_migration_pst/version.py staging/kopano_migration_pst/
 	cd staging/ && ${PYTHON} setup.py \
 		build --build-base="${abs_builddir}/build" \
-		install -f $${DESTDIR+--root=${DESTDIR}} \
-		--prefix ${prefix} --install-purelib ${pythondir}
+		install --install-layout=deb -f $${DESTDIR+--root=${DESTDIR}} \
+		${NULL}
 	rm -Rf build
 
 uninstall-local:
diff --git a/ECtools/presence/Makefile.am b/ECtools/presence/Makefile.am
index 2a7ed50..b4d9771 100644
--- a/ECtools/presence/Makefile.am
+++ b/ECtools/presence/Makefile.am
@@ -16,8 +16,8 @@ install-exec-local:
 	cp -a kopano_presence/version.py staging/kopano_presence/
 	cd staging/ && ${PYTHON} setup.py \
 		build --build-base="${abs_builddir}/build" \
-		install -f $${DESTDIR+--root=${DESTDIR}} \
-		--prefix="${prefix}" --install-purelib ${pythondir}
+		install --install-layout=deb -f $${DESTDIR+--root=${DESTDIR}} \
+		${NULL}
 	rm -Rf build
 
 uninstall-local:
diff --git a/ECtools/rest/Makefile.am b/ECtools/rest/Makefile.am
index 57126ba..2df5808 100644
--- a/ECtools/rest/Makefile.am
+++ b/ECtools/rest/Makefile.am
@@ -32,8 +32,8 @@ install-exec-local:
 	cp -a kopano_rest/version.py staging/kopano_rest/
 	cd staging/ && ${PYTHON} setup.py \
 		build --build-base="${abs_builddir}/build" \
-		install -f $${DESTDIR+--root=${DESTDIR}} \
-		--prefix ${prefix} --install-purelib ${pythondir}
+		install --install-layout=deb -f $${DESTDIR+--root=${DESTDIR}} \
+		${NULL}
 	rm -Rf build
 
 uninstall-local:
diff --git a/ECtools/search/Makefile.am b/ECtools/search/Makefile.am
index 4ec4be0..3487dec 100644
--- a/ECtools/search/Makefile.am
+++ b/ECtools/search/Makefile.am
@@ -16,8 +16,8 @@ install-exec-local:
 	cp -a kopano_search/version.py staging/kopano_search/
 	cd staging/ && ${PYTHON} setup.py \
 		build --build-base="${abs_builddir}/build" \
-		install -f $${DESTDIR+--root=${DESTDIR}} \
-		--prefix="${prefix}" --install-purelib ${pythondir}
+		install --install-layout=deb -f $${DESTDIR+--root=${DESTDIR}} \
+		${NULL}
 	rm -Rf build
 
 install-data-local:
diff --git a/ECtools/spamd/Makefile.am b/ECtools/spamd/Makefile.am
index bdedbdd..3d0bc5f 100644
--- a/ECtools/spamd/Makefile.am
+++ b/ECtools/spamd/Makefile.am
@@ -13,8 +13,8 @@ install-exec-local:
 	cp -a kopano_spamd/version.py staging/kopano_spamd/
 	cd staging/ && ${PYTHON} setup.py \
 		build --build-base="${abs_builddir}/build" \
-		install -f $${DESTDIR+--root=${DESTDIR}} \
-		--prefix ${prefix} --install-purelib ${pythondir}
+		install --install-layout=deb -f $${DESTDIR+--root=${DESTDIR}} \
+		${NULL}
 	rm -Rf build staging
 
 uninstall-local:
diff --git a/ECtools/utils/Makefile.am b/ECtools/utils/Makefile.am
index f280a10..8696bcc 100644
--- a/ECtools/utils/Makefile.am
+++ b/ECtools/utils/Makefile.am
@@ -16,8 +16,8 @@ install-exec-local:
 	cp -a kopano_utils/version.py staging/kopano_utils/
 	cd staging/ && ${PYTHON} setup.py \
 		build --build-base="${abs_builddir}/build" \
-		install -f $${DESTDIR+--root=${DESTDIR}} \
-		--prefix ${prefix} --install-purelib ${pythondir}
+		install --install-layout=deb -f $${DESTDIR+--root=${DESTDIR}} \
+		${NULL}
 	rm -Rf build staging
 
 uninstall-local:
diff --git a/swig/python/Makefile.am b/swig/python/Makefile.am
index 682a4bf..6a16be7 100644
--- a/swig/python/Makefile.am
+++ b/swig/python/Makefile.am
@@ -174,8 +174,8 @@ install-exec-local:
 	cp -a MAPI/version.py staging/MAPI/
 	cd staging/ && ${PYTHON} setup.py \
 		build --build-base="${abs_builddir}/build" \
-		install -f $${DESTDIR+--root=${DESTDIR}} \
-		--prefix="${prefix}" --install-purelib ${pythondir}
+		install --install-layout=deb -f $${DESTDIR+--root=${DESTDIR}} \
+		${NULL}
 	rm -Rf build
 
 uninstall-local:
diff --git a/swig/python/kopano/Makefile.am b/swig/python/kopano/Makefile.am
index 6524cfb..88fd804 100644
--- a/swig/python/kopano/Makefile.am
+++ b/swig/python/kopano/Makefile.am
@@ -16,8 +16,8 @@ install-exec-local:
 	cp -a kopano/version.py staging/kopano/
 	cd staging/ && ${PYTHON} setup.py \
 		build --build-base="${abs_builddir}/build" \
-		install -f $${DESTDIR+--root=${DESTDIR}} \
-		--prefix="${prefix}" --install-purelib ${pythondir}
+		install --install-layout=deb -f $${DESTDIR+--root=${DESTDIR}} \
+		${NULL}
 	rm -Rf build staging
 
 uninstall-local:
diff --git a/swig/python/zarafa/Makefile.am b/swig/python/zarafa/Makefile.am
index bb21352..48984da 100644
--- a/swig/python/zarafa/Makefile.am
+++ b/swig/python/zarafa/Makefile.am
@@ -3,8 +3,8 @@ EXTRA_DIST = setup.py zarafa/__init__.py
 install-exec-local:
 	cd ${srcdir} && ${PYTHON} setup.py \
 		build --build-base="${abs_builddir}/build" \
-		install -f $${DESTDIR+--root=${DESTDIR}} \
-		--prefix="${prefix}" --install-purelib ${pythondir}
+		install --install-layout=deb -f $${DESTDIR+--root=${DESTDIR}} \
+		${NULL}
 	rm -Rf build
 
 uninstall-local: