Package: apparmor / 2.13.4-3

debian/libapparmor-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
From: Jamie Strandboge <jamie@canonical.com>
Date: Mon, 29 Jan 2018 12:26:43 +0000
Subject: always install python modules in the proper location when creating

deb files
Forwarded: no (Debian/Ubuntu specific)
---
 libraries/libapparmor/swig/python/Makefile.am | 2 +-
 utils/Makefile                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/libapparmor/swig/python/Makefile.am b/libraries/libapparmor/swig/python/Makefile.am
index 421acba..3326edb 100644
--- a/libraries/libapparmor/swig/python/Makefile.am
+++ b/libraries/libapparmor/swig/python/Makefile.am
@@ -14,7 +14,7 @@ all-local: libapparmor_wrap.c setup.py
 	$(PYTHON) setup.py build
 
 install-exec-local:
-	$(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)"
+	$(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)" --install-layout=deb
 
 clean-local:
 	if test -x "$(PYTHON)"; then $(PYTHON) setup.py clean; fi
diff --git a/utils/Makefile b/utils/Makefile
index ea9e060..34eea3a 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -60,7 +60,7 @@ install: ${MANPAGES} ${HTMLMANPAGES}
 	$(MAKE) install_manpages DESTDIR=${DESTDIR}
 	$(MAKE) -C vim install DESTDIR=${DESTDIR}
 	ln -sf aa-status.8 ${DESTDIR}/${MANDIR}/man8/apparmor_status.8
-	${PYTHON} ${PYSETUP} install --prefix=${PYPREFIX} --root=${DESTDIR} --version=${VERSION}
+	${PYTHON} ${PYSETUP} install --prefix=${PYPREFIX} --root=${DESTDIR} --install-layout=deb --version=${VERSION}
 
 .PHONY: clean
 ifndef VERBOSE