--- kino-1.3.4.orig/configure
+++ kino-1.3.4/configure
@@ -1,13 +1,15 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for kino 1.3.4.
+# Generated by GNU Autoconf 2.67 for kino 1.3.4.
 #
 # Report bugs to <http://sourceforge.net/tracker/?group_id=14103&atid=114103>.
 #
+#
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 # Foundation, Inc.
 #
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -318,7 +320,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -358,19 +360,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -677,10 +679,11 @@
 
 
 
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -1057,8 +1060,9 @@
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1103,7 +1107,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1129,7 +1133,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1333,7 +1337,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1349,7 +1353,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1379,8 +1383,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1388,7 +1392,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1406,13 +1410,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1435,7 +1439,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1449,8 +1453,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1465,9 +1469,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1506,11 +1510,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1550,7 +1554,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1656,7 +1660,7 @@
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
@@ -1769,9 +1773,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 kino configure 1.3.4
-generated by GNU Autoconf 2.64
+generated by GNU Autoconf 2.67
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1816,7 +1820,7 @@
 	ac_retval=1
 fi
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
 
@@ -1854,7 +1858,7 @@
 	ac_retval=1
 fi
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_compile
 
@@ -1900,7 +1904,7 @@
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
 
@@ -1913,7 +1917,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1956,7 +1960,7 @@
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
+  test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -1968,7 +1972,7 @@
     ac_retval=1
 fi
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
 
@@ -2010,7 +2014,7 @@
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
 
@@ -2022,7 +2026,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2102,7 +2106,7 @@
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
+  test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -2114,7 +2118,7 @@
     ac_retval=1
 fi
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_cpp
 
@@ -2160,7 +2164,7 @@
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_link
 
@@ -2172,10 +2176,10 @@
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  if eval "test \"\${$3+set}\"" = set; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -2211,7 +2215,7 @@
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -2234,17 +2238,15 @@
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( cat <<\_ASBOX
-## ------------------------------------------------------------------------- ##
+( $as_echo "## ------------------------------------------------------------------------- ##
 ## Report this to http://sourceforge.net/tracker/?group_id=14103&atid=114103 ##
-## ------------------------------------------------------------------------- ##
-_ASBOX
+## ------------------------------------------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -2261,7 +2263,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by kino $as_me 1.3.4, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
 
@@ -2371,11 +2373,9 @@
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2409,11 +2409,9 @@
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -2426,11 +2424,9 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -2444,11 +2440,9 @@
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -2503,7 +2497,12 @@
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -2514,18 +2513,22 @@
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5 ; }
   fi
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
@@ -2594,7 +2597,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2612,16 +2615,22 @@
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2737,11 +2746,11 @@
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -2763,7 +2772,7 @@
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" "$LINENO" 5
    fi
 
@@ -2773,7 +2782,7 @@
    # Ok.
    :
 else
-   as_fn_error "newly created file is older than distributed files!
+   as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -2945,6 +2954,7 @@
 
 fi
 
+  test -d ./--version && rmdir ./--version
   if test "${ac_cv_path_mkdir+set}" = set; then
     MKDIR_P="$ac_cv_path_mkdir -p"
   else
@@ -2952,7 +2962,6 @@
     # value for MKDIR_P within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
@@ -3011,7 +3020,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -3019,7 +3028,7 @@
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -3053,7 +3062,7 @@
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -3438,8 +3447,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5 ; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3460,32 +3469,30 @@
 ... rest of stderr output deleted ...
          10q' conftest.err >conftest.er1
     cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
   fi
+  rm -f conftest.er1 conftest.err
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+
 int
 main ()
 {
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
@@ -3547,62 +3554,28 @@
 else
   ac_file=''
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then :
-  $as_echo "$as_me: failed program was:" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5 ; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
@@ -3632,16 +3605,75 @@
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
-rm -f conftest$ac_cv_exeext
+rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5 ; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then :
@@ -3684,8 +3716,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -4224,8 +4256,8 @@
 ... rest of stderr output deleted ...
          10q' conftest.err >conftest.er1
     cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
   fi
+  rm -f conftest.er1 conftest.err
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
@@ -4778,8 +4810,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5 ; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4800,8 +4832,8 @@
 ... rest of stderr output deleted ...
          10q' conftest.err >conftest.er1
     cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
   fi
+  rm -f conftest.er1 conftest.err
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
@@ -5175,7 +5207,7 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
@@ -5186,16 +5218,16 @@
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -5220,7 +5252,7 @@
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -5228,7 +5260,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -5301,7 +5333,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_SED"; then
-    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
   fi
 else
   ac_cv_path_SED=$SED
@@ -5377,7 +5409,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
@@ -5443,7 +5475,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -5510,7 +5542,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_FGREP=$FGREP
@@ -5626,7 +5658,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -5828,13 +5860,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5831: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5863: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5834: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5866: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5837: output\"" >&5)
+  (eval echo "\"\$as_me:5869: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7040,7 +7072,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7043 "configure"' > conftest.$ac_ext
+  echo '#line 7075 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7829,7 +7861,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -7845,11 +7877,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -7888,7 +7920,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -7904,18 +7936,18 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 
 ac_ext=c
@@ -8044,8 +8076,7 @@
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -8200,8 +8231,8 @@
 ... rest of stderr output deleted ...
          10q' conftest.err >conftest.er1
     cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
   fi
+  rm -f conftest.er1 conftest.err
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
@@ -8495,7 +8526,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -8511,11 +8542,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -8554,7 +8585,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -8570,11 +8601,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
@@ -9093,11 +9124,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9096: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9127: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9100: \$? = $ac_status" >&5
+   echo "$as_me:9131: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9432,11 +9463,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9435: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9466: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9439: \$? = $ac_status" >&5
+   echo "$as_me:9470: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9537,11 +9568,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9540: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9571: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9544: \$? = $ac_status" >&5
+   echo "$as_me:9575: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9592,11 +9623,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9595: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9626: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9599: \$? = $ac_status" >&5
+   echo "$as_me:9630: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11959,7 +11990,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11962 "configure"
+#line 11993 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12055,7 +12086,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12058 "configure"
+#line 12089 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12470,7 +12501,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -14011,11 +14042,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14014: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14045: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14018: \$? = $ac_status" >&5
+   echo "$as_me:14049: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14110,11 +14141,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14113: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14144: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14117: \$? = $ac_status" >&5
+   echo "$as_me:14148: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14162,11 +14193,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14165: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14196: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14169: \$? = $ac_status" >&5
+   echo "$as_me:14200: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15132,7 +15163,7 @@
 
 case "$am__api_version" in
     1.01234)
-	as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+	as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
     ;;
     *)
     ;;
@@ -15149,7 +15180,7 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	as_fn_error "Your intltool is too old.  You need intltool  or later." "$LINENO" 5
+	as_fn_error $? "Your intltool is too old.  You need intltool  or later." "$LINENO" 5
 fi
 
 # Extract the first word of "intltool-update", so it can be a program name with args.
@@ -15273,7 +15304,7 @@
 
 
 if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
+    as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
 fi
 
   INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -15555,13 +15586,13 @@
 
 
 if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
 fi
 xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
 mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
 mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
 if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
 fi
 
 # Extract the first word of "perl", so it can be a program name with args.
@@ -15605,13 +15636,13 @@
 
 
 if test -z "$INTLTOOL_PERL"; then
-   as_fn_error "perl not found" "$LINENO" 5
+   as_fn_error $? "perl not found" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
 $as_echo_n "checking for perl >= 5.8.1... " >&6; }
 $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
 if test $? -ne 0; then
-   as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
+   as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
 else
    IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
@@ -15624,7 +15655,7 @@
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
    else
-       as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
+       as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
    fi
 fi
 
@@ -16061,8 +16092,8 @@
 
      ;; #(
    *)
-     as_fn_error "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+     as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;;
  esac
 
 
@@ -16451,7 +16482,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBDV_PKG_ERRORS" >&5
 
-	as_fn_error "Package requirements (libdv >= 0.103) were not met:
+	as_fn_error $? "Package requirements (libdv >= 0.103) were not met:
 
 $LIBDV_PKG_ERRORS
 
@@ -16465,7 +16496,7 @@
 elif test $pkg_failed = untried; then
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -16474,7 +16505,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	LIBDV_CFLAGS=$pkg_cv_LIBDV_CFLAGS
 	LIBDV_LIBS=$pkg_cv_LIBDV_LIBS
@@ -16542,7 +16573,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBRAW1394_PKG_ERRORS" >&5
 
-	as_fn_error "Package requirements (libraw1394 >= 1.0.0) were not met:
+	as_fn_error $? "Package requirements (libraw1394 >= 1.0.0) were not met:
 
 $LIBRAW1394_PKG_ERRORS
 
@@ -16556,7 +16587,7 @@
 elif test $pkg_failed = untried; then
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -16565,7 +16596,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	LIBRAW1394_CFLAGS=$pkg_cv_LIBRAW1394_CFLAGS
 	LIBRAW1394_LIBS=$pkg_cv_LIBRAW1394_LIBS
@@ -16585,7 +16616,7 @@
 if test "x$ac_cv_header_libavc1394_avc1394_h" = x""yes; then :
 
 else
-  as_fn_error "avc1394.h not found, install libavc1394-devel" "$LINENO" 5
+  as_fn_error $? "avc1394.h not found, install libavc1394-devel" "$LINENO" 5
 
 fi
 
@@ -16634,7 +16665,7 @@
   LIBS="-lavc1394 $LIBS"
 
 else
-  as_fn_error "Unable to link with libavc1394. Check that you have libavc1394 installed and that the version is 0.4.1 or newer" "$LINENO" 5
+  as_fn_error $? "Unable to link with libavc1394. Check that you have libavc1394 installed and that the version is 0.4.1 or newer" "$LINENO" 5
 
 fi
 
@@ -16642,7 +16673,7 @@
 if test "x$ac_cv_header_libavc1394_rom1394_h" = x""yes; then :
 
 else
-  as_fn_error "rom1394.h not found, install libavc1394-devel" "$LINENO" 5
+  as_fn_error $? "rom1394.h not found, install libavc1394-devel" "$LINENO" 5
 
 fi
 
@@ -16691,7 +16722,7 @@
   LIBS="-lrom1394 $LIBS"
 
 else
-  as_fn_error "Unable to link with librom1394. Check that your have librom1394 installed (usually part of libavc1394) and that the version is 0.4.1 or newer" "$LINENO" 5
+  as_fn_error $? "Unable to link with librom1394. Check that your have librom1394 installed (usually part of libavc1394) and that the version is 0.4.1 or newer" "$LINENO" 5
 
 fi
 
@@ -16740,7 +16771,7 @@
   LIBS="-lpthread $LIBS"
 
 else
-  as_fn_error "You need the pthread library to compile kino" "$LINENO" 5
+  as_fn_error $? "You need the pthread library to compile kino" "$LINENO" 5
 
 fi
 
@@ -16788,7 +16819,7 @@
   LIBS="-ldl $LIBS"
 
 else
-  as_fn_error "You need libdl to compile kino" "$LINENO" 5
+  as_fn_error $? "You need libdl to compile kino" "$LINENO" 5
 
 fi
 
@@ -16863,7 +16894,7 @@
 $as_echo "#define HAVE_DV1394 1" >>confdefs.h
 
 	else
-		as_fn_error "libiec61883 is the new, preferred Linux 1394 streaming
+		as_fn_error $? "libiec61883 is the new, preferred Linux 1394 streaming
 		interface; others are deprecated. If you must only support dv1394,
 		then you must explicitly specify it using --with-dv1394." "$LINENO" 5
 	fi
@@ -16875,7 +16906,7 @@
 $as_echo "#define HAVE_DV1394 1" >>confdefs.h
 
 	else
-		as_fn_error "libiec61883 is the new, preferred Linux 1394 streaming
+		as_fn_error $? "libiec61883 is the new, preferred Linux 1394 streaming
 		interface; others are deprecated. If you must only support dv1394,
 		then you must explicitly specify it using --with-dv1394." "$LINENO" 5
 	fi
@@ -17335,8 +17366,8 @@
 	if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -17362,7 +17393,7 @@
 else
 
 		have_avcodec=no
-		as_fn_error "FFMPEG is the new, preferred DV codec. If you must only
+		as_fn_error $? "FFMPEG is the new, preferred DV codec. If you must only
 		support libdv, then you must explicitly specify it using --with-libdv-only." "$LINENO" 5
 
 fi
@@ -17436,12 +17467,12 @@
     pkg_cv_AVCODEC_CFLAGS="$AVCODEC_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libavformat") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat libavcodec libavutil\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libavformat libavcodec libavutil") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_AVCODEC_CFLAGS=`$PKG_CONFIG --cflags "libavformat" 2>/dev/null`
+  pkg_cv_AVCODEC_CFLAGS=`$PKG_CONFIG --cflags "libavformat libavcodec libavutil" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -17452,12 +17483,12 @@
     pkg_cv_AVCODEC_LIBS="$AVCODEC_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libavformat") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat libavcodec libavutil\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libavformat libavcodec libavutil") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_AVCODEC_LIBS=`$PKG_CONFIG --libs "libavformat" 2>/dev/null`
+  pkg_cv_AVCODEC_LIBS=`$PKG_CONFIG --libs "libavformat libavcodec libavutil" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -17475,9 +17506,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        AVCODEC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavformat" 2>&1`
+	        AVCODEC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavformat libavcodec libavutil" 2>&1`
         else
-	        AVCODEC_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavformat" 2>&1`
+	        AVCODEC_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavformat libavcodec libavutil" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$AVCODEC_PKG_ERRORS" >&5
@@ -17607,7 +17638,7 @@
   have_x=disabled
 else
   case $x_includes,$x_libraries in #(
-    *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
+    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
     *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -17625,7 +17656,7 @@
 	@echo libdir='${LIBDIR}'
 _ACEOF
   if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+    # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
     for ac_var in incroot usrlibdir libdir; do
       eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
     done
@@ -17711,7 +17742,7 @@
   fi
 done
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 fi # $ac_x_includes = no
 
 if test "$ac_x_libraries" = no; then
@@ -18282,14 +18313,13 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  as_fn_error "Xlib.h or Xutil.h not found install xdevel" "$LINENO" 5
+  as_fn_error $? "Xlib.h or Xutil.h not found install xdevel" "$LINENO" 5
 fi
 
 done
@@ -18307,14 +18337,13 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  as_fn_error "Required header not found. Please check that it is installed" "$LINENO" 5
+  as_fn_error $? "Required header not found. Please check that it is installed" "$LINENO" 5
 
 fi
 
