[ioquake3] 02/03: Skip dh_apparmor when built with profile pkg.flatpak.app

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 1bbf33d8c92ab5f3b68791710c963f271483b968
Author: Simon McVittie <smcv at collabora.com>
Date:   Thu Jul 27 18:44:42 2017 +0100

    Skip dh_apparmor when built with profile pkg.flatpak.app
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/rules     | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 44fd4bc..4d1a9c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ioquake3 (1.36+u20170908+dfsg1-2) UNRELEASED; urgency=medium
   * Don't set DEFAULT_BASEDIR. This makes ioquake3 set it at runtime
     from argv[0], making it relocatable, which is useful when building
     it into a Flatpak app.
+  * Skip dh_apparmor when built with profile pkg.flatpak.app
 
  -- Simon McVittie <smcv at debian.org>  Fri, 08 Sep 2017 14:27:35 +0100
 
diff --git a/debian/control b/debian/control
index 2a84b82..a34a897 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
  Simon McVittie <smcv at debian.org>,
 Build-Depends:
  debhelper (>= 10),
- dh-apparmor [linux-any],
+ dh-apparmor [linux-any] <!pkg.flatpak.app>,
  dpkg-dev (>= 1.16.1),
  libcurl4-gnutls-dev,
  libjpeg-dev,
diff --git a/debian/rules b/debian/rules
index b29ee9b..9da3fc9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,12 +74,14 @@ override_dh_auto_install:
 	cd $(DESTDIR)/usr/lib/quake3/ta/baseq3 && ln -s ../../../ioquake3/baseq3/*.so .
 	cd $(DESTDIR)/usr/lib/quake3/ta/missionpack && ln -s ../../../ioquake3/missionpack/*.so .
 
+ifeq ($(filter pkg.flatpak.app,$(DEB_BUILD_PROFILES)),)
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 override_dh_install-arch:
 	dh_install -a
 	dh_apparmor -pioquake3 --profile-name=usr.lib.ioquake3.ioquake3
 	dh_apparmor -pioquake3-server --profile-name=usr.lib.ioquake3.ioq3ded
 endif
+endif
 
 override_dh_strip:
 	dh_strip --ddeb-migration='ioquake3-dbg (<< 1.36+u20160914+dfsg1-1~)'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git