[debhelper-devel] [debhelper] 06/06: Alternative installation dirs for flatpak

[Niels Thykier]

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

nthykier pushed a commit to branch experimental/flatpak-support
in repository debhelper.

commit 4912b0f2631f6234b0b369040d3c8e5ad311490e
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Nov 28 13:33:48 2017 +0000

    Alternative installation dirs for flatpak
---
 lib/Debian/Debhelper/Dh_Lib.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/Debian/Debhelper/Dh_Lib.pm b/lib/Debian/Debhelper/Dh_Lib.pm
index 97a813a..b2b4885 100644
--- a/lib/Debian/Debhelper/Dh_Lib.pm
+++ b/lib/Debian/Debhelper/Dh_Lib.pm
@@ -2275,6 +2275,12 @@ sub dbgsym_tmpdir {
 			 'dh_docrootdir' => '${datarootdir}/doc', # Not from autotols (made up to support debhelper)
 			 #	'docdir'        => '${dh_docroot}/${package}' # debhelper assumes docdir is a direct subdir of dh_docdir
 		);
+		if (is_build_profile_active('pkg.flatpak.app')) {
+			# Flatpak mode; prefix is /app, merge bin and sbin dirs, etc.
+			$INSTALLATION_DIRECTORIES{'prefix'} = '/app';
+			$INSTALLATION_DIRECTORIES{'sysconfdir'} = '${prefix}/etc';
+			$INSTALLATION_DIRECTORIES{'sbindir'} = $INSTALLATION_DIRECTORIES{'bindir'};
+		}
 	}
 
 	sub get_installation_directory {

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