[SCM] zynjacku packaging branch, master, updated. upstream/5-28-g8610ab7

Mon Oct 12 16:31:54 UTC 2009

The following commit has been merged in the master branch:
commit 8610ab7592fec41c138175dd378ce3d3b8472ddd
Merge: abedb6ddbc2f5a364f8905b922ef9ffd008f609b ccaf4f6692ea6f53716160cf609354ecdd4965e5
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Oct 12 18:29:44 2009 +0200

    Merge commit 'upstream/5.2'
    
    Conflicts:
    	configure
    	configure.ac
    	zynworld/host.py

diff --combined configure
index bbef504,405fb58..1ec96ef

--- a/configure
+++ b/configure
@@@ -1,6 -1,6 +1,10 @@@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
++<<<<<<< HEAD:configure
 +# Generated by GNU Autoconf 2.61 for zynjacku 5.1.
++=======
+ # Generated by GNU Autoconf 2.61 for zynjacku 5.2.
++>>>>>>> upstream/5.2:configure
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
  # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@@ -726,8 -726,8 +730,13 @@@ SHELL=${CONFIG_SHELL-/bin/sh
  # Identity of this package.
  PACKAGE_NAME='zynjacku'
  PACKAGE_TARNAME='zynjacku'
++<<<<<<< HEAD:configure
 +PACKAGE_VERSION='5.1'
 +PACKAGE_STRING='zynjacku 5.1'
++=======
+ PACKAGE_VERSION='5.2'
+ PACKAGE_STRING='zynjacku 5.2'
++>>>>>>> upstream/5.2:configure
  PACKAGE_BUGREPORT=''
  
  # Factoring default headers for most tests.
@@@ -1439,7 -1439,7 +1448,11 @@@ if test "$ac_init_help" = "long"; the
    # Omit some internal or obsolete options to make the list less imposing.
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
++<<<<<<< HEAD:configure
 +\`configure' configures zynjacku 5.1 to adapt to many kinds of systems.
++=======
+ \`configure' configures zynjacku 5.2 to adapt to many kinds of systems.
++>>>>>>> upstream/5.2:configure
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
  
@@@ -1509,7 -1509,7 +1522,11 @@@ f
  
  if test -n "$ac_init_help"; then
    case $ac_init_help in
++<<<<<<< HEAD:configure
 +     short | recursive ) echo "Configuration of zynjacku 5.1:";;
++=======
+      short | recursive ) echo "Configuration of zynjacku 5.2:";;
++>>>>>>> upstream/5.2:configure
     esac
    cat <<\_ACEOF
  
@@@ -1634,7 -1634,7 +1651,11 @@@ f
  test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
++<<<<<<< HEAD:configure
 +zynjacku configure 5.1
++=======
+ zynjacku configure 5.2
++>>>>>>> upstream/5.2:configure
  generated by GNU Autoconf 2.61
  
  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@@ -1648,7 -1648,7 +1669,11 @@@ cat >config.log <<_ACEO
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
++<<<<<<< HEAD:configure
 +It was created by zynjacku $as_me 5.1, which was
++=======
+ It was created by zynjacku $as_me 5.2, which was
++>>>>>>> upstream/5.2:configure
  generated by GNU Autoconf 2.61.  Invocation command line was
  
    $ $0 $@
@@@ -2338,7 -2338,7 +2363,11 @@@ f
  
  # Define the identity of the package.
   PACKAGE='zynjacku'
++<<<<<<< HEAD:configure
 + VERSION='5.1'
++=======
+  VERSION='5.2'
++>>>>>>> upstream/5.2:configure
  
  
  cat >>confdefs.h <<_ACEOF
@@@ -21086,7 -21086,7 +21115,11 @@@ exec 6>&
  # report actual input values of CONFIG_FILES etc. instead of their
  # values after options handling.
  ac_log="
++<<<<<<< HEAD:configure
 +This file was extended by zynjacku $as_me 5.1, which was
++=======
+ This file was extended by zynjacku $as_me 5.2, which was
++>>>>>>> upstream/5.2:configure
  generated by GNU Autoconf 2.61.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
@@@ -21139,7 -21139,7 +21172,11 @@@ Report bugs to <bug-autoconf at gnu.org>.
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
++<<<<<<< HEAD:configure
 +zynjacku config.status 5.1
++=======
+ zynjacku config.status 5.2
++>>>>>>> upstream/5.2:configure
  configured by $0, generated by GNU Autoconf 2.61,
    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
diff --combined configure.ac
index 2c122e9,759de4e..3c28edf
--- a/configure.ac
+++ b/configure.ac
@@@ -20,7 -20,7 +20,11 @@@
  #
  
  AC_PREREQ(2.61)
++<<<<<<< HEAD:configure.ac
 +AC_INIT(zynjacku, 5.1)
++=======
+ AC_INIT(zynjacku, 5.2)
++>>>>>>> upstream/5.2:configure.ac
  AC_CONFIG_AUX_DIR(config)
  AM_INIT_AUTOMAKE
  AC_CONFIG_HEADER([config.h])
diff --combined zynworld/host.py
index b2274ea,9e87a09..bf66cd8
--- a/zynworld/host.py
+++ b/zynworld/host.py
@@@ -31,6 -31,11 +31,14 @@@ from math import pi, sin, cos, atan
  from colorsys import hls_to_rgb, rgb_to_hls
  from distutils import sysconfig
  import lv2, zynjacku_c
++<<<<<<< HEAD:zynworld/host.py
++=======
+ 
+ try:
+     import lash
+ except:
+     lash = None
++>>>>>>> upstream/5.2:zynworld/host.py
  
  hint_uris = { "hidden": "http://home.gna.org/zynjacku/hints#hidden",
                "togglefloat": "http://home.gna.org/zynjacku/hints#togglefloat",

-- 
zynjacku packaging

