changeset 468:57fdb9874bcb v1.0-linuxbuild

Merge
author Chris Cannam
date Mon, 13 Apr 2015 15:42:02 +0100
parents 9d2d99ae7b57 (current diff) 56cf3c9982a1 (diff)
children 7a5e47d2f0eb
files
diffstat 3 files changed, 5 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/deploy/linux/deb-skeleton/usr/share/doc/tony/copyright	Mon Apr 13 15:41:38 2015 +0100
+++ b/deploy/linux/deb-skeleton/usr/share/doc/tony/copyright	Mon Apr 13 15:42:02 2015 +0100
@@ -20,12 +20,6 @@
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 2 of the License, or (at
-your option) any later version.
+your option) any later version. See the file /usr/share/common-licenses/GPL-2 
+for more information.
 
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A ARTICULAR PURPOSE. See the GNU
-General Public License for more details. You should have received a
-copy of the GNU General Public License along with this program. If
-not, see http://www.gnu.org/licenses/.
-
--- a/deploy/linux/deploy-deb.sh	Mon Apr 13 15:41:38 2015 +0100
+++ b/deploy/linux/deploy-deb.sh	Mon Apr 13 15:42:02 2015 +0100
@@ -15,8 +15,6 @@
     exit 2
 }
 
-set -u
-
 version="$1"
 arch="$2"
 
@@ -24,6 +22,8 @@
     usage
 fi
 
+set -u
+
 program=tony
 plugins="chp pyin"
 
--- a/deploy/linux/fix-lintian-bits.sh	Mon Apr 13 15:41:38 2015 +0100
+++ b/deploy/linux/fix-lintian-bits.sh	Mon Apr 13 15:42:02 2015 +0100
@@ -5,6 +5,7 @@
 [ -d "$dir" ] || exit 1
 
 strip "$dir"/usr/bin/*
+strip "$dir"/usr/lib/*/*.so
 
 sz=`du -sx --exclude DEBIAN "$dir" | awk '{ print $1; }'`
 perl -i -p -e "s/Installed-Size: .*/Installed-Size: $sz/" "$dir"/DEBIAN/control