# HG changeset patch # User Chris Cannam # Date 1544615061 0 # Node ID 87d4237226564ecf6b00eeb2b05b45f7cd5b9c74 # Parent 2d7be0113a8509c8c9f703affb3a6bb03c46afe0 Further deb packaging fixes, including undoing the last change, which appears to be not permitted diff -r 2d7be0113a85 -r 87d423722656 COPYING --- a/COPYING Wed Dec 12 11:33:52 2018 +0000 +++ b/COPYING Wed Dec 12 11:44:21 2018 +0000 @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff -r 2d7be0113a85 -r 87d423722656 README.txt --- a/README.txt Wed Dec 12 11:33:52 2018 +0000 +++ b/README.txt Wed Dec 12 11:44:21 2018 +0000 @@ -45,7 +45,3 @@ Copyright 2010 Jari Korhonen Copyright 2010-2013 Chris Cannam Copyright 2010-2018 Queen Mary, University of London - - - - diff -r 2d7be0113a85 -r 87d423722656 deploy/linux/control --- a/deploy/linux/control Wed Dec 12 11:33:52 2018 +0000 +++ b/deploy/linux/control Wed Dec 12 11:44:21 2018 +0000 @@ -1,4 +1,4 @@ -Package: EasyMercurial +Package: easymercurial Priority: optional Maintainer: Chris Cannam Architecture: ### diff -r 2d7be0113a85 -r 87d423722656 deploy/linux/deploy-deb.sh --- a/deploy/linux/deploy-deb.sh Wed Dec 12 11:33:52 2018 +0000 +++ b/deploy/linux/deploy-deb.sh Wed Dec 12 11:44:21 2018 +0000 @@ -23,9 +23,10 @@ set -eu program=EasyMercurial +package=easymercurial depdir=deploy/linux -targetdir="${program}_${version}_${arch}" +targetdir="${package}_${version}_${arch}" echo "Target dir is $targetdir" @@ -40,17 +41,23 @@ cp "$depdir"/control "$targetdir"/DEBIAN/ -mkdir -p "$targetdir"/usr/bin "$targetdir"/usr/share/pixmaps "$targetdir"/usr/share/applications "$targetdir"/usr/share/doc/"$program" +mkdir -p "$targetdir"/usr/bin "$targetdir"/usr/share/pixmaps "$targetdir"/usr/share/applications "$targetdir"/usr/share/doc/"$package" cp "$program" "$targetdir"/usr/bin/ cp images/icon/scalable/easyhg-icon.svg "$targetdir"/usr/share/pixmaps/ cp images/icon/128/easyhg-icon.png "$targetdir"/usr/share/pixmaps/ -cp deploy/linux/"$program".desktop "$targetdir"/usr/share/applications/ -cp README.txt "$targetdir"/usr/share/doc/"$program"/ -cp COPYING "$targetdir"/usr/share/doc/"$program"/copyright -touch "$targetdir"/usr/share/doc/"$program"/changelog.Debian -gzip "$targetdir"/usr/share/doc/"$program"/changelog.Debian +cp deploy/linux/"$program".desktop "$targetdir"/usr/share/applications/"$package".desktop +cp README.txt "$targetdir"/usr/share/doc/"$package"/ +cat > "$targetdir"/usr/share/doc/"$package"/copyright <