rev 11340 - in trunk/packages/kdesdk/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-07-06 16:10:28 +0000 (Sun, 06 Jul 2008)
New Revision: 11340

Added:
   trunk/packages/kdesdk/debian/patches/12_fix_bashism_486038.diff
   trunk/packages/kdesdk/debian/patches/12_fix_bashisms_464999.patch
Modified:
   trunk/packages/kdesdk/debian/changelog
Log:
fix bashims


Modified: trunk/packages/kdesdk/debian/changelog
===================================================================
--- trunk/packages/kdesdk/debian/changelog	2008-07-06 16:06:14 UTC (rev 11339)
+++ trunk/packages/kdesdk/debian/changelog	2008-07-06 16:10:28 UTC (rev 11340)
@@ -4,8 +4,10 @@
     - Translation and updates in desktop files.
   * Update lintian overrides.
   * Update section in doc-base files.
+  * Fix bashishs, thanks to Vincent Zweije and Peter Eisentraut for patches.
+    (Closes: #486038, #464999)
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Sat, 28 Jun 2008 18:05:59 +0200
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Sun, 06 Jul 2008 18:18:39 +0200
 
 kdesdk (4:3.5.9-1) unstable; urgency=low
 

Added: trunk/packages/kdesdk/debian/patches/12_fix_bashism_486038.diff
===================================================================
--- trunk/packages/kdesdk/debian/patches/12_fix_bashism_486038.diff	                        (rev 0)
+++ trunk/packages/kdesdk/debian/patches/12_fix_bashism_486038.diff	2008-07-06 16:10:28 UTC (rev 11340)
@@ -0,0 +1,33 @@
+tag 486038 patch
+thanks
+
+On Thu, Jun 12, 2008 at 10:59:22PM -0500, Raphael Geissert wrote:
+
+||  While performing an archive wide checkbashisms (from the 'devscripts' package)
+||  check I've found your package containing one or more /bin/sh scripts making
+||  use of bashisms.
+||
+||  checkbashisms' output:
+||  > possible bashism in ./usr/bin/build-progress.sh line 8 (echo -e):
+||  >   echo -ne "\033]0;$1\007"
+
+The following patch should fix this problem:
+
+Only in kdesdk-3.5.5: debian
+diff -rud kdesdk-3.5.5.orig/scripts/build-progress.sh kdesdk-3.5.5/scripts/build-progress.sh
+--- kdesdk-3.5.5.orig/scripts/build-progress.sh	2005-09-10 10:21:03.000000000 +0200
++++ kdesdk-3.5.5/scripts/build-progress.sh	2008-06-15 13:29:28.000000000 +0200
+@@ -5,7 +5,7 @@
+ # <malte at kde.org> for the code :-)
+ set_title() {
+ if ([ "$TERM" = "xterm" ] || [ "$TERM" = "xterm-color" ] || [ "$TERM" = "screen" ]) && tty -s; then
+-  echo -ne "\033]0;$1\007"
++  printf '\033]0;%s\007' "$1"
+ fi
+ }
+ . ./kde-buildrc
+
+Ciao. Vincent.
+
+
+

Added: trunk/packages/kdesdk/debian/patches/12_fix_bashisms_464999.patch
===================================================================
--- trunk/packages/kdesdk/debian/patches/12_fix_bashisms_464999.patch	                        (rev 0)
+++ trunk/packages/kdesdk/debian/patches/12_fix_bashisms_464999.patch	2008-07-06 16:10:28 UTC (rev 11340)
@@ -0,0 +1,38 @@
+diff -Nru --exclude .svn /tmp/N672PlWfpN/kdesdk-3.5.9/scripts/adddebug /tmp/yr5pFI1Stg/kdesdk-3.5.9/scripts/adddebug
+--- kdesdk-3.5.9/scripts/adddebug	2005-09-10 10:21:02.000000000 +0200
++++ kdesdk-3.5.9/scripts/adddebug	2008-04-04 16:36:01.000000000 +0200
+@@ -10,7 +10,12 @@
+     -k) keep=1;;
+     -r) mxdp=;;
+     -n) ndebug=1;;
+-    *) echo -e "Usage: adddebug [-k] [-r] [-n]\n  -k: keep optimizations (removed by default)\n  -r: recursive (process all subdirectories)\n  -n: compile without NDEBUG and NO_DEBUG being defined (makes kdDebug calls work)"; exit 1;;
++    *) echo "\
++Usage: adddebug [-k] [-r] [-n]
++  -k: keep optimizations (removed by default)
++  -r: recursive (process all subdirectories)
++  -n: compile without NDEBUG and NO_DEBUG being defined (makes kdDebug calls work)"
++       exit 1;;
+   esac
+ done
+ 
+diff -Nru --exclude .svn /tmp/N672PlWfpN/kdesdk-3.5.9/scripts/create_svnignore /tmp/yr5pFI1Stg/kdesdk-3.5.9/scripts/create_svnignore
+--- kdesdk-3.5.9/scripts/create_svnignore	2006-05-22 20:08:05.000000000 +0200
++++ kdesdk-3.5.9/scripts/create_svnignore	2008-04-04 16:36:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#! /usr/bin/env bash
+ # This script makes a preliminary svn:ignore in the current dir by
+ # adding some standard stuff according to Makefile.am.
+ # License: GPL
+diff -Nru --exclude .svn /tmp/N672PlWfpN/kdesdk-3.5.9/scripts/svnaddcurrentdir /tmp/yr5pFI1Stg/kdesdk-3.5.9/scripts/svnaddcurrentdir
+--- kdesdk-3.5.9/scripts/svnaddcurrentdir	2005-09-10 10:21:02.000000000 +0200
++++ kdesdk-3.5.9/scripts/svnaddcurrentdir	2008-04-04 16:36:01.000000000 +0200
+@@ -17,7 +17,7 @@
+ echo
+ read -p "Add file $file to SVN ? (y/n) " answer rest
+ #if [ "$answer" != "y" ]; then echo $file; fi
+-if [ "$answer" == "y" ]; then svn add $file; fi
++if [ "$answer" = "y" ]; then svn add $file; fi
+ }
+ 
+