[SCM] lives packaging branch, master, updated. debian/1.3.3-2-20-g553193b

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 553193bddf7639ed957fd8a17c04304457b40c5d
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jul 6 08:45:29 2010 +0200

    Remove pgrep_pkill_remove.diff.

diff --git a/debian/patches/pgrep_pkill_remove.diff b/debian/patches/pgrep_pkill_remove.diff
deleted file mode 100644
index e948ff5..0000000
--- a/debian/patches/pgrep_pkill_remove.diff
+++ /dev/null
@@ -1,133 +0,0 @@
-Description: This patch removes the pgrep and pkill checks in ./configure.in as they are only runtime dependencies.
-Author: Harry Rickards <hrickards at l33tmyst.com>
----
- configure.in	|   12 ++++++++++++
- configure	|   94 ----------------------------------------------------------------------------------------------
- 1 file changed, 0 insertions(+), 106 deletions(-)
-
---- lives.orig/configure.in
-+++ lives/configure.in
-@@ -109,18 +109,6 @@
- AC_PATH_PROGS(PERL, perl perl5)
- 
- 
--# Check for pgrep
--AC_PATH_PROG(PGREP, pgrep, no)
--if test $PGREP = no; then
--   AC_MSG_ERROR([Cannot find pgrep, make sure it is installed and in your PATH])
--fi
--
--# Check for pkg-config
--AC_PATH_PROG(PKILL, pkill, no)
--if test $PKILL = no; then
--   AC_MSG_ERROR([Cannot find pkill, make sure it is installed and in your PATH])
--fi
--
- # Check for pkg-config
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- if test $PKG_CONFIG = no; then
-
---- lives.orig/configure
-+++ lives/configure
-@@ -18769,100 +18769,6 @@
-   test -n "$PERL" && break
- done
- 
--
--
--# Check for pgrep
--# Extract the first word of "pgrep", so it can be a program name with args.
--set dummy pgrep; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PGREP+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  case $PGREP in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_PGREP="$PGREP" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_PGREP="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--  test -z "$ac_cv_path_PGREP" && ac_cv_path_PGREP="no"
--  ;;
--esac
--fi
--PGREP=$ac_cv_path_PGREP
--if test -n "$PGREP"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PGREP" >&5
--$as_echo "$PGREP" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--if test $PGREP = no; then
--   as_fn_error "Cannot find pgrep, make sure it is installed and in your PATH" "$LINENO" 5
--fi
--
--# Check for pkg-config
--# Extract the first word of "pkill", so it can be a program name with args.
--set dummy pkill; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKILL+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  case $PKILL in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_PKILL="$PKILL" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_PKILL="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--  test -z "$ac_cv_path_PKILL" && ac_cv_path_PKILL="no"
--  ;;
--esac
--fi
--PKILL=$ac_cv_path_PKILL
--if test -n "$PKILL"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKILL" >&5
--$as_echo "$PKILL" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--if test $PKILL = no; then
--   as_fn_error "Cannot find pkill, make sure it is installed and in your PATH" "$LINENO" 5
--fi
--
- # Check for pkg-config
- # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
-

-- 
lives packaging