@@ -18326,14 +18355,13 @@
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <X11/Xlib.h>
 
 "
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  as_fn_error "Required xvideo (Xv) extension to X not found. Please check that it is installed." "$LINENO" 5
+  as_fn_error $? "Required xvideo (Xv) extension to X not found. Please check that it is installed." "$LINENO" 5
 fi
 
 done
@@ -18384,7 +18412,7 @@
   LIBS="-lXext $LIBS"
 
 else
-  as_fn_error "Could not link with libXext. Check that you have libXext installed" "$LINENO" 5
+  as_fn_error $? "Could not link with libXext. Check that you have libXext installed" "$LINENO" 5
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XvQueryAdaptors in -lXv" >&5
@@ -18431,7 +18459,7 @@
   LIBS="-lXv $LIBS"
 
 else
-  as_fn_error "Could not link with libXv. Check that you have libXv installed" "$LINENO" 5
+  as_fn_error $? "Could not link with libXv. Check that you have libXv installed" "$LINENO" 5
 
 fi
 
@@ -18496,7 +18524,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBXML2_PKG_ERRORS" >&5
 
-	as_fn_error "Package requirements (libxml-2.0) were not met:
+	as_fn_error $? "Package requirements (libxml-2.0) were not met:
 
 $LIBXML2_PKG_ERRORS
 
@@ -18510,7 +18538,7 @@
 elif test $pkg_failed = untried; then
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -18519,7 +18547,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS
 	LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS
@@ -18589,7 +18617,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTK2_PKG_ERRORS" >&5
 
-	as_fn_error "Package requirements (gthread-2.0 libglade-2.0 >= 2.5.0 gtk+-2.0 >= 2.6) were not met:
+	as_fn_error $? "Package requirements (gthread-2.0 libglade-2.0 >= 2.5.0 gtk+-2.0 >= 2.6) were not met:
 
 $GTK2_PKG_ERRORS
 
@@ -18603,7 +18631,7 @@
 elif test $pkg_failed = untried; then
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -18612,7 +18640,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	GTK2_CFLAGS=$pkg_cv_GTK2_CFLAGS
 	GTK2_LIBS=$pkg_cv_GTK2_LIBS
@@ -18681,7 +18709,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$PANGOFT_PKG_ERRORS" >&5
 
-	as_fn_error "Package requirements (pangoft2) were not met:
+	as_fn_error $? "Package requirements (pangoft2) were not met:
 
 $PANGOFT_PKG_ERRORS
 
@@ -18695,7 +18723,7 @@
 elif test $pkg_failed = untried; then
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -18704,7 +18732,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	PANGOFT_CFLAGS=$pkg_cv_PANGOFT_CFLAGS
 	PANGOFT_LIBS=$pkg_cv_PANGOFT_LIBS
@@ -19467,14 +19495,13 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  as_fn_error "You need this header to compile kino" "$LINENO" 5
+  as_fn_error $? "You need this header to compile kino" "$LINENO" 5
 fi
 
 done
@@ -19483,14 +19510,13 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  as_fn_error "You need this function to compile kino" "$LINENO" 5
+  as_fn_error $? "You need this function to compile kino" "$LINENO" 5
 fi
 done
 
@@ -19570,9 +19596,9 @@
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-                as_fn_error "samplerate.pc not found, install libsamplerate-devel (see http://www.mega-nerd.com/SRC/)" "$LINENO" 5
+                as_fn_error $? "samplerate.pc not found, install libsamplerate-devel (see http://www.mega-nerd.com/SRC/)" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	as_fn_error "samplerate.pc not found, install libsamplerate-devel (see http://www.mega-nerd.com/SRC/)" "$LINENO" 5
+	as_fn_error $? "samplerate.pc not found, install libsamplerate-devel (see http://www.mega-nerd.com/SRC/)" "$LINENO" 5
 else
 	SRC_CFLAGS=$pkg_cv_SRC_CFLAGS
 	SRC_LIBS=$pkg_cv_SRC_LIBS
@@ -19673,6 +19699,7 @@
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -19696,27 +19723,27 @@
 fi
 
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error "conditional \"AMDEP\" was never defined.
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -19871,19 +19898,19 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -20079,7 +20106,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -20133,7 +20160,7 @@
 # values after options handling.
 ac_log="
 This file was extended by kino $as_me 1.3.4, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -20173,6 +20200,7 @@
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -20195,12 +20223,13 @@
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 kino config.status 1.3.4
-configured by $0, generated by GNU Autoconf 2.64,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.67,
+  with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -20218,11 +20247,16 @@
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -20236,12 +20270,15 @@
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -20254,7 +20291,7 @@
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
+    as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -20263,7 +20300,7 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
+  -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -20690,7 +20727,7 @@
     "pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/Makefile" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
   esac
 done
 
@@ -20728,7 +20765,7 @@
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -20745,7 +20782,7 @@
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
@@ -20759,18 +20796,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -20792,7 +20829,7 @@
 t delim
 :nl
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -20806,7 +20843,7 @@
 t nl
 :delim
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
@@ -20859,20 +20896,28 @@
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -20900,7 +20945,7 @@
   if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -20985,7 +21030,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -20998,7 +21043,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -21026,7 +21071,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -21053,7 +21098,7 @@
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
     esac
     ;;
   esac
@@ -21190,22 +21235,22 @@
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -21216,19 +21261,19 @@
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
     } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -22175,7 +22220,7 @@
       esac ;;
     "po/stamp-it":C)
     if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
-       as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
+       as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
     fi
     rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
     >"po/stamp-it.tmp"
@@ -22203,7 +22248,7 @@
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 	if test x$enable_local_ffmpeg != xno; then
@@ -22238,7 +22283,7 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
--- kino-1.3.4.orig/configure.in
+++ kino-1.3.4/configure.in
@@ -221,7 +221,7 @@
 		if (test "x$avcodec_include" != x) || (test "x$avcodec_lib" != x) ; then
 			local_legacy_ffmpeg_test
 		else
