From b659d83239b93d0ba0ec108b4feac5c6447541af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Maila=CC=88nder?= Date: Sun, 10 Nov 2013 12:49:19 +0100 Subject: [PATCH] Fix debian package and packaging. --- packaging/linux/deb/buildpackage.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packaging/linux/deb/buildpackage.sh b/packaging/linux/deb/buildpackage.sh index 7475e4fb7d..561a1ee795 100755 --- a/packaging/linux/deb/buildpackage.sh +++ b/packaging/linux/deb/buildpackage.sh @@ -21,10 +21,12 @@ cp -R $rootdir/usr root # Binaries go in /usr/games mv root/usr/bin/ root/usr/games/ -sed "s/\/usr\/bin\//\/usr\/games\//" root/usr/games/openra > temp +sed "s|/usr/bin|/usr/games|g" root/usr/games/openra > temp mv temp root/usr/games/openra -sed "s/\/usr\/bin\//\/usr\/games\//" root/usr/games/openra-editor > temp +chmod +x root/usr/games/openra +sed "s|/usr/bin|/usr/games|g" root/usr/games/openra-editor > temp mv temp root/usr/games/openra-editor +chmod +x root/usr/games/openra-editor # Put the copyright and changelog in /usr/share/doc/openra/ mkdir -p root/usr/share/doc/openra/ @@ -43,8 +45,8 @@ sed "s/{VERSION}/$VERSION/" DEBIAN/control | sed "s/{SIZE}/$PACKAGE_SIZE/" > roo # Build it in the temp directory, but place the finished deb in our starting directory pushd root -# Calculate md5sums and clean up the /usr/ part of them -md5sum "`find . -type f | grep -v '^[.]/DEBIAN/'` | sed 's/\.\/usr\//usr\//g'" > DEBIAN/md5sums +# Calculate md5sums and clean up the ./usr/ part of them +find . -type f -not -path "./DEBIAN/*" -print0 | xargs -0 -n1 md5sum | sed 's|\./usr/|/usr/|' > DEBIAN/md5sums chmod 0644 DEBIAN/md5sums # Replace any dashes in the version string with periods