Merge branch 'master' of http://github.com/netblue30/firejail

3 files changed, 3 insertions, 13 deletions

diff --git a/etc/gwenview.profile b/etc/gwenview.profile
index bb67bc933..76b77ef1c 100644
--- a/etc/gwenview.profile
+++ b/etc/gwenview.profile
@@ -34,7 +34,7 @@ seccomp
 shell none
 tracelog
 
-private-bin gwenview,kbuildsycoca4,gimp,gimp-2.*
+private-bin gwenview,kbuildsycoca4,gimp*
 private-dev
 # private-etc X11
 
diff --git a/etc/scribus.profile b/etc/scribus.profile
index dbb83bc09..e07caffe5 100644
--- a/etc/scribus.profile
+++ b/etc/scribus.profile
@@ -42,6 +42,6 @@ seccomp
 shell none
 tracelog
 
-# private-bin scribus,gs,gimp,gimp-2.*
+# private-bin scribus,gs,gimp*
 private-dev
 private-tmp
diff --git a/mkdeb.sh b/mkdeb.sh
index 691ea71c9..3db62564d 100755
--- a/mkdeb.sh
+++ b/mkdeb.sh
@@ -44,16 +44,6 @@ find $INSTALL_DIR  -type d | xargs chmod 755
 cd $CODE_DIR
 fakeroot dpkg-deb --build debian
 lintian --no-tag-display-limit debian.deb
-arch=$( getconf LONG_BIT )
-if [ $arch = 64 ]
-then
-        mv debian.deb ../firejail_$2_1_amd64.deb
-elif [ $arch = 32 ]
-then
-        mv debian.deb ../firejail_$2_1_i386.deb
-# Fallback to 64-bit package.
-else
-        mv debian.deb ../firejail_$2_1_amd64.deb
-fi
+mv debian.deb ../firejail_$2_1_$(dpkg-architecture -qDEB_HOST_ARCH).deb
 cd ..
 rm -fr $CODE_DIR