From 579dddb1fe946aa78e545bf0882b2323b91d45ae Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Mon, 5 Oct 2009 00:08:20 +0300 Subject: [PATCH] Fixes a couple issues with scripts from Modules/ and Templates/ The first hunk fixes permissions of Modules/SquishRunTestCase.sh script. INSTALL() used to remove executable permissions. The second hunk adds #!/bin/sh to the top of the script Templates/cygwin-package.sh.in. All executable interpreted scripts should have this directive. --- debian/changelog | 2 ++ debian/patches/scripts-and-permissions.diff | 29 +++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 32 insertions(+) create mode 100644 debian/patches/scripts-and-permissions.diff diff --git a/debian/changelog b/debian/changelog index 14c266cc2..c4e1af105 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ cmake (2.8.0~rc2-0r2) UNRELEASED; urgency=low problems. * Add desktop-remove-deprecated.diff - remove deprecated Enconding field from CMake.desktop. + * Add scripts-and-permissions.diff - fixes a couple issues with scripts + from Modules/ and Templates/ (thanks to lintian). -- Modestas Vainius Sun, 04 Oct 2009 10:31:17 +0300 diff --git a/debian/patches/scripts-and-permissions.diff b/debian/patches/scripts-and-permissions.diff new file mode 100644 index 000000000..d28e2a890 --- /dev/null +++ b/debian/patches/scripts-and-permissions.diff @@ -0,0 +1,29 @@ +From: Modestas Vainius +Subject: Fix scripts and their permissions in Modules/ and Templates/ + The first hunk fixes permissions of Modules/SquishRunTestCase.sh script. + INSTALL() used to remove executable permissions. + . + The second hunk adds #!/bin/sh to the top of the script + Templates/cygwin-package.sh.in. All executable interpreted scripts + should have this directive. +Forwarded: yes. + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -460,7 +460,7 @@ + DIRECTORY_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE +- PATTERN "*.sh.in" PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE ++ PATTERN "*.sh*" PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + PATTERN "CVS" EXCLUDE +--- a/Templates/cygwin-package.sh.in ++++ b/Templates/cygwin-package.sh.in +@@ -1,3 +1,5 @@ ++#!/bin/sh ++ + # this is a sample shell script used for building a cmake + # based project for a cygwin setup package. + diff --git a/debian/patches/series b/debian/patches/series index f47f1bcbc..7d0502af3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ executables-dont-need-fpic.diff fix_bashisms.diff manpage_friendly_docs.diff desktop-remove-deprecated.diff +scripts-and-permissions.diff