-			PKG_CHECK_MODULES(AVCODEC, libavformat,
+			PKG_CHECK_MODULES(AVCODEC, libavformat libavcodec libavutil,
 			[
 				AC_DEFINE(HAVE_LIBAVCODEC, 1, [Enable FFMPEG libavcodec])
 				AC_SUBST(AVCODEC_LIBS)
--- kino-1.3.4.orig/debian/NEWS
+++ kino-1.3.4/debian/NEWS
@@ -0,0 +1,10 @@
+kino (0.70-1) unstable; urgency=low
+
+  With this release, kino has switched to a new major version of its
+  underlying graphics libraries, Gnome2 and Gtk2. The change affects
+  any kino plugins that you might have installed: You need to download
+  new versions of all plugins suitable for kino 0.70, and rebuild.
+  As a consequence, the name of kino's plugin directory was also
+  changed; plugins now need to be installed into /usr/lib/kino-gtk2/.
+
+ -- Daniel Kobras <kobras@debian.org>  Mon, 22 Dec 2003 18:47:40 +0100
--- kino-1.3.4.orig/debian/README.Debian
+++ kino-1.3.4/debian/README.Debian
@@ -0,0 +1,42 @@
+Notes about the kino Debian package
+-----------------------------------
+
+To export movies to a DV camcorder, kino uses the TALK_QUEUE_BUFFER extension
+of the video1394 API. They are included in the mainline Linux kernel starting
+with version 2.4.7.
+
+If you receive an error when trying to capture video via the IEEE1394
+interface, make that you have read and write permissions on /dev/video1394.
+If you don't, I recommend to perform the following steps as the root user:
+
+  * Change ownership to group video: 
+      chown root:video /dev/video1394
+  * Grant access to any user in group video:
+      chmod 660 /dev/video1394
+  * Add certain users (user 'blarf' in this example) to group video:
+      adduser blarf video
+    
+After the next login, user 'blarf' should be able to capture via the IEEE1394
+interface.
+
+Most advanced video export capabilities make use of helper applications from
+the mjpegtools (http://mjpeg.sourceforge.net/) and ffmpeg
+(http://ffmpeg.sourceforge.net) packages. At the time of writing, only
+ffmpeg packages are available in Debian proper. Unofficial Debian packages
+for mjpegtools are available at ftp://ftp.nerim.net/debian-marillat/.
+Recently, mjpegtools have repeatedly changed their commandline tool used in
+kino for export to DivX.  The default configuration supplied in this package is
+correct for mjpegtools versions up to 1.6.1.  If you run later versions, please
+read up in the mjpegtools documentation for the proper commandline and change
+the export filter in the kino preferences accordingly.
+
+MP3 export uses lame, available from http://www.mp3dev.org/.
+
+Header files to build kino plugins with are installed in /usr/include/kino/;
+kino now looks for plugins in /usr/lib/kino-gtk2, whereas versions prior to
+0.70 had used /usr/lib/kino.  The kinoplus, timfx, and dvtitler plugins
+are available as Debian packages already.  See the kinoplus, kino-timfx,
+and kino-dvtitler packages respectively.
+
+Daniel Kobras <kobras@debian.org>
+2004-03-06.
--- kino-1.3.4.orig/debian/README.source
+++ kino-1.3.4/debian/README.source
@@ -0,0 +1,5 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+Read more about this on /usr/share/doc/quilt/README.source.
--- kino-1.3.4.orig/debian/changelog
+++ kino-1.3.4/debian/changelog
@@ -0,0 +1,772 @@
+kino (1.3.4-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Andreas Cadhalpun ]
+  * Fix build against ffmpeg 3.0. (Closes: #803829)
+
+ -- Sebastian Ramacher <sramacher@debian.org>  Wed, 09 Mar 2016 00:09:24 +0100
+
+kino (1.3.4-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Upload to unstable (Closes: #739426)
+
+ -- Reinhard Tartler <siretart@tauware.de>  Sat, 17 May 2014 16:42:03 -0400
+
+kino (1.3.4-2) experimental; urgency=low
+
+  * Acknowledge NMUs, thanks to Sebastian Ramacher, Aron Xu, Luk Claes, and
+    Matthias Klose (Closes: #720661, #634214, #647182, #567647, #631467,
+    #621996, #621686, #614954)
+  * debian/patches/110_libav10.diff: update to libav10 (Closes: #739426),
+    thanks to Anton Khirnov 
+  * debian/control: switch to git
+
+ -- Paul Brossier <piem@debian.org>  Sat, 15 Mar 2014 20:45:22 -0300
+
+kino (1.3.4-1.4) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/100_libav_9.diff: Port to libav 9 API. (Closes: #720661).
+  * debian/control: Bump libavformat-dev and libavcoded-dev to >= 6:9 since
+    some version checks have been dropped.
+
+ -- Sebastian Ramacher <sramacher@debian.org>  Thu, 12 Sep 2013 13:50:06 +0200
+
+kino (1.3.4-1.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS with libav 0.8, thanks to Fabrice Coutadeur.
+    (Closes: #634214)
+  * Drop unneeded recommends of "gawk | mawk" (Closes: #647182)
+  * Add menu entry (Closes: #567647)
+  * Ack previous NMU (Closes: #631467)
+
+ -- Aron Xu <aron@debian.org>  Sat, 14 Jan 2012 11:30:51 +0000
+
+kino (1.3.4-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add 30_v4l1_includes.diff: Use <libv4l1-videodev.h> instead of
+    <linux/videodev.h>, as Linux 2.6.38 dropped V4L1. Package should use
+    v4l2 only then, but fails to build due to this (Closes: #621996).
+  * Don't ship .la files (Closes: #621686).
+
+ -- Luk Claes <luk@debian.org>  Fri, 24 Jun 2011 08:25:34 +0200
+
+kino (1.3.4-1.1) unstable; urgency=low
+
+  * Non maintainer upload.
+  * configure.in. Check for libavcodec and libavutil. Closes: #614954.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 26 Feb 2011 17:22:28 +0100
+
+kino (1.3.4-1) unstable; urgency=low
+
+  * New upstream release (closes: #547370)
+  * debian/control:
+    - bump to debhelper 7
+    - Standards-Version 3.8.3
+    - fix Vcs-* fields to point to package branches
+  * debian/rules: switch from dpatch to quilt
+  * debian/README.source: add reference to quilt documentation
+  * debian/rules: remove dh_desktop, use dh_prep
+  * debian/control: span Build-Depends on multiple lines
+  * partly merge with 1.3.3-1ubuntu2:
+    - debian/rules: Use dh_installudev to install udev rules
+    - debian/kino.preinst: Remove old rules on upgrade unless modified in which
+      case move to correct path.
+    - debian/control: Bump build-depend on debhelper to install udev rules into
+      /lib/udev/rules.d, add Breaks on udev to get correct version
+    - debian/kino.udev: install with dh_installudev
+    - debian/kino.dirs: Don't create udev/rules.d directory.
+    - debian/kino.postinst: remove old hotplug/udev files
+
+ -- Paul Brossier <piem@debian.org>  Tue, 08 Dec 2009 18:45:36 +0100
+
+kino (1.3.3-1) unstable; urgency=low
+
+  * New upstream release
+  * Acknowledge non-maintainer uploads, thanks to Roland Mas (closes: #454895)
+    and Adeodato Simó (closes: #517749)
+  * Remove merged patches 10_playlist_algorithm 20_fix_FTBFS_with_new_ffmpeg
+  * Added gawk | mawk, curl to Recommends:, ffmpeg2theora to Suggests:
+    (closes: #519946)
+  * Include 20_fix_bashism from Francesco Namuri (closes: #489619, #455021)
+  * Move config.* updates from debian/rules to 10_uptodate_configure.dpatch
+  * Bump to Standards-Version to 3.8.1
+  * Add call to dh_desktop
+
+ -- Paul Brossier <piem@debian.org>  Tue, 17 Mar 2009 13:54:12 +0100
+
+kino (1.3.0-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Ajust src/frame.h for the new location of ffmpeg includes.
+    (Closes: #517749)
+
+ -- Adeodato Simó <dato@net.com.org.es>  Tue, 10 Mar 2009 12:23:47 +0000
+
+kino (1.3.0-2.1) unstable; urgency=low
+
+  * Removed myself from Uploaders, which makes this a non-maintainer upload.
+  * Updated build-depends to match current versions of libraries (closes:
+    #497688).
+
+ -- Roland Mas <lolando@debian.org>  Wed, 10 Sep 2008 09:40:01 +0200
+
+kino (1.3.0-2) unstable; urgency=low
+
+  * Fix build-depends on libgl, use libgl1-mesa-dev | libgl-dev
+
+ -- Paul Brossier <piem@debian.org>  Sun, 11 May 2008 13:34:45 +0200
+
+kino (1.3.0-1) unstable; urgency=medium
+
+  * New upstream release (closes: #473486).
+  * Acknowledge non-maintainer upload, thanks to Luk Claes (closes: #454895)
+  * debian/rules: do not call autoreconf
+  * debian/patches/10_playlist_algorithm.dpatch: move Luk's patch to dpatch 
+  * debian/patches/90_add_libquicktime_cflags.dpatch: removed
+  * debian/control: switch b-d from libdc1394-dev to libdc1394-13-dev
+    (closes: #476072, #475074)
+  * debian/control: added build-depends on libgl1-dev and libswscale-dev
+  * debian/kino.doc-base.*: update section to Video
+  * debian/control: update Vcs-Cvs
+
+ -- Paul Brossier <piem@debian.org>  Sat, 10 May 2008 18:36:45 +0200
+
+kino (1.2.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with GCC 4.3 (Closes: #454895).
+
+ -- Luk Claes <luk@debian.org>  Sun, 16 Mar 2008 18:00:34 +0000
+
+kino (1.2.0-1) unstable; urgency=low
+
+  * New upstream release (closes: #460671)
+  * debian/control: bump Standards-Version to 3.7.3
+  * debian/patches/10_desktop_fix.dpatch: remove, integrated upstream
+  * debian/patches/80_move_doc.dpatch: update indentation and line
+    numbers
+  * debian/control: added Vcs-Browser and Vcs-Cvs fields
+  * debian/patches/90_add_libquicktime_cflags.dpatch: add qt cflags
+  * debian/rules: add call to autoreconf
+  * debian/control: added autoconf, automake, libtool to Build-Depends
+  * debian/control: added autoconf2.13, automake1.4 to Build-Conflicts
+  * debian/control: Recommends ffmpeg (closes: #457988)
+
+ -- Paul Brossier <piem@debian.org>  Tue, 29 Jan 2008 16:51:10 +0100
+
+kino (1.1.1-1) unstable; urgency=low
+
+  * New upstream release.  This should fix a crash during recovery
+    (closes: #436518).
+  * Fixed debian/watch file (closes: #435509).
+  * Fixed .desktop file and menu file, to remove the last two Lintian
+    warnings.
+
+ -- Roland Mas <lolando@debian.org>  Sat, 18 Aug 2007 16:16:53 +0200
+
+kino (1.1.0-3) unstable; urgency=low
+
+  * Moved doc to /usr/share/doc/kino/
+  * Registered French version of the documentation in doc-base.
+  * Tweaked debian/rules to fix two lintian errors.
+
+ -- Roland Mas <lolando@debian.org>  Tue, 31 Jul 2007 17:47:38 +0200
+
+kino (1.1.0-2) unstable; urgency=low
+
+  * Removed 60_fix_bigendian_warning.dpatch, since it now breaks building
+    on big-endian architectures (closes: #429189).
+
+ -- Roland Mas <lolando@debian.org>  Tue, 31 Jul 2007 11:46:06 +0200
+
+kino (1.1.0-1) unstable; urgency=low
+
+  * New upstream release (closes: #435024).
+
+ -- Roland Mas <lolando@debian.org>  Sat, 28 Jul 2007 22:24:11 +0200
+
+kino (1.0.0-2) unstable; urgency=low
+
+  * Uploading to unstable after libquicktime1 transition (closes: #434412).
+  * Backported a patch from upstream to fix video aspect ratio bug.
+
+ -- Roland Mas <lolando@debian.org>  Thu, 26 Jul 2007 23:21:51 +0200
+
+kino (1.0.0-1) experimental; urgency=low
+
+  * New upstream release (closes: #398296, #417257).
+  * Upstream now includes kinoplus (closes: #335491).
+  * Upstream includes its own snapshot of ffmpeg, but it's better if the
+    packages use a properly packaged one, so use --disable-local-ffmpeg.
+  * Build against libquicktime 1.0.
+
+ -- Roland Mas <lolando@debian.org>  Thu, 10 May 2007 15:45:41 +0200
+
+kino (0.92-3) unstable; urgency=low
+
+  * Rebuild with --without-dv1394 instead of --with-dv1394 (closes: 406670)
+
+ -- Paul Brossier <piem@debian.org>  Wed, 31 Jan 2007 13:18:16 +0100
+
+kino (0.92-2) unstable; urgency=low
+
+  * Change --with-quicktime to --enable-quicktime (closes: #406291)
+  * Add missing build dependencies on liba52-dev, libavformat-dev,
+    libiec61883-dev, libdc1394-dev, libgsm1-dev, libvorbis-dev to activate
+    ffmpeg backend.
+  * Compile with --with-dv1394 (closes: #406670, #400919)
+
+ -- Paul Brossier <piem@debian.org>  Fri, 19 Jan 2007 11:21:53 +0100
+
+kino (0.92-1) unstable; urgency=low
+
+  * New upstream release (closes: #373189, #378214, #385959, #387888)
+  * Remove patches/40_fix_no_mplex.dpatch (integrated upstream)
+  * G++ 4.2 patch integrated upstream (closes: #377174)
+  * Change recommends on kinoplus to a suggests (closes: #378612)
+  * Add --with-dv1394 to keep using libdv1394
+
+ -- Paul Brossier <piem@debian.org>  Thu, 21 Sep 2006 13:38:32 +0200
+
+kino (0.90-1) unstable; urgency=low
+
+  * New upstream release (closes: #344475, #376251)
+  * Add #! /bin/sh to ffmpeg_utils.sh
+  * Bump to Standards-Version 3.7.2, debhelper >= 5.0
+  * Removed 30_fix_avi_packing (see gcc bugzilla #13983 and #17519)
+  * debian/rules: Generate a POT file at build time. (martin pitt)
+  * debian/control: Add intltool build dependency. (martin pitt)
+
+ -- Paul Brossier <piem@debian.org>  Sun,  2 Jul 2006 17:33:59 +0200
+
+kino (0.81-1) unstable; urgency=low
+
+  * New upstream release
+  * Update watch file
+  * Removed patches 50_fix_virtual_destructors and 90_gcc40_64bit_fixes
+    (integrated upstream)
+  * Add versioned conflict against old kinoplus
+
+ -- Paul Brossier <piem@debian.org>  Mon, 17 Apr 2006 17:30:06 +0200
+
+kino (0.80-2) unstable; urgency=low
+
+  * Ship /etc/udev/rules.d (closes: #347750)
+
+ -- Paul Brossier <piem@debian.org>  Sat, 21 Jan 2006 02:16:29 +0000
+
+kino (0.80-1) unstable; urgency=low
+
+  * New upstream release (closes: #341078)
+    + Add libxml-parser-perl to Build-Depends
+    + Update old patches to new uptstream sources
+  * Plugins kino-timefx and kino-dvtitler integrated upstream
+    + Update package description accordingly
+    + Remove both timefx and dvtitler from Recommends
+    + Add {Conflicts,Replaces,Provides}: for them
+    + Add Roland Mas to the Uploaders field
+  * Add missing Build-Depends on libasound2-dev (closes: #326801)
+  * Add udev rules, add udev in Suggests and postinst/rm (closes: #338747)
+  * Drop patch 70, everything happens in configure.in
+
+ -- Paul Brossier <piem@debian.org>  Sun, 11 Dec 2005 23:23:56 +0000
+
+kino (0.76-5) unstable; urgency=low
+
+  * Patches added:
+    + [40_gcc40_64bit_fixes] Thanks to Tollef Fog Heen (closes: #319031) 
+      Cast the NULL value passed to gtk_file_chooser_dialog_new as NULL is
+      defined as 0 in C++, not (void *)0 or something like that.  Ubuntu
+      #13627, Debian #319031
+    + [80_move_doc] Move /usr/share/kino/help to /usr/share/doc/kino/help
+  * Rebuild against new libavcodec-dev (>= 0.cvs20050918-3) (closes: #319096)
+  * Use version=3 in watch file.
+
+ -- Paul Brossier <piem@debian.org>  Thu, 22 Sep 2005 16:00:46 +0100
+
+kino (0.76-4) unstable; urgency=low
+
+  * Update to new quicktime headers location (closes: #328026)
+    Thanks to Dan Frazier for the patch.
+  * Rebuild against newer libquicktime (closes: #325647)
+
+ -- Paul Brossier <piem@debian.org>  Tue, 20 Sep 2005 16:49:39 +0100
+
+kino (0.76-3) unstable; urgency=low
+
+  * Added the following patches:
+    + [20_segfault_empty_chapter]
+      Fix segfaults in dvdauth dump when no chapters
+    + [30_fix_avi_packing]
+      Fix packed attributes in avi.h
+    + [40_fix_no_mplex]
+      Fix segfault when no mplex is set (closes: #287248)
+    + [50_fix_virtual_destructors]
+      Add virtual destructors where needed (g++-4.0)
+    + [60_fix_bigendian_warning.dpatch]
+      Avoid unused variable on big endian arch
+  * Cleaned up obsolete checks in debian/rules:
+    - Kino.desktop is now capitalised in upstream archive
+    - libquicktime1 version is now >= 0.9.2release-2 in stable
+    - Fix update of config.* in debian/rules, add xpm icon install
+  * Remove libsamplerate from copyright, add homepage in control
+  * Create kino.xpm to use same icon in menu as in .desktop
+
+ -- Paul Brossier <piem@debian.org>  Wed,  3 Aug 2005 20:01:29 +0100
+
+kino (0.76-2) unstable; urgency=low
+
+  * New upstream fixed $HOME issues (closes: #311115)
+  * Upload to unstable (closes: #313050)
+  * New maintainer (closes: #298106)
+  * Added watch file, bumped Standards-Version
+
+ -- Paul Brossier <piem@debian.org>  Mon, 11 Jul 2005 14:27:13 +0100
+
+kino (0.76-1) experimental; urgency=low
+
+  * New upstream version (aka 0.7.6).
+    + Properly tags exported divx files. Closes: #308669
+    + Fixes remaining oddities in directory handling of the file chooser.
+      Closes: #226549
+  * Updated patches:
+    + [10_desktop_fix]
+      Rediffed.
+  * Removed patches:
+    + [10_fix_dvcapture_device]
+    + [10_gtype_fix]
+    + [10_jogshuttle_memhog_workaround]
+    + [20_64bit_cast_fix]
+    + [20_endian_types]
+    + [30_wav_endian_fixes]
+    + [40_gcc40_fixes]
+    + [40_yuvdisplay_endian_fixes]
+      Merged upstream.
+
+ -- Daniel Kobras <kobras@debian.org>  Thu, 19 May 2005 16:54:18 +0200
+
+kino (0.75-7) unstable; urgency=high
+
+  * Added patches:
+    [10_gtype_fix]
+    Use correctly typed variable to query gtk types. Fixes startup
+    crashes on 64bit architectures. Closes: #304247
+
+ -- Daniel Kobras <kobras@debian.org>  Tue, 12 Apr 2005 11:04:05 +0200
+
+kino (0.75-6) unstable; urgency=high
+
+  * Added patches:
+    + [40_yuvdisplay_endian_fixes]
+      Unroll YUV components independent of host endianness to fix Xv
+      display method on big-endian machines. Closes: #289182
+    + [40_gcc40_fixes]
+      Fix compile errors with gcc 4.0 when dereferencing member
+      variables of base classes. Closes: #300864
+
+ -- Daniel Kobras <kobras@debian.org>  Fri, 25 Mar 2005 16:11:34 +0100
+
+kino (0.75-5) unstable; urgency=medium
+
+  * Updated patches:
+    + [30_wav_endian_fixes]
+      One more strategic cast to fix the hopefully last build failure on
+      big-endian architectures.
+
+ -- Daniel Kobras <kobras@debian.org>  Mon,  7 Mar 2005 19:57:32 +0100
+
+kino (0.75-4) unstable; urgency=medium
+
+  * Updated patches:
+    + [30_wav_endian_fixes]
+      Sprinkle a few casts at strategic places to fix compile errors on
+      big-endian. Fix wrong order of function arguments when using
+      libsamplerate resampling.
+
+ -- Daniel Kobras <kobras@debian.org>  Mon,  7 Mar 2005 17:54:23 +0100
+
+kino (0.75-3) unstable; urgency=medium
+
+  * Added patches:
+    + [30_wav_endian_fixes]
+      Try to fix audio import/export bugs on big-endian architectures.
+      Addresses part of bug #289182.
+    + [20_64bit_cast_fix]
+      Fix bogus cast on 64bit architectures, uncovered by gcc 4.0.
+      Closes: #284864
+  * Updated patches:
+    + [20_endian_types]
+      Clean up and provide big-endian types as well.
+  * debian/control: Build-depend on libavcodec-dev.
+  * debian/rules: configure with avcodec support. Should significantly
+    improve decoding speed on non-x86 architectures, and might also
+    cure on-screen decoding bugs on big-endian machines (another part
+    of bug #289182). Encoding still uses libdv. Closes: #224974
+  * debian/README.Debian: Update documentation now that ffmpeg is
+    available from the main archives.
+
+ -- Daniel Kobras <kobras@debian.org>  Sun,  6 Mar 2005 22:06:13 +0100
+
+kino (0.75-2) unstable; urgency=medium
+
+  * Added patches:
+    + [10_jogshuttle_memhog_workaround]
+      Split constructor of class Preferences into several smaller
+      functions to lower memory usage at compile time. Fixes build
+      failure on ARM.
+
+ -- Daniel Kobras <kobras@debian.org>  Sat, 27 Nov 2004 17:55:49 +0100
+
+kino (0.75-1) unstable; urgency=low
+
+  * New upstream version (aka 0.7.5). Closes: #282018
+    + Fixes typo in VCD export. Closes: #278240
+  * Added patches:
+    + [10_fix_dvcapture_device]
+      In preferences, hide the device node text field when raw1394 capture
+      is selected. Name can only be changed with dv1394. Closes: #279094
+  * Updated patches:
+    + [10_desktop_fix]
+      Most changes merged upstream. Only fix for French entry remains.
+    + [20_endian_types]
+      Rediffed.
+  * debian/control: Drop build dependency on netpbm.
+  * debian/kino.xpm: 32x32 icon was dropped from upstream distribution
+    and replaced by larger versions. Keep the small icon in the Debian
+    diff as it is the only one that complies with menu policy.
+  * debian/rules: Remove icon conversions. Icon in Debian diff already
+    has the correct format.
+
+ -- Daniel Kobras <kobras@debian.org>  Fri, 26 Nov 2004 18:10:47 +0100
+
+kino (0.74-2) unstable; urgency=medium
+
+  * Updated patches:
+    + [10_desktop_fix]
+      Fix Czech and French translations, remove broken Greek translation.
+      Closes: #275664
+  * debian/control: Remove oggenc from Suggests. The correct package name
+    is vorbis-tools, and that's been suggested for ages already.
+    Closes: #276097
+  * debian/control: Add build dependency on netpbm.
+  * debian/kino.menu: Make use of xpm icon in Debian menu.
+  * debian/rules: Convert 32x32 menu icon from png to xpm format.
+  * debian/rules: Rename kino.desktop to Kino.desktop because KDE
+    otherwise outright ignores the file. Works around: #270702
+
+ -- Daniel Kobras <kobras@debian.org>  Tue, 12 Oct 2004 18:20:06 +0200
+
+kino (0.74-1) unstable; urgency=low
+
+  * New upstream version (aka 0.7.4).
+  * Updated patches:
+    + [10_desktop_fix]
+      Merge with upstream changes. Add German translation.
+  * Removed patches:
+    + [01_CVS_mpeg_export_fix]
+    + [01_CVS_null_pointer_fix]
+    + [01_CVS_time_state_fix]
+    + [01_CVS_transition_frame_fix]
+    + [01_CVS_dv1394_deadlock_fix]
+    + [02_CVS_ieee1394_stop_fix]
+    + [10_debashify_exports]
+    + [10_document_fileext]
+    + [10_root_prjdir_fix]
+    + [10_shell_quoting]
+      Merged upstream.
+  * debian/copyright: Update download location.
+
+ -- Daniel Kobras <kobras@debian.org>  Thu,  7 Oct 2004 17:38:42 +0200
+
+kino (0.73-2) unstable; urgency=high
+
+  * Added patches:
+    + [10_desktop_fix] New.
+      Remove empty lines from kino.desktop file to prevent menu entries
+      without text. Add further transations by Jordi Mallach and from
+      upstream CVS. Closes: #268191
+
+ -- Daniel Kobras <kobras@debian.org>  Thu, 16 Sep 2004 19:38:17 +0200
+
+kino (0.73-1) unstable; urgency=medium
+
+  * New upstream version (aka 0.7.3). Closes: #267599
+    + Detects mp3 encoder with recent ffmpeg as well. Closes: #260682
+  * Added patches:
+    + [01_CVS_mpeg_export_fix] From upstream CVS.
+      Fix cleanup logic when exporting to mpegs fails.
+    + [01_CVS_null_pointer_fix] From upstream CVS.
+      Fix segfaults when dereferencing NULL frames during capture.
+    + [01_CVS_time_state_fix] From upstream CVS.
+      Fix initialization of time variables in SMIL.
+    + [01_CVS_transition_frame_fix] From upstream CVS.
+      Fix calculation of end frame in video transitions.
+    + [01_CVS_dv1394_deadlock_fix] From upstream CVS.
+      Fix deadlock when stopping dv1394 capture.
+    + [02_CVS_ieee1394_stop_fix] From upstream CVS.
+      Fix deadlock when stopping raw1394 capture.
+    + [10_root_prjdir_fix] New.
+      Fix segfault when using / as project directory. Addresses part
+      of #226549.
+  * Updated patches:
+    + [10_debashify_exports]
+      Merge with changes from new upstream version.
+    + [10_shell_quoting]
+      Merge with changes from new upstream version.
+  * Removed patches:
+    + [01_CVS_fixes]
+      Merged upstream.
+  * debian/kino.doc-base: Fix path to online documentation.
+    Closes: #262915
+  * debian/control: Add ffmpeg, lame, and oggenc to Suggests.
+  * debian/README.Debian: Add hint about where to obtain ffmpeg.
+    Closes: #258699
+
+ -- Daniel Kobras <kobras@debian.org>  Tue, 24 Aug 2004 16:23:32 +0200
+
+kino (0.71-2) unstable; urgency=low
+
+  * Added patches:
+    + [01_CVS_fixes] New.
+      Collection of selected bug fixes from upstream CVS.
+  * Updated patches:
+    + [10_debashify_exports]
+      Also include fixes for dvd exporter and publishing subdir.
+    + [20_endian_types]
+      Remove .rej file that slipped in by mistake.
+  * debian/control: Build-depend on libxt-dev, which is needed by
+    configure. Closes: #254152
+
+ -- Daniel Kobras <kobras@debian.org>  Sun, 13 Jun 2004 16:44:27 +0200
+
+kino (0.71-1) unstable; urgency=low
+
+  * New upstream version (aka 0.7.1).
+  * Updated patches:
+    + [10_shell_quoting] Rediffed.
+    + [20_endian_types] Rediffed.
+  * Removed patches:
+    + [10_include_cassert]
+      Obsoleted by upstream change.
+  * debian/control: Build-depend on libsamplerate0-dev and libdv4-dev.
+    This kino version requires libdv 0.102 at least, so an alternative
+    build-dep on libdv2-dev is not possible.
+  * debian/control: Build-depend on libx11-dev, libxv-dev, libxext-dev,
+    following the xlibs-dev split.
+  * debian/control: Build-dep on version of libquicktime-dev linked with
+    libdv4.
+  * debian/control: Add hotplug to Suggests (for jogshuttle support).
+  * debian/kino.menu: Quote all strings to shut up lintian.
+  * debian/rules: Override hotplug script and usermap dir. Rename usermap
+    file to kino.usermap.
+  * debian/rules: Override libquicktime shlibs info to make kino depend on
+    a version that links with libdv4.
+
+ -- Daniel Kobras <kobras@debian.org>  Thu, 22 Apr 2004 12:50:37 +0200
+
+kino (0.70-2) unstable; urgency=low
+
+  * Added patches:
+    + [10_documents_fileext] New.
+      Document file formats and encodings kino can handle.
+      Closes: #226322
+    + [10_debashify_exports] New.
+      Remove bashisms from export shell scripts. Closes: #225123
+    + [10_shell_quoting] New.
+      Dynamically allocate and quote user-supplied strings that are
+      passed to shell scripts. With this patch, most special characters
+      are now allowed in filenames. Closes: #225023
+  * debian/control: Recommend various plugins now available as Debian
+    packages.
+  * README.Debian: Update plugin part to refer to Debian packages.
+
+ -- Daniel Kobras <kobras@debian.org>  Sat, 14 Feb 2004 22:08:59 +0100
+
+kino (0.70-1) unstable; urgency=low
+
+  * New upstream version (aka 0.7.0).
+  * Updated patches:
+    + [10_include_cassert] Rediffed.
+    + [20_endian_types] Rediffed.
+  * Removed patches:
+    + [30_videodev_include]
+      Obsolete, bug was fixed in linux-kernel-headers package.
+  * debian/control: Switch build dependencies to Gnome2.
+  * debian/control: Bump standards version.
+  * debian/copyright: Update list of copyright holders.
+  * debian/README: Add caveat about 0.70 compatibility of external plugins.
+    Added hints on how to setup appropriate permissions of device nodes.
+  * debian/NEWS: Warn about plugin incompatibility.
+  * debian/kino.dirs: Install (empty) plugin directory /usr/lib/kino-gtk2.
+
+ -- Daniel Kobras <kobras@debian.org>  Mon, 22 Dec 2003 18:48:38 +0100
+
+kino (0.65-1) unstable; urgency=low
+
+  * New upstream version (aka 0.6.5).
+  * Applied patches:
+    + [10_include_cassert] Old, converted to dpatch.
+      Include <cassert> where appropriate to keep g++ 3.3 happy.
+    + [20_endian_types] Old, converted to dpatch.
+      Ensure correct AVI on-disk format on big-endian an 64-bit archs.
+    + [30_videodev_include] New.
+      Compile with local, modified copy of v4l1 header because v4l2
+      breaks with current glibc. v4l2 is not used in kino anyway.
+      Closes: #221058
+  * Removed patches:
+    + [20_encapsulate_gnome_gettext]
+      (Aka the safe_gnome hack.) gnome.h still sucks, but kino upstream
+      has re-enabled gettext support as a workaround.
+  * debian/rules: Convert to dpatch.
+  * debian/control: Build-depend on dpatch.
+  * debian/control: Add mjpegtools to Suggests to make people who don't
+    read README.Debian read README.Debian when they find out that there
+    is no official mjpegtools package. Closes: #218621
+  * debian/README.Debian: Document some mjpegtools quirks. Upload
+    plugin information.
+
+ -- Daniel Kobras <kobras@debian.org>  Sat,  6 Dec 2003 22:18:44 +0100
+
+kino (0.64-4) unstable; urgency=low
+
+  * src/Makefile.{am,in}: Install safe_gnome.h in /usr/include/kino. Some
+    kino headers reference it. Closes: #202270
+
+ -- Daniel Kobras <kobras@debian.org>  Mon, 21 Jul 2003 21:43:52 +0200
+
+kino (0.64-3) unstable; urgency=low
+
+  * src/{avi,filehandler,page_export_1394,riff}.cc: Include <cassert>.
+    Adapted from dvgrab patch by Kevin Kreamer.
+  * src/safe_gnome.h, src/Makefile.am, src/Makefile.in: New header
+    safe_gnome.h that prevents gnome.h from messing with gettext defines.
+  * src/*: Include safe_gnome.h instead of gnome.h.
+  * All of the above fix build errors with g++ 3.3. Closes: #197757
+
+ -- Daniel Kobras <kobras@debian.org>  Thu, 19 Jun 2003 19:01:06 +0200
+
+kino (0.64-2) unstable; urgency=low
+
+  * src/Makefile.{am,in}, src/endian_types.h: New class providing basic types
+    in little-endian storage.
+  * src/{avi,riff}.{h,cc}: Fix AVI on-disk format on big-endian and 64bit
+    archs.
+  * src/avi.cc, src/filehandler.cc: Proper error checking in WriteFrame
+    method.
+
+ -- Daniel Kobras <kobras@debian.org>  Tue, 15 Apr 2003 10:18:27 +0200
+
+kino (0.64-1) unstable; urgency=low
+
+  * New upstream version (aka 0.6.4, you know the story). Closes: #180200
+  * debian/control: Build dep on libquicktime. Tighten versions
+    on libdv and libavc1394 build deps. Explicitly build depend on
+    libglib.
+  * debian/control: gnome-help is no more. Remove from suggests.
+  * debian/control: Bump standards version.
+  * debian/rules: Use debhelper compat level 4.
+  * debian/rules: Enable quicktime support.
+  * debian/rules: Do not install Makefiles in pixmaps dir.
+
+ -- Daniel Kobras <kobras@debian.org>  Wed,  2 Apr 2003 17:31:38 +0200
+
+kino (0.60.1-1) unstable; urgency=low
+
+  * New upstream version. (NB: Again, upstream calls this version 0.6,
+    and the tarball is labelled as 0.6-1. It is my firm belief that me
+    slightly tweaking the version causes less confusion than an epoch
+    hell.)
+  * debian/README.Debian: Updated notes on third-party plugins.
+  * debian/rules: No longer need to clean up after upstream install
+    target.
+
+ -- Daniel Kobras <kobras@debian.org>  Sat, 26 Oct 2002 21:43:58 +0200
+
+kino (0.51-1) unstable; urgency=low
+
+  * New upstream version.
+  * Raise libdv build dep.
+  * Do not provide video1394.* any longer. Recent enough versions have
+    been in the kernel for ages.
+  * fx.html doc file missing in release--add from upstream CVS.
+  * Suggest sox and vorbis-tools for audio export.
+  * Some export filters use packages not yet in Debian. Added download
+    hints to README.Debian.
+  * Install some headers in /usr/include/kino, so external plugins can
+    be built against this package. (Provide kino-dev? Humm..., not yet.)
+  * Document some potential plugin pitfalls in README.Debian.
+
+ -- Daniel Kobras <kobras@debian.org>  Thu,  8 Aug 2002 15:30:23 +0200
+
+kino (0.50-3) unstable; urgency=medium
+
+  * Adapt to libdv 0.9.5. Adjust build-deps accordingly.
+  * Added Arch line back to any. kino is really useful even without
+    IEEE 1394 hardware.
+  * Include libgtkxmhtml-dev and libzvt-dev to build deps.
+
+ -- Daniel Kobras <kobras@debian.org>  Sun, 21 Apr 2002 17:31:41 +0200
+
+kino (0.50-2) unstable; urgency=low
+
+  * Do not pass whole DV frames via the stack, keep alpha happy.
+    Closes: #123164 
+
+ -- Daniel Kobras <kobras@debian.org>  Tue, 11 Dec 2001 16:52:09 +0100
+
+kino (0.50-1) unstable; urgency=low
+
+  * New upstream version. (NB: Upstream calls this version 0.5 in some
+    places and 0.50 in others. Chose 0.50 to avoid an epoch.)
+  * Suggest gnome-help--we have online docs now.
+  * Mozilla doesn't like local filenames. Expand location of help files
+    to full URLs.
+  * Add menu entry to Apps/Graphics.
+  * Build depends on libxml2-dev now.
+
+ -- Daniel Kobras <kobras@debian.org>  Mon, 19 Nov 2001 15:18:07 +0100
+
+kino (0.46-1) unstable; urgency=low
+
+  * New upstream version.
+  * Added NEWS file to docs.
+
+ -- Daniel Kobras <kobras@debian.org>  Fri, 21 Sep 2001 08:41:42 +0200
+
+kino (0.45-1) unstable; urgency=low
+
+  * New upstream version. Closes: #112148
+  * Man page was merged upstream. Removed Debian-specific version.
+  * Backup config.{guess,sub} before clobbering with uptodate version.
+    Restore on clean.
+  * Patch from upstream CVS: remove extraneous comma in video1394.c.
+  * Patch from upstream CVS: fix corruption when recording with audio
+    enabled.
+
+ -- Daniel Kobras <kobras@debian.org>  Tue, 18 Sep 2001 14:23:39 +0200
+
+kino (0.43-2) unstable; urgency=low
+
+  * [This is basically upstream 0.44, but as the upstream tarball is
+     screwed, I rather distribute the (few) changes as a Debian patch
+     against sane upstream 0.43.]
+  * Fix PAL playback when using XV display.
+  * Include upstream BUGS file that wasn't distributed in 0.43.
+  * Added ludicrous architectures line to keep m68k maintainer happy.
+    (Took out s390 and hurd-i386 as well. This solution is ugly as hell,
+    but there's no better alternative right now.)
+
+ -- Daniel Kobras <kobras@debian.org>  Thu, 21 Jun 2001 17:14:11 +0200
+
+kino (0.43-1) unstable; urgency=low
+
+  * Initial release. Closes: #89512
+  * Added man page for kino(1).
+
+ -- Daniel Kobras <kobras@debian.org>  Thu, 14 Jun 2001 18:55:35 +0200
--- kino-1.3.4.orig/debian/compat
+++ kino-1.3.4/debian/compat
@@ -0,0 +1 @@
+7
--- kino-1.3.4.orig/debian/control
+++ kino-1.3.4/debian/control
@@ -0,0 +1,60 @@
+Source: kino
+Section: graphics
+Priority: extra
+Maintainer: Paul Brossier <piem@debian.org>
+Standards-Version: 3.9.2
+Homepage: http://www.kinodv.org/
+Vcs-Git: git://git.debian.org/collab-maint/kino.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/kino.git;a=summary
+Build-Depends: debhelper (>= 7.1),
+               quilt,
+               autoconf,
+               automake,
+               libtool,
+               libraw1394-dev (>= 0.9-2),
+               libdv4-dev,
+               libv4l-dev,
+               libavc1394-dev (>= 0.4.1),
+               libgnome2-dev,
+               libglade2-dev,
+               libgnomeui-dev,
+               libx11-dev,
+               libxt-dev,
+               libxv-dev,
+               libxext-dev,
+               libxcursor-dev,
+               libxml2-dev,
+               libxml-parser-perl,
+               libglib2.0-dev | libglib-dev,
+               libquicktime-dev (>= 2:1.0.0),
+               libsamplerate0-dev,
+               libavcodec-dev (>= 6:10~beta1),
+               libavformat-dev (>= 6:10~beta1),
+               libasound2-dev,
+               liba52-dev,
+               libgsm1-dev,
+               autotools-dev,
+               intltool,
+               libiec61883-dev,
+               libdc1394-22-dev,
+               libvorbis-dev,
+               libgl1-mesa-dev | libgl-dev,
+               libswscale-dev,
+Breaks: udev (<< 136-1)
+Build-Conflicts: autoconf2.13, automake1.4
+
+Package: kino
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kino-timfx, kino-dvtitler, kinoplus
+Conflicts: kino-timfx, kino-dvtitler, kinoplus
+Provides: kino-timfx, kino-dvtitler, kinoplus
+Suggests: ${udev-hotplug}, vorbis-tools, sox, mjpegtools, lame, ffmpeg2theora
+Recommends: ffmpeg, curl
+Description: Non-linear editor for Digital Video data
+ Kino allows you to record, create, edit, and play movies recorded with DV
+ camcorders. This program uses many keyboard commands for fast navigating and
+ editing inside the movie.
+ .
+ The kino-timfx, kino-dvtitler and kinoplus sets of plugins, formerly
+ distributed as separate packages, are now provided with Kino.
--- kino-1.3.4.orig/debian/copyright
+++ kino-1.3.4/debian/copyright
@@ -0,0 +1,33 @@
+This package was debianized by Daniel Kobras <kobras@debian.org> on
+Thu, 19 Apr 2001 10:18:05 +0200
+
+It was downloaded from http://kino.schirmacher.de/
+
+Copyright:
+	
+	The main kino sources contain code subject to the following
+	copyright statements:
+	
+	 Copyright (C) 2000-2003 Arne Schirmacher <arne@schirmacher.de>
+	 Copyright (C) 2001 Dan Dennedy <dan@dennedy.org>
+	 Copyright (C) 2000-2002 Charles Yates <charles.yates@pandora.be>
+	 Copyright (C) 2002 Mads Bondo Dydensborg <madsdyd@challenge.dk>
+	 Copyright (C) 2001 Charles 'Buck' Krasic
+	 Copyright (C) 2001 Tomoaki Hayasaka <hayasakas@postman.riken.go.jp>
+	 Copyright (C) 2001 Ronald Bultje
+
+License:
+
+	 This program is free software; you can redistribute it and/or modify
+	 it under the terms of the GNU General Public License as published by
+	 the Free Software Foundation; either version 2 of the License, or
+	 (at your option) any later version.
+
+	 This program is distributed in the hope that it will be useful,
+	 but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 GNU General Public License for more details.
+
+For the full text of the GNU General Public License, see the file
+/usr/share/common-licenses/GPL on any Debian system. 
+
--- kino-1.3.4.orig/debian/kino.dirs
+++ kino-1.3.4/debian/kino.dirs
@@ -0,0 +1,2 @@
+usr/lib/kino-gtk2
+usr/share/doc/kino
--- kino-1.3.4.orig/debian/kino.doc-base.en
+++ kino-1.3.4/debian/kino.doc-base.en
@@ -0,0 +1,10 @@
+Document: kino-manual
+Title: Kino Manual
+Author: Arne Schirmacher, Dan Dannedy, Charlie Yates
+Section: Video
+Abstract: This document describes how to cope with kino's graphical interface,
+ and provides a brief glossary on video editing terms.
+
+Format: HTML
+Index: /usr/share/doc/kino/help/en/index.html
+Files: /usr/share/doc/kino/help/en/*.html
--- kino-1.3.4.orig/debian/kino.doc-base.fr
+++ kino-1.3.4/debian/kino.doc-base.fr
@@ -0,0 +1,11 @@
+Document: kino-manual
+Title: Manuel de Kino 
+Author: Arne Schirmacher, Dan Dannedy, Charlie Yates
+Section: Video
+Abstract: Ce document décrit comment utiliser l'interface graphique de
+ Kino, et fournit également un glossaire de termes utilisés pour le
+ montage vidéo.
+
+Format: HTML
+Index: /usr/share/doc/kino/help/fr/index.html
+Files: /usr/share/doc/kino/help/fr/*.html
--- kino-1.3.4.orig/debian/kino.docs
+++ kino-1.3.4/debian/kino.docs
@@ -0,0 +1,6 @@
+AUTHORS
+BUGS
+NEWS
+README
+README_jogshuttle
+TODO
--- kino-1.3.4.orig/debian/kino.manpages
+++ kino-1.3.4/debian/kino.manpages
@@ -0,0 +1 @@
+src/kino.1
--- kino-1.3.4.orig/debian/kino.menu
+++ kino-1.3.4/debian/kino.menu
@@ -0,0 +1,2 @@
+?package(kino):needs="X11" section="Applications/Graphics"\
+  title="Kino" icon="/usr/share/pixmaps/kino.xpm" command="/usr/bin/kino"
--- kino-1.3.4.orig/debian/kino.postinst
+++ kino-1.3.4/debian/kino.postinst
@@ -0,0 +1,18 @@
+#!/bin/sh
+set -e
+
+#DEBHELPER#
+
+PACKAGE="kino"
+
+# remove old hotplug/udev files 
+if [ "$1" = "configure" ] && [ -d /etc/udev/ ]; then
+	rm -f /etc/udev/rules.d/035_kino.rules
+	rm -f /etc/udev/kino.rules
+	rm -f /etc/hotplug/usb/kino-jogshuttle
+	rm -f /etc/hotplug/usb/kino.usermap
+	rmdir /etc/hotplug/usb 2>/dev/null || true
+	rmdir /etc/hotplug 2>/dev/null || true
+fi
+
+exit 0
--- kino-1.3.4.orig/debian/kino.postrm
+++ kino-1.3.4/debian/kino.postrm
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+PACKAGE="kino"
+
+set -e
+
+if [ "$1" = purge ]; then
+	[ -L /etc/udev/rules.d/035_$PACKAGE.rules ] && \
+		rm /etc/udev/rules.d/035_$PACKAGE.rules
+fi
+
+#DEBHELPER#
+
+exit 0
--- kino-1.3.4.orig/debian/kino.preinst
+++ kino-1.3.4/debian/kino.preinst
@@ -0,0 +1,27 @@
+#!/bin/sh
+set -e
+
+#DEBHELPER#
+
+# remove udev rules file blunder
+if [ -d /etc/udev/rules.d/85-kino.rules ]; then
+	rm -rf /etc/udev/rules.d/85-kino.rules
+	if [ -f /etc/udev/rules.d/85-kino.rules.dpkg-new ]; then
+		mv /etc/udev/rules.d/85-kino.rules.dpkg-new \
+		   /etc/udev/rules.d/85-kino.rules
+	fi
+fi
+
+if [ "$1" = install ] || [ "$1" = upgrade ]; then
+	if [ -e "/etc/udev/rules.d/kino.rules" ]; then
+		if [ "`md5sum \"/etc/udev/rules.d/kino.rules\" | sed -e \"s/ .*//\"`" = \
+		     "`dpkg-query -W -f='${Conffiles}' kino | sed -n -e \"\\\\' /etc/udev/rules.d/kino.rules's/.* //p\"`" ]
+		then
+			rm -f "/etc/udev/rules.d/kino.rules"
+		else
+			mv "/etc/udev/rules.d/kino.rules" "/etc/udev/rules.d/40-kino.rules"
+		fi
+	fi
+fi
+
+exit 0
--- kino-1.3.4.orig/debian/kino.udev
+++ kino-1.3.4/debian/kino.udev
@@ -0,0 +1,7 @@
+# Kino jogshuttle support
+# Contour JogShuttle (basic, silver edition)
+
+ACTION=="add", SUBSYSTEM=="usb", ENV{PRODUCT}=="b33/10/*", \
+        RUN+="/usr/bin/killall --quiet -USR2 kino"
+ACTION=="add", SUBSYSTEM=="usb", ENV{PRODUCT}=="5f3/240/*", \
+        RUN+="/usr/bin/killall --quiet -USR2 kino"
--- kino-1.3.4.orig/debian/kino.xpm
+++ kino-1.3.4/debian/kino.xpm
@@ -0,0 +1,492 @@
+/* XPM */
+static char * kino_xpm[] = {
+"32 32 457 2",
+"  	c None",
+". 	c #4A4A48",
+"+ 	c #A3A09B",
+"@ 	c #C2C0BC",
+"# 	c #94928E",
+"$ 	c #403E39",
+"% 	c #1B1A18",
+"& 	c #242320",
+"* 	c #AAA8A2",
+"= 	c #EAE8E3",
+"- 	c #C1BEB9",
+"; 	c #514E47",
+"> 	c #4E4B44",
+", 	c #ACAAA4",
+"' 	c #989693",
+") 	c #676663",
+"! 	c #292825",
+"~ 	c #43413C",
+"{ 	c #A4A29C",
+"] 	c #C5C3BD",
+"^ 	c #55524B",
+"/ 	c #423F38",
+"( 	c #AFACA7",
+"_ 	c #D0CDC8",
+": 	c #44413B",
+"< 	c #3E3C36",
+"[ 	c #8B8A87",
+"} 	c #6E6D6B",
+"| 	c #272725",
+"1 	c #2C2A26",
+"2 	c #7F7E78",
+"3 	c #DBD8D3",
+"4 	c #C7C5C0",
+"5 	c #5A5750",
+"6 	c #A3A19B",
+"7 	c #D9D7D2",
+"8 	c #AEACA5",
+"9 	c #C5C2BD",
+"0 	c #54514B",
+"a 	c #312F2B",
+"b 	c #535250",
+"c 	c #272624",
+"d 	c #575552",
+"e 	c #686662",
+"f 	c #3D3B36",
+"g 	c #3C3933",
+"h 	c #9A9790",
+"i 	c #E1DFDA",
+"j 	c #48453E",
+"k 	c #B0ADA8",
+"l 	c #C5C4BF",
+"m 	c #A09E9A",
+"n 	c #3F3D38",
+"o 	c #201F1D",
+"p 	c #090807",
+"q 	c #41403D",
+"r 	c #928F8A",
+"s 	c #ACAAA5",
+"t 	c #393630",
+"u 	c #3E3B35",
+"v 	c #989690",
+"w 	c #C9C7C2",
+"x 	c #595650",
+"y 	c #A7A59F",
+"z 	c #D6D4CF",
+"A 	c #423F39",
+"B 	c #4A4740",
+"C 	c #B2B1AB",
+"D 	c #A9A8A4",
+"E 	c #636260",
+"F 	c #2F2F2B",
+"G 	c #282725",
+"H 	c #12110F",
+"I 	c #191815",
+"J 	c #65635E",
+"K 	c #CAC7C2",
+"L 	c #C9C6C0",
+"M 	c #5D5A53",
+"N 	c #9E9B96",
+"O 	c #DFDCD7",
+"P 	c #A6A49D",
+"Q 	c #C6C4BF",
+"R 	c #57544E",
+"S 	c #878681",
+"T 	c #71716E",
+"U 	c #2F2F2E",
+"V 	c #181716",
+"W 	c #302F2C",
+"X 	c #23221F",
+"Y 	c #2A2823",
+"Z 	c #7B7974",
+"` 	c #DCDAD4",
+" .	c #E5E3DE",
+"..	c #434038",
+"+.	c #9B9893",
+"@.	c #C8C6C0",
+"#.	c #68655C",
+"$.	c #615E55",
+"%.	c #615D55",
+"&.	c #605C54",
+"*.	c #5B5851",
+"=.	c #525048",
+"-.	c #141412",
+";.	c #595754",
+">.	c #74736F",
+",.	c #302E29",
+"'.	c #3B3832",
+").	c #929089",
+"!.	c #C7C5BF",
+"~.	c #58554C",
+"{.	c #48443C",
+"].	c #3D3A33",
+"^.	c #7D7B74",
+"/.	c #3D3B35",
+"(.	c #0A0909",
+"_.	c #191917",
+":.	c #5E5E5B",
+"<.	c #787775",
+"[.	c #615F5C",
+"}.	c #2D2C27",
+"|.	c #2D2C28",
+"1.	c #686663",
+"2.	c #7B7977",
+"3.	c #6A6865",
+"4.	c #363531",
+"5.	c #2E2D28",
+"6.	c #5A5955",
+"7.	c #7D7C79",
+"8.	c #7D7B79",
+"9.	c #363430",
+"0.	c #2F2D29",
+"a.	c #4E4C48",
+"b.	c #7E7C7A",
+"c.	c #7B7A77",
+"d.	c #474642",
+"e.	c #2F2E29",
+"f.	c #5E5C57",
+"g.	c #D4D1CC",
+"h.	c #C9C6C1",
+"i.	c #58544C",
+"j.	c #454139",
+"k.	c #403C35",
+"l.	c #4C4943",
+"m.	c #37352F",
+"n.	c #0B0A09",
+"o.	c #292824",
+"p.	c #AEADA7",
+"q.	c #ECE9E5",
+"r.	c #D9D6D2",
+"s.	c #47443C",
+"t.	c #9D9A94",
+"u.	c #D8D5D0",
+"v.	c #6A6760",
+"w.	c #75736B",
+"x.	c #6E6C65",
+"y.	c #DBD9D4",
+"z.	c #EBE8E3",
+"A.	c #95928C",
+"B.	c #4C4A43",
+"C.	c #DDDBD6",
+"D.	c #D5D3CD",
+"E.	c #54514A",
+"F.	c #5C5953",
+"G.	c #3E3B34",
+"H.	c #413E37",
+"I.	c #423F3A",
+"J.	c #38362F",
+"K.	c #0C0C0A",
+"L.	c #262521",
+"M.	c #797770",
+"N.	c #6E6B65",
+"O.	c #6A6761",
+"P.	c #DAD8D3",
+"Q.	c #8F8D86",
+"R.	c #47433D",
+"S.	c #DDDCD7",
+"T.	c #ABA9A3",
+"U.	c #45433C",
+"V.	c #4C4942",
+"W.	c #B9B7B1",
+"X.	c #CDCBC5",
+"Y.	c #434039",
+"Z.	c #A4A19B",
+"`.	c #D2D0CA",
+" +	c #56544C",
+".+	c #74726C",
+"++	c #3E3A34",
+"@+	c #3B3933",
+"#+	c #827F78",
+"$+	c #272622",
+"%+	c #4F4C45",
+"&+	c #E4E3DD",
+"*+	c #9E9C96",
+"=+	c #424039",
+"-+	c #C1BFB9",
+";+	c #C0BDB8",
+">+	c #B0AEA8",
+",+	c #59564F",
+"'+	c #908E88",
+")+	c #E8E6E1",
+"!+	c #59554F",
+"~+	c #797670",
+"{+	c #CCCAC4",
+"]+	c #56534B",
+"^+	c #413E36",
+"/+	c #46423A",
+"(+	c #3C3932",
+"_+	c #0C0C0B",
+":+	c #272623",
+"<+	c #48463E",
+"[+	c #A2A099",
+"}+	c #C3C1BB",
+"|+	c #A6A39C",
+"1+	c #545149",
+"2+	c #48453D",
+"3+	c #89867F",
+"4+	c #C1BFB8",
+"5+	c #BFBDB6",
+"6+	c #4E4B43",
+"7+	c #727068",
+"8+	c #BFBCB6",
+"9+	c #68665E",
+"0+	c #46433B",
+"a+	c #BFBDB7",
+"b+	c #78756F",
+"c+	c #45413A",
+"d+	c #58554E",
+"e+	c #99968F",
+"f+	c #545148",
+"g+	c #0C0B09",
+"h+	c #282723",
+"i+	c #555148",
+"j+	c #605C52",
+"k+	c #646056",
+"l+	c #625D53",
+"m+	c #5A564B",
+"n+	c #575349",
+"o+	c #5B564C",
+"p+	c #5F5B52",
+"q+	c #5E5A51",
+"r+	c #565148",
+"s+	c #544F46",
+"t+	c #5B574E",
+"u+	c #535046",
+"v+	c #4F4C43",
+"w+	c #58544B",
+"x+	c #57544B",
+"y+	c #524E45",
+"z+	c #4C483F",
+"A+	c #514D44",
+"B+	c #4B473F",
+"C+	c #49453D",
+"D+	c #49453C",
+"E+	c #47433B",
+"F+	c #090907",
+"G+	c #59554B",
+"H+	c #59544A",
+"I+	c #585349",
+"J+	c #565248",
+"K+	c #555147",
+"L+	c #545046",
+"M+	c #534E45",
+"N+	c #514C43",
+"O+	c #4F4B42",
+"P+	c #4E4A41",
+"Q+	c #4D4940",
+"R+	c #4C4840",
+"S+	c #4A473E",
+"T+	c #4A463E",
+"U+	c #545047",
+"V+	c #747067",
+"W+	c #98958D",
+"X+	c #98948C",
+"Y+	c #97948C",
+"Z+	c #97938C",
+"`+	c #96938C",
+" @	c #96928B",
+".@	c #95928B",
+"+@	c #95928A",
+"@@	c #94918A",
+"#@	c #939089",
+"$@	c #928F88",
+"%@	c #918E88",
+"&@	c #918E87",
+"*@	c #908D87",
+"=@	c #8F8C86",
+"-@	c #8E8B85",
+";@	c #8E8B84",
+">@	c #8D8B84",
+",@	c #77746D",
+"'@	c #3D3B34",
+")@	c #272723",
+"!@	c #535047",
+"~@	c #58544A",
+"{@	c #575248",
+"]@	c #555047",
+"^@	c #534F46",
+"/@	c #524D44",
+"(@	c #504C43",
+"_@	c #504B42",
+":@	c #4B473E",
+"<@	c #4A463D",
+"[@	c #46423B",
+"}@	c #444039",
+"|@	c #433F38",
+"1@	c #3A3731",
+"2@	c #272722",
+"3@	c #524F46",
+"4@	c #534F45",
+"5@	c #444139",
+"6@	c #423E37",
+"7@	c #393730",
+"8@	c #282623",
+"9@	c #514D45",
+"0@	c #524E44",
+"a@	c #4F4A42",
+"b@	c #4D4941",
+"c@	c #48453C",
+"d@	c #45423A",
+"e@	c #444038",
+"f@	c #403D36",
+"g@	c #38352F",
+"h@	c #504D44",
+"i@	c #635F55",
+"j@	c #85827A",
+"k@	c #89857D",
+"l@	c #88847D",
+"m@	c #87847C",
+"n@	c #86837B",
+"o@	c #85827B",
+"p@	c #848179",
+"q@	c #838078",
+"r@	c #837F78",
+"s@	c #817E77",
+"t@	c #817D76",
+"u@	c #807D76",
+"v@	c #7F7C75",
+"w@	c #7F7B75",
+"x@	c #7E7B74",
+"y@	c #7D7A74",
+"z@	c #7C7A73",
+"A@	c #69665F",
+"B@	c #080807",
+"C@	c #57534A",
+"D@	c #615C54",
+"E@	c #605C53",
+"F@	c #5F5B53",
+"G@	c #5E5A52",
+"H@	c #5E5951",
+"I@	c #5D5850",
+"J@	c #5C5850",
+"K@	c #5B5750",
+"L@	c #5B564F",
+"M@	c #5A564F",
+"N@	c #59554E",
+"O@	c #58544D",
+"P@	c #57534C",
+"Q@	c #56524B",
+"R@	c #56514B",
+"S@	c #55514A",
+"T@	c #54504A",
+"U@	c #535049",
+"V@	c #726F69",
+"W@	c #716F69",
+"X@	c #514D47",
+"Y@	c #514C46",
+"Z@	c #4A4640",
+"`@	c #37342E",
+" #	c #423F37",
+".#	c #413D36",
+"+#	c #67645D",
+"@#	c #66635D",
+"##	c #35332D",
+"$#	c #4D4A42",
+"%#	c #3F3C35",
+"&#	c #66635C",
+"*#	c #65625C",
+"=#	c #3D3933",
+"-#	c #3B3831",
+";#	c #34322C",
+">#	c #4D4A41",
+",#	c #7B7770",
+"'#	c #7B776F",
+")#	c #7A776F",
+"!#	c #7A766F",
+"~#	c #79766E",
+"{#	c #78756E",
+"]#	c #78756D",
+"^#	c #77736D",
+"/#	c #76736C",
+"(#	c #75726B",
+"_#	c #75716A",
+":#	c #74716A",
+"<#	c #737069",
+"[#	c #736F69",
+"}#	c #726F68",
+"|#	c #716E68",
+"1#	c #706D67",
+"2#	c #86837D",
+"3#	c #85827C",
+"4#	c #6F6C66",
+"5#	c #625F59",
+"6#	c #393731",
+"7#	c #080706",
+"8#	c #4C4940",
+"9#	c #555149",
+"0#	c #66625A",
+"a#	c #65615A",
+"b#	c #646159",
+"c#	c #636058",
+"d#	c #635F58",
+"e#	c #625E57",
+"f#	c #615D56",
+"g#	c #605C56",
+"h#	c #5F5C55",
+"i#	c #5F5B54",
+"j#	c #5E5B54",
+"k#	c #5E5A53",
+"l#	c #5D5953",
+"m#	c #5C5952",
+"n#	c #5C5851",
+"o#	c #58554F",
+"p#	c #58544F",
+"q#	c #57534D",
+"r#	c #4F4C46",
+"s#	c #4B483F",
+"t#	c #4D4840",
+"u#	c #3F3B34",
+"v#	c #3E3A33",
+"w#	c #3A3730",
+"x#	c #39362F",
+"y#	c #322F2A",
+"z#	c #4A463F",
+"A#	c #49463D",
+"B#	c #3C3832",
+"C#	c #3B3731",
+"D#	c #35322D",
+"E#	c #3F3C34",
+"F#	c #3C3831",
+"G#	c #3A3630",
+"H#	c #39352F",
+"I#	c #38342E",
+"J#	c #37342D",
+"K#	c #36332D",
+"L#	c #35322C",
+"M#	c #34312B",
+"N#	c #33302A",
+"O#	c #040403",
+"P#	c #0E0D0C",
+"Q#	c #0D0D0B",
+"R#	c #0C0B0A",
+"S#	c #0B0B09",
+"T#	c #0A0A08",
+"U#	c #0A0908",
+"V#	c #090908",
+"W#	c #0A0A09",
+"X#	c #050404",
+"    .                                                           ",
+"    + @ # $ %                                                   ",
+"  & * = - ; > , ' ) !                                           ",
+"  ~ { = ] ^ / ( = _ : < [ } |                                   ",
+"  1 2 3 4 5 / 6 = 7 / / 8 = 9 0 a b                             ",
+"    c d e f g h = i / / { = 9 ^ j k l m n o                     ",
+"            p q r s t u v = w x / y = z A B C D E F             ",
+"                  G H I J K L M / N = O / / P = Q R A S T U     ",
+"                          V W X Y Z `  .../ +.@.#.$.%.&.*.=.-.  ",
+"                                  c ;.>.,.'.).!.~.{.{.].^./.(.  ",
+"_.:.<.[.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.{.k.l.m.n.  ",
+"o.p.q.r.j s.t.q.u.v.s.^.q.q.w.s.x.y.z.A.s.B.C.D.E.F.G.H.I.J.K.  ",
+"L.M.= = N./ O.P.= Q./ R.S.= T.U.V.W.= X.Y./ Z.`. +.+++@+#+< K.  ",
+"$+%+&+= *+=+; -+= ;+/ / >+= h.,+/ '+= )+!+/ ~+{+]+^+/+/+H.(+_+  ",
+":+<+[+}+|+1+2+3+4+5+6+s.7+8+W.9+0+,+a+a+b+c+d+e+f+{.{.{.{.G.g+  ",
+"h+i+j+k+l+m+n+o+p+q+r+s+i+t+t+u+v+v+w+x+y+z+z+A+B+C+D+{.E+].F+  ",
+"h+i+o+m+G+H+I+n+J+K+L+s+M+y+A+N+O+O+P+Q+R+z+S+T+C+{.E+E+/+(+p   ",
+"h+U+V+W+W+X+Y+Z+`+ @.@+@@@@@#@#@).$@%@&@&@*@Q.=@=@-@;@>@,@'@p   ",
+")@!@~@I+{@J+K+]@^@M+/@A+(@_@P+P+Q+R+B+:@<@C+{.E+[@/+j.}@|@1@p   ",
+"2@3@n+{@K+]@s+4@y+/@N+(@O+P+Q+Q+z+B+T+C+{.{.E+[@c+5@..|@6@7@p   ",
+"8@9@r+K+L+^@y+0@N+(@O+a@b@Q+z+B+T+<@c@{.E+0+d@j.e@|@6@H.f@g@p   ",
+"8@h@i@j@k@l@m@m@n@n@o@j@p@p@q@r@#+#+s@t@u@u@v@w@x@y@y@z@A@t B@  ",
+"8@v+C@D@%.D@E@F@G@H@I@J@K@L@M@N@O@i.P@Q@R@S@T@U@V@W@X@Y@Z@`@B@  ",
+"8@6+0@A+(@_@a@P+Q+R+B+:@<@C+{.s.0+/+j.}@|@ #H..#+#@#G.].(+##B@  ",
+":+$#(@(@O+P+Q+Q+B+B+T+C+{.{.E+/+j.5@..|@6@^+k.%#&#*#=#(+-#;#B@  ",
+"  >#q+,#,#'#)#!#~#{#]#,@^#/#(#(#_#:#<#[#}#|#|#1#2#3#4#N.5#6#7#  ",
+"  8#9#0#0#0#a#b#c#d#e#e#f#g#h#i#j#k#l#m#n#K@5 x o#p#R q#r###7#  ",
+"  s#t#z+:@T+C+C+{.E+/+d@5@}@|@ #.#f@%#u#v#].(+'.1@w#x#g@`@y#7#  ",
+"  z#B+:@A#C+{.E+[@/+j.}@|@ #^+.#k.%#G.].(+B#C#w#t g@`@`@`@y#7#  ",
+"  D#E#u#u#k.k.%#k.u#u#v#].(+F#C#w#G#H#g@I#J#K#D#L#M#M#M#M#N#O#  ",
+"    P#Q#_+R#S#T#U#U#U#U#U#V#V#V#V#V#V#V#V#V#V#F+F+V#V#T#W#X#    ",
+"                                                                "};
--- kino-1.3.4.orig/debian/menu
+++ kino-1.3.4/debian/menu
@@ -0,0 +1,2 @@
+?package(kino):needs="X11" section="Applications/Video"\
+  title="Kino" command="/usr/bin/kino"
--- kino-1.3.4.orig/debian/patches/100_libav_9.diff
+++ kino-1.3.4/debian/patches/100_libav_9.diff
@@ -0,0 +1,69 @@
+Description: Port to libav 9 API.
+Author: Moritz Mühlenhoff <jmm@inutil.org>
+Bug-Debian: http://bugs.debian.org/720661
+Last-Update: 2013-09-10
+
+diff -aur kino-1.3.4.orig/src/frame.cc kino-1.3.4/src/frame.cc
+--- kino-1.3.4.orig/src/frame.cc	2013-09-06 00:14:45.224000000 +0200
++++ kino-1.3.4/src/frame.cc	2013-09-06 00:15:26.492000000 +0200
+@@ -101,8 +101,8 @@
+ #if defined(HAVE_LIBAVCODEC)
+ 	pthread_mutex_lock( &avcodec_mutex );
+ 	av_register_all();
+-	libavcodec = avcodec_alloc_context();
+-	avcodec_open( libavcodec, avcodec_find_decoder( CODEC_ID_DVVIDEO ) );
++	libavcodec = avcodec_alloc_context3(NULL);
++	avcodec_open2( libavcodec, avcodec_find_decoder( CODEC_ID_DVVIDEO ), NULL );
+ 	pthread_mutex_unlock( &avcodec_mutex );
+ 	data = ( unsigned char* ) av_mallocz( 144000 );
+ #if defined(HAVE_SWSCALE)
+@@ -1364,12 +1364,10 @@
+ 			vst->sample_aspect_ratio = avcodecEncoder->sample_aspect_ratio;
+ #endif
+ 			avcodecEncoder->thread_count = 2;
+-			avcodec_thread_init( avcodecEncoder, avcodecEncoder->thread_count );
+ 			avcodecEncoder->time_base= isPAL ? ( AVRational ){ 1, 25 } : ( AVRational ){ 1001, 30000 };
+ 			avcodecEncoder->pix_fmt = isPAL ? PIX_FMT_YUV420P : PIX_FMT_YUV411P;
+ 			avcodecEncoder->flags |= CODEC_FLAG_INTERLACED_DCT;
+-			av_set_parameters( avformatEncoder, NULL );
+-			avcodec_open( avcodecEncoder, avcodec_find_encoder( CODEC_ID_DVVIDEO ) );
++			avcodec_open2( avcodecEncoder, avcodec_find_encoder( CODEC_ID_DVVIDEO ), NULL );
+ 			av_new_packet( &avpacketEncoder, 144000 );
+ 			tempImage = ( uint8_t* ) av_malloc(
+ 				avpicture_get_size( avcodecEncoder->pix_fmt, avcodecEncoder->width, avcodecEncoder->height ) );
+@@ -1475,19 +1473,15 @@
+ 
+ 			// Encode
+ 			bytesInFrame = avcodec_encode_video( avcodecEncoder, avpacketEncoder.data, size, output );
+-			url_open_buf( &avformatEncoder->pb, data, bytesInFrame, URL_WRONLY );
++			avformatEncoder->pb = avio_alloc_context(data, bytesInFrame, 0, NULL, NULL, NULL, NULL);
+ 			avpacketEncoder.size = bytesInFrame;
+ 			if ( !isEncoderHeaderWritten )
+ 			{
+-				av_write_header( avformatEncoder );
++				avformat_write_header(avformatEncoder, NULL);
+ 				isEncoderHeaderWritten = true;
+ 			}
+ 			av_write_frame( avformatEncoder, &avpacketEncoder );
+-#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0)
+-			url_close_buf( avformatEncoder->pb );
+-#else
+-			url_close_buf( &avformatEncoder->pb );
+-#endif
++			avio_close(avformatEncoder->pb);
+ 
+ 			// Update this frame's metadata
+ 			ExtractHeader();
+diff -aur kino-1.3.4.orig/src/frame.cc kino-1.3.4/src/frame.cc
+--- kino-1.3.4.orig/src/frame.cc	2013-09-06 01:16:23.356000000 +0200
++++ kino-1.3.4/src/frame.cc	2013-09-06 01:21:57.416000000 +0200
+@@ -1338,7 +1338,7 @@
+ 		if ( avformatEncoder )
+ 		{
+ 			avformatEncoder->oformat = av_guess_format( "dv", NULL, NULL );
+-			AVStream* vst = av_new_stream( avformatEncoder, 0 );
++			AVStream* vst = avformat_new_stream( avformatEncoder, NULL );
+ 			vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+ 			vst->codec->codec_id = CODEC_ID_DVVIDEO;
+ 			vst->codec->bit_rate = 25000000;
+
--- kino-1.3.4.orig/debian/patches/10_uptodate_configure.diff
+++ kino-1.3.4/debian/patches/10_uptodate_configure.diff
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_uptodata_configure.dpatch by Paul Brossier <piem@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: this patch allows to run up-to-date configure scripts
+## DP: see /usr/share/doc/autotools-dev/README.Debian.gz            
+
+@DPATCH@
+--- a/config.sub
++++ b/config.sub
+@@ -1,4 +1,8 @@
+ #! /bin/sh
++if [ -x /usr/share/misc/config.sub ]; then
++    exec /usr/share/misc/config.sub "$@"
++fi
++
+ # Configuration validation subroutine script.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+--- a/config.guess
++++ b/config.guess
+@@ -1,4 +1,8 @@
+ #! /bin/sh
++if [ -x /usr/share/misc/config.guess ]; then
++    exec /usr/share/misc/config.guess "$@"
++fi
++
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
--- kino-1.3.4.orig/debian/patches/110_libav10.diff
+++ kino-1.3.4/debian/patches/110_libav10.diff
@@ -0,0 +1,59 @@
+Description: Port to libav 10 API.
+Author: Anton Khirnov <anton@khirnov.net>
+Bug-Debian: http://bugs.debian.org/739426
+Last-Update: 2014-03-01
+
+Index: kino-1.3.4/src/frame.cc
+===================================================================
+--- kino-1.3.4.orig/src/frame.cc	2014-03-01 07:45:28.394100209 +0000
++++ kino-1.3.4/src/frame.cc	2014-03-01 07:50:16.111211573 +0000
+@@ -102,7 +102,7 @@
+ 	pthread_mutex_lock( &avcodec_mutex );
+ 	av_register_all();
+ 	libavcodec = avcodec_alloc_context3(NULL);
+-	avcodec_open2( libavcodec, avcodec_find_decoder( CODEC_ID_DVVIDEO ), NULL );
++	avcodec_open2( libavcodec, avcodec_find_decoder( AV_CODEC_ID_DVVIDEO ), NULL );
+ 	pthread_mutex_unlock( &avcodec_mutex );
+ 	data = ( unsigned char* ) av_mallocz( 144000 );
+ #if defined(HAVE_SWSCALE)
+@@ -1340,7 +1340,7 @@
+ 			avformatEncoder->oformat = av_guess_format( "dv", NULL, NULL );
+ 			AVStream* vst = avformat_new_stream( avformatEncoder, NULL );
+ 			vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+-			vst->codec->codec_id = CODEC_ID_DVVIDEO;
++			vst->codec->codec_id = AV_CODEC_ID_DVVIDEO;
+ 			vst->codec->bit_rate = 25000000;
+ 			vst->start_time = 0;
+ 			AVCodecContext *avcodecEncoder = vst->codec;
+@@ -1367,8 +1367,7 @@
+ 			avcodecEncoder->time_base= isPAL ? ( AVRational ){ 1, 25 } : ( AVRational ){ 1001, 30000 };
+ 			avcodecEncoder->pix_fmt = isPAL ? PIX_FMT_YUV420P : PIX_FMT_YUV411P;
+ 			avcodecEncoder->flags |= CODEC_FLAG_INTERLACED_DCT;
+-			avcodec_open2( avcodecEncoder, avcodec_find_encoder( CODEC_ID_DVVIDEO ), NULL );
+-			av_new_packet( &avpacketEncoder, 144000 );
++			avcodec_open2( avcodecEncoder, avcodec_find_encoder( AV_CODEC_ID_DVVIDEO ), NULL );
+ 			tempImage = ( uint8_t* ) av_malloc(
+ 				avpicture_get_size( avcodecEncoder->pix_fmt, avcodecEncoder->width, avcodecEncoder->height ) );
+ #if defined(HAVE_SWSCALE)
+@@ -1460,6 +1459,7 @@
+ 			int width = avcodecEncoder->width;
+ 			int height = avcodecEncoder->height;
+ 			size_t size = height > 480 ? 144000 : 120000;
++			int ret, got_output;
+ 
+ 			// Convert color space
+ 			avpicture_fill( ( AVPicture* )output, tempImage, avcodecEncoder->pix_fmt, width, height );
+@@ -1472,9 +1472,10 @@
+ #endif
+ 
+ 			// Encode
+-			bytesInFrame = avcodec_encode_video( avcodecEncoder, avpacketEncoder.data, size, output );
+-			avformatEncoder->pb = avio_alloc_context(data, bytesInFrame, 0, NULL, NULL, NULL, NULL);
+-			avpacketEncoder.size = bytesInFrame;
++			ret = avcodec_encode_video2( avcodecEncoder, &avpacketEncoder, output, &got_output);
++			if (ret < 0 || !got_output)
++			    return;
++			avformatEncoder->pb = avio_alloc_context(data, avpacketEncoder.size, 0, NULL, NULL, NULL, NULL);
+ 			if ( !isEncoderHeaderWritten )
+ 			{
+ 				avformat_write_header(avformatEncoder, NULL);
--- kino-1.3.4.orig/debian/patches/20_fix_bashism.diff
+++ kino-1.3.4/debian/patches/20_fix_bashism.diff
@@ -0,0 +1,114 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_fix_bashism.dpatch by Francesco Namuri <francesco@namuri.it>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: this patch fixes bashism found in the scripts's program.
+
+@DPATCH@
+--- a/scripts/help.sh
++++ b/scripts/help.sh
+@@ -9,13 +9,13 @@
+ 
+ # detect user agents
+ GNOME_BROWSER=`gconftool-2 --get /desktop/gnome/url-handlers/http/command | sed s/\"*%s\"*//`
+-which konqueror &> /dev/null
++which konqueror > /dev/null 2>&1
+ [ $? = 0 ] && KONQUEROR=konqueror
+-which firefox &> /dev/null
++which firefox > /dev/null 2>&1
+ [ $? = 0 ] && FIREFOX=firefox
+-which mozilla &> /dev/null
++which mozilla > /dev/null 2>&1
+ [ $? = 0 ] && MOZILLA=mozilla
+-which yelp &> /dev/null
++which yelp > /dev/null 2>&1
+ [ $? = 0 ] && YELP=yelp
+ 
+ # convert index to kino for docbook
+--- a/scripts/publish/bliptv_frame.sh
++++ b/scripts/publish/bliptv_frame.sh
+@@ -35,9 +35,11 @@
+ [ -z "$title" ] && title="Untitled"
+ 
+ echo Login to blip.tv
+-read -p "  Username: " username
++echo "Username: "
++read username
+ stty -echo
+-read -p "  Password: " password
++echo "Password: "
++read password
+ echo
+ stty echo
+ 
+@@ -60,4 +62,4 @@
+ 	echo $result
+ 	echo 'Close the window when you are finished reading this error.'
+ fi
+-read
++read nop
+--- a/scripts/publish/bliptv_project.sh
++++ b/scripts/publish/bliptv_project.sh
+@@ -58,13 +58,15 @@
+ ogg_file="${path}/${base}.ogg"
+ 
+ echo Login to blip.tv
+-read -p "  Username: " username
++echo "Username: "
++read username
+ stty -echo
+-read -p "  Password: " password
++echo "Password: "
++read password
+ echo
+ stty echo
+-echo
+-read -p "Do you want higher quality (slower and bigger to convert & upload)? [y/N] " quality
++echo "Do you want higher quality (slower and bigger to convert & upload)? [y/N] "
++read quality
+ 
+ title=$(getXmlAttributeValue 'title' "$project_file")
+ [ -z "$title" ] && title="Untitled"
+@@ -166,4 +168,4 @@
+ 	echo $result
+ 	echo 'Close the window when you are finished reading this error.'
+ fi
+-read
++read nop
+--- a/scripts/publish/echo.sh
++++ b/scripts/publish/echo.sh
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+ # A Kino publishing helper script that is used to display a message in a terminal window.
+ echo $@
+-read
++read nop
+ 
+--- a/scripts/publish/frame.sh
++++ b/scripts/publish/frame.sh
+@@ -7,9 +7,9 @@
+ project_title="$4"
+ 
+ if [ -n "$KINO_HOME" ] && [ -f "$KINO_HOME"/publish/frame.sh ]; then
+-	. "$KINO_HOME"/publish/frame.sh "$frame_file" "$project_id" "$scene_title" "$project_title"
++	."$KINO_HOME"/publish/frame.sh "$frame_file" "$project_id" "$scene_title" "$project_title"
+ elif [ -f "$HOME"/kino/publish/frame.sh ]; then
+-	. "$HOME"/kino/publish/frame.sh "$frame_file" "$project_id" "$scene_title" "$project_title"
++	."$HOME"/kino/publish/frame.sh "$frame_file" "$project_id" "$scene_title" "$project_title"
+ else
+ 	# detect terminal
+ 	GNOME_TERM=`gconftool-2 --get /desktop/gnome/applications/terminal/exec`
+--- a/scripts/publish/project.sh
++++ b/scripts/publish/project.sh
+@@ -15,9 +15,9 @@
+ 
+ 
+ if [ -n "$KINO_HOME" ] && [ -f "$KINO_HOME"/publish/project.sh ]; then
+-	. "$KINO_HOME"/publish/project.sh "$project_file" "$project_id" "$project_title"
++	."$KINO_HOME"/publish/project.sh "$project_file" "$project_id" "$project_title"
+ elif [ -f "$HOME"/kino/publish/project.sh ]; then
+-	. "$HOME"/kino/publish/project.sh "$project_file" "$project_id" "$project_title"
++	."$HOME"/kino/publish/project.sh "$project_file" "$project_id" "$project_title"
+ elif [ -n "$KINO_PUBLISH_PROJECT" ]; then
+ 	"$KINO_PUBLISH_PROJECT" "$project_file" "$project_id" "$project_title"
+ else
--- kino-1.3.4.orig/debian/patches/30_v4l1_includes.diff
+++ kino-1.3.4/debian/patches/30_v4l1_includes.diff
@@ -0,0 +1,22 @@
+--- a/ffmpeg/libavdevice/v4l.c
++++ b/ffmpeg/libavdevice/v4l.c
+@@ -26,7 +26,7 @@
+ #include <sys/mman.h>
+ #include <sys/time.h>
+ #define _LINUX_TIME_H 1
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ #include <time.h>
+ 
+ typedef struct {
+--- a/src/v4l.h
++++ b/src/v4l.h
+@@ -40,7 +40,7 @@
+ 
+ #define _DEVICE_H_
+ #define _LINUX_TIME_H
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ 
+ #include "displayer.h"
+ 
--- kino-1.3.4.orig/debian/patches/80_move_doc.diff
+++ kino-1.3.4/debian/patches/80_move_doc.diff
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80_move_doc by  <piem@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: moving /u/s/kino/help to /u/s/doc/kino/help
+
+@DPATCH@
+--- a/src/commands.cc
++++ b/src/commands.cc
+@@ -424,7 +424,7 @@
+ void showHelp( const char *page )
+ {
+ 	extern char* g_help_language;
+-	std::string cmd = "\"" DATADIR "/kino/scripts/help.sh\" \"file://" DATADIR "/kino/help/";
++	std::string cmd = "\"" DATADIR "/kino/scripts/help.sh\" \"file://" DATADIR "/doc/kino/help/";
+ 	if ( page == NULL || strcmp( page, "" ) == 0 )
+ 		page = common->getCurrentPage()->getHelpPage().c_str();
+ 	cmd += std::string( g_help_language ) + std::string( "\" \"" ) + std::string( page ) + "\" &";
--- kino-1.3.4.orig/debian/patches/90_fix_ftbfs_libav_0.8.patch
+++ kino-1.3.4/debian/patches/90_fix_ftbfs_libav_0.8.patch
@@ -0,0 +1,62 @@
+Description: fix FTBFS with libav 0.8, by using non-deprecated functions
+Author: Fabrice Coutadeur<fabricesp@ubuntu.com>
+--- a/src/frame.cc
++++ b/src/frame.cc
+@@ -1063,7 +1063,12 @@
+ 	AVPicture dest;
+ 	int got_picture;
+ 
+-	avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() );
++	AVPacket pkt;
++	av_init_packet(&pkt);
++	pkt.data = data;
++	pkt.size = GetFrameSize();
++
++	avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt );
+ 	if ( got_picture )
+ 	{
+ 		avpicture_fill( &dest, static_cast<uint8_t*>( rgb ), PIX_FMT_RGB24, GetWidth(), GetHeight() );
+@@ -1123,7 +1128,12 @@
+ 	AVPicture output;
+ 	int got_picture;
+ 
+-	avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() );
++	AVPacket pkt;
++	av_init_packet(&pkt);
++	pkt.data = data;
++	pkt.size = GetFrameSize();
++
++	avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt );
+ 	if ( got_picture )
+ 	{
+ 		avpicture_fill( &output, static_cast<uint8_t*>( yuv ), PIX_FMT_YUV422, GetWidth(), GetHeight() );
+@@ -1156,7 +1166,12 @@
+ 	AVFrame *frame = avcodec_alloc_frame();
+ 	int got_picture;
+ 
+-	avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() );
++	AVPacket pkt;
++	av_init_packet(&pkt);
++	pkt.data = data;
++	pkt.size = GetFrameSize();
++
++	avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt );
+ 
+ 	int width = GetWidth(), height = GetHeight();
+ 
+@@ -1319,12 +1334,12 @@
+ #if defined(HAVE_LIBAVCODEC)
+ 	if ( avformatEncoder == NULL )
+ 	{
+-		avformatEncoder = av_alloc_format_context();
++		avformatEncoder = avformat_alloc_context();
+ 		if ( avformatEncoder )
+ 		{
+-			avformatEncoder->oformat = guess_format( "dv", NULL, NULL );
++			avformatEncoder->oformat = av_guess_format( "dv", NULL, NULL );
+ 			AVStream* vst = av_new_stream( avformatEncoder, 0 );
+-			vst->codec->codec_type = CODEC_TYPE_VIDEO;
++			vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+ 			vst->codec->codec_id = CODEC_ID_DVVIDEO;
+ 			vst->codec->bit_rate = 25000000;
+ 			vst->start_time = 0;
--- kino-1.3.4.orig/debian/patches/ffmpeg_2.9.patch
+++ kino-1.3.4/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,166 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
+Last-Update: <2015-11-02>
+
+--- 1.3.4.orig/src/frame.cc
++++ 1.3.4/src/frame.cc
+@@ -57,7 +57,7 @@ using std::endl;
+ #include "preferences.h"
+ 
+ #if LIBAVUTIL_VERSION_INT >= (50<<16)
+-#define PIX_FMT_YUV422 PIX_FMT_YUYV422
++#define AV_PIX_FMT_YUV422 AV_PIX_FMT_YUYV422
+ #endif
+ 
+ 
+@@ -1059,7 +1059,7 @@ void Frame::ExtractHeader( void )
+ int Frame::ExtractRGB( void * rgb )
+ {
+ #if defined(HAVE_LIBAVCODEC)
+-	AVFrame *frame = avcodec_alloc_frame();
++	AVFrame *frame = av_frame_alloc();
+ 	AVPicture dest;
+ 	int got_picture;
+ 
+@@ -1071,17 +1071,17 @@ int Frame::ExtractRGB( void * rgb )
+ 	avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt );
+ 	if ( got_picture )
+ 	{
+-		avpicture_fill( &dest, static_cast<uint8_t*>( rgb ), PIX_FMT_RGB24, GetWidth(), GetHeight() );
++		avpicture_fill( &dest, static_cast<uint8_t*>( rgb ), AV_PIX_FMT_RGB24, GetWidth(), GetHeight() );
+ #if defined(HAVE_SWSCALE)
+ 		if ( !imgConvertRgbCtx )
+ 			imgConvertRgbCtx = sws_getContext( libavcodec->width, libavcodec->height, libavcodec->pix_fmt,
+-				GetWidth(), GetHeight(), PIX_FMT_RGB24, SWS_FAST_BILINEAR, NULL, NULL, NULL );
++				GetWidth(), GetHeight(), AV_PIX_FMT_RGB24, SWS_FAST_BILINEAR, NULL, NULL, NULL );
+ 		sws_scale( imgConvertRgbCtx, frame->data, frame->linesize, 0, libavcodec->height, dest.data, dest.linesize );
+ #else
+-		img_convert( &dest, PIX_FMT_RGB24, reinterpret_cast<AVPicture*>( frame ), libavcodec->pix_fmt, GetWidth(), GetHeight() );
++		img_convert( &dest, AV_PIX_FMT_RGB24, reinterpret_cast<AVPicture*>( frame ), libavcodec->pix_fmt, GetWidth(), GetHeight() );
+ #endif
+ 	}
+-	av_free( frame );
++	av_frame_free( &frame );
+ #else
+ 	unsigned char *pixels[ 3 ];
+ 	int pitches[ 3 ];
+@@ -1124,7 +1124,7 @@ int Frame::ExtractPreviewRGB( void *rgb )
+ int Frame::ExtractYUV( void *yuv )
+ {
+ #if defined(HAVE_LIBAVCODEC)
+-	AVFrame *frame = avcodec_alloc_frame();;
++	AVFrame *frame = av_frame_alloc();;
+ 	AVPicture output;
+ 	int got_picture;
+ 
+@@ -1136,17 +1136,17 @@ int Frame::ExtractYUV( void *yuv )
+ 	avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt );
+ 	if ( got_picture )
+ 	{
+-		avpicture_fill( &output, static_cast<uint8_t*>( yuv ), PIX_FMT_YUV422, GetWidth(), GetHeight() );
++		avpicture_fill( &output, static_cast<uint8_t*>( yuv ), AV_PIX_FMT_YUV422, GetWidth(), GetHeight() );
+ #if defined(HAVE_SWSCALE)
+ 		if ( !imgConvertYuvCtx )
+ 			imgConvertYuvCtx = sws_getContext( libavcodec->width, libavcodec->height, libavcodec->pix_fmt,
+-				GetWidth(), GetHeight(), PIX_FMT_YUV422, SWS_FAST_BILINEAR, NULL, NULL, NULL );
++				GetWidth(), GetHeight(), AV_PIX_FMT_YUV422, SWS_FAST_BILINEAR, NULL, NULL, NULL );
+ 		sws_scale( imgConvertYuvCtx, frame->data, frame->linesize, 0, libavcodec->height, output.data, output.linesize );
+ #else
+-		img_convert( &output, PIX_FMT_YUV422, (AVPicture *)frame, libavcodec->pix_fmt, GetWidth(), GetHeight() );
++		img_convert( &output, AV_PIX_FMT_YUV422, (AVPicture *)frame, libavcodec->pix_fmt, GetWidth(), GetHeight() );
+ #endif
+ 	}
+-	av_free( frame );
++	av_frame_free( &frame );
+ #else
+ 	unsigned char *pixels[ 3 ];
+ 	int pitches[ 3 ];
+@@ -1163,7 +1163,7 @@ int Frame::ExtractYUV( void *yuv )
+ int Frame::ExtractYUV420( uint8_t *yuv, uint8_t *output[ 3 ] )
+ {
+ #if defined(HAVE_LIBAVCODEC)
+-	AVFrame *frame = avcodec_alloc_frame();
++	AVFrame *frame = av_frame_alloc();
+ 	int got_picture;
+ 
+ 	AVPacket pkt;
+@@ -1175,7 +1175,7 @@ int Frame::ExtractYUV420( uint8_t *yuv, uint8_t *output[ 3 ] )
+ 
+ 	int width = GetWidth(), height = GetHeight();
+ 
+-	if ( libavcodec->pix_fmt == PIX_FMT_YUV420P )   // PAL
++	if ( libavcodec->pix_fmt == AV_PIX_FMT_YUV420P )   // PAL
+ 	{
+ 		int h2 = height / 2;
+ 		int w2 = width / 2;
+@@ -1203,7 +1203,7 @@ int Frame::ExtractYUV420( uint8_t *yuv, uint8_t *output[ 3 ] )
+ 			}
+ 		}
+ 	}
+-	else // libavcodec.pix_fmt == PIX_FMT_YUV411P // NTSC
++	else // libavcodec.pix_fmt == AV_PIX_FMT_YUV411P // NTSC
+ 	{
+ 		int w4 = width / 4;
+ 
+@@ -1233,7 +1233,7 @@ int Frame::ExtractYUV420( uint8_t *yuv, uint8_t *output[ 3 ] )
+ 			}
+ 		}
+ 	}
+-	av_free( frame );
++	av_frame_free( &frame );
+ #else
+ 	unsigned char *pixels[ 3 ];
+ 	int pitches[ 3 ];
+@@ -1365,13 +1365,13 @@ bool Frame::CreateEncoder( bool isPAL, bool isWide )
+ #endif
+ 			avcodecEncoder->thread_count = 2;
+ 			avcodecEncoder->time_base= isPAL ? ( AVRational ){ 1, 25 } : ( AVRational ){ 1001, 30000 };
+-			avcodecEncoder->pix_fmt = isPAL ? PIX_FMT_YUV420P : PIX_FMT_YUV411P;
++			avcodecEncoder->pix_fmt = isPAL ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_YUV411P;
+ 			avcodecEncoder->flags |= CODEC_FLAG_INTERLACED_DCT;
+ 			avcodec_open2( avcodecEncoder, avcodec_find_encoder( AV_CODEC_ID_DVVIDEO ), NULL );
+ 			tempImage = ( uint8_t* ) av_malloc(
+ 				avpicture_get_size( avcodecEncoder->pix_fmt, avcodecEncoder->width, avcodecEncoder->height ) );
+ #if defined(HAVE_SWSCALE)
+-			imgConvertEncoderCtx = sws_getContext( avcodecEncoder->width, avcodecEncoder->height, PIX_FMT_RGB24,
++			imgConvertEncoderCtx = sws_getContext( avcodecEncoder->width, avcodecEncoder->height, AV_PIX_FMT_RGB24,
+ 				avcodecEncoder->width, avcodecEncoder->height, avcodecEncoder->pix_fmt, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+ #endif
+ 		}
+@@ -1450,8 +1450,8 @@ void Frame::EncodeRGB( uint8_t *rgb )
+ 	if ( CreateEncoder( IsPAL(), IsWide() ) )
+ 	{
+ #if defined(HAVE_LIBAVCODEC)
+-		AVFrame *input = avcodec_alloc_frame();
+-		AVFrame *output = avcodec_alloc_frame();
++		AVFrame *input = av_frame_alloc();
++		AVFrame *output = av_frame_alloc();
+ 
+ 		if ( input && output )
+ 		{
+@@ -1463,12 +1463,12 @@ void Frame::EncodeRGB( uint8_t *rgb )
+ 
+ 			// Convert color space
+ 			avpicture_fill( ( AVPicture* )output, tempImage, avcodecEncoder->pix_fmt, width, height );
+-			avpicture_fill( ( AVPicture* )input, rgb, PIX_FMT_RGB24, width, height );
++			avpicture_fill( ( AVPicture* )input, rgb, AV_PIX_FMT_RGB24, width, height );
+ #if defined(HAVE_SWSCALE)
+ 			sws_scale( imgConvertEncoderCtx, input->data, input->linesize, 0, height,
+ 				output->data, output->linesize);
+ #else
+-			img_convert( ( AVPicture* )output, avcodecEncoder->pix_fmt, ( AVPicture* )input, PIX_FMT_RGB24, width, height );
++			img_convert( ( AVPicture* )output, avcodecEncoder->pix_fmt, ( AVPicture* )input, AV_PIX_FMT_RGB24, width, height );
+ #endif
+ 
+ 			// Encode
+@@ -1490,8 +1490,8 @@ void Frame::EncodeRGB( uint8_t *rgb )
+ 			// Force the output to be IEC 61834
+ 			data[4] &= 0xf8;
+ 
+-			av_free( output );
+-			av_free( input );
++			av_frame_free( &output );
++			av_frame_free( &input );
+ 		}
+ #else
+ 		if ( Preferences::getInstance().dvTwoPassEncoder )
--- kino-1.3.4.orig/debian/patches/series
+++ kino-1.3.4/debian/patches/series
@@ -0,0 +1,8 @@
+10_uptodate_configure.diff
+20_fix_bashism.diff
+30_v4l1_includes.diff
+80_move_doc.diff
+90_fix_ftbfs_libav_0.8.patch
+100_libav_9.diff
+110_libav10.diff
+ffmpeg_2.9.patch
--- kino-1.3.4.orig/debian/rules
+++ kino-1.3.4/debian/rules
@@ -0,0 +1,79 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# This file is public domain software, originally written by Joey Hess. 
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/quilt/quilt.make
+
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+ifeq ($(DEB_HOST_ARCH_OS),)
+  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))
+  ifeq ($(DEB_HOST_ARCH_OS),gnu)
+      DEB_HOST_ARCH_OS := hurd
+  endif
+endif
+
+build: build-stamp
+build-stamp: patch
+	dh_testdir
+	# autoreconf
+	./configure --prefix=/usr --mandir=/usr/share/man \
+		--enable-hotplug-script-dir=/etc/hotplug/usb \
+		--enable-hotplug-usermap-dir=/etc/hotplug/usb \
+		--enable-quicktime --with-avcodec --without-dv1394 \
+		--disable-local-ffmpeg
+	$(MAKE)
+	cd po; intltool-update --verbose -p
+	touch build-stamp
+
+clean: clean1st unpatch
+clean1st:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	[ ! -f Makefile ] || $(MAKE) distclean
+	rm -f debian/shlibs.local config.log
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+	$(MAKE) DESTDIR="$(CURDIR)/debian/kino/" install
+	rm -r $(CURDIR)/debian/kino/usr/etc
+	rm `find $(CURDIR)/debian/kino -name '*.la'`
+	# install icon
+	dh_install debian/kino.xpm usr/share/pixmaps
+	mv $(CURDIR)/debian/kino/usr/share/kino/help $(CURDIR)/debian/kino/usr/share/doc/kino/
+
+# Build architecture-independent files here.
+binary-indep: build install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installmenu
+	dh_installman
+	dh_installchangelogs ChangeLog
+	dh_installudev
+	dh_link
+	dh_strip
+	dh_compress -Xkino.xml
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+	dh_gencontrol -pkino -- -Vudev-hotplug="udev | hotplug"
+else
+	dh_gencontrol -pkino
+endif
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch clean1st
--- kino-1.3.4.orig/debian/watch
+++ kino-1.3.4/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/kino/kino-(\d\.\d\.\d)\.tar\.gz