aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml4
-rwxr-xr-xmkdeb.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 0484f0d4d..c168890c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,10 +5,10 @@ sudo: true
5script: 5script:
6 - sudo apt-get -y install expect csh xzdec lintian fakeroot 6 - sudo apt-get -y install expect csh xzdec lintian fakeroot
7 # Build Debian package 7 # Build Debian package
8 - ( cd firejail; ./configure --prefix=/usr --enable-git-install && make deb && sudo dpkg -i firejail*.deb ) 8 - ( cd firejail; ./configure --prefix=/usr && make deb && sudo dpkg -i firejail*.deb )
9 # Remove Debian package 9 # Remove Debian package
10 - ( sudo dpkg -P firejail ) 10 - ( sudo dpkg -P firejail )
11 - ( cd firejail ; ./configure --prefix=/usr --enable-git-install && make && sudo make install && make test-travis ) 11 - ( cd firejail ; ./configure --prefix=/usr && make && sudo make install && make test-travis )
12 - ( cd firejail ; sudo make install-strip DESTDIR=$(readlink -f appdir) ) 12 - ( cd firejail ; sudo make install-strip DESTDIR=$(readlink -f appdir) )
13 # If successful, build release tarball 13 # If successful, build release tarball
14 - ( cd appdir/ ; tar cfvj ../firejail-build$TRAVIS_BUILD_NUMBER.tar.bz2 . ) 14 - ( cd appdir/ ; tar cfvj ../firejail-build$TRAVIS_BUILD_NUMBER.tar.bz2 . )
diff --git a/mkdeb.sh b/mkdeb.sh
index 1a8e2bc33..2b08377e9 100755
--- a/mkdeb.sh
+++ b/mkdeb.sh
@@ -32,12 +32,12 @@ echo "*****************************************"
32mv $INSTALL_DIR/usr/share/doc/firejail/RELNOTES $INSTALL_DIR/usr/share/doc/firejail/changelog.Debian 32mv $INSTALL_DIR/usr/share/doc/firejail/RELNOTES $INSTALL_DIR/usr/share/doc/firejail/changelog.Debian
33gzip -9 -n $INSTALL_DIR/usr/share/doc/firejail/changelog.Debian 33gzip -9 -n $INSTALL_DIR/usr/share/doc/firejail/changelog.Debian
34rm $INSTALL_DIR/usr/share/doc/firejail/COPYING 34rm $INSTALL_DIR/usr/share/doc/firejail/COPYING
35cp platform/debian/copyright $INSTALL_DIR/usr/share/doc/firejail/. 35install -m644 platform/debian/copyright $INSTALL_DIR/usr/share/doc/firejail/.
36mkdir -p $DEBIAN_CTRL_DIR 36mkdir -p $DEBIAN_CTRL_DIR
37sed "s/FIREJAILVER/$2/g" platform/debian/control.$(dpkg-architecture -qDEB_HOST_ARCH) > $DEBIAN_CTRL_DIR/control 37sed "s/FIREJAILVER/$2/g" platform/debian/control.$(dpkg-architecture -qDEB_HOST_ARCH) > $DEBIAN_CTRL_DIR/control
38 38
39mkdir -p $INSTALL_DIR/usr/share/lintian/overrides/ 39mkdir -p $INSTALL_DIR/usr/share/lintian/overrides/
40cp platform/debian/firejail.lintian-overrides $INSTALL_DIR/usr/share/lintian/overrides/firejail 40install -m644 platform/debian/firejail.lintian-overrides $INSTALL_DIR/usr/share/lintian/overrides/firejail
41 41
42find $INSTALL_DIR/etc -type f | sed "s,^$INSTALL_DIR,," | LC_ALL=C sort > $DEBIAN_CTRL_DIR/conffiles 42find $INSTALL_DIR/etc -type f | sed "s,^$INSTALL_DIR,," | LC_ALL=C sort > $DEBIAN_CTRL_DIR/conffiles
43find $INSTALL_DIR -type d | xargs chmod 755 43find $INSTALL_DIR -type d | xargs chmod 755