[SCM] zynjacku packaging branch, master, updated. upstream/5-34-g193b8b6

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 193b8b65fa399348817fbd25786f4b98f40e0c33
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Oct 12 19:01:02 2009 +0200

    solved issue git-import-orig

diff --git a/configure b/configure
index 1ec96ef..405fb58 100755
--- a/configure
+++ b/configure
@@ -1,10 +1,6 @@
 #! /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.
@@ -730,13 +726,8 @@ 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.
@@ -1448,11 +1439,7 @@ if test "$ac_init_help" = "long"; then
   # 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]...
 
@@ -1522,11 +1509,7 @@ fi
 
 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
 
@@ -1651,11 +1634,7 @@ fi
 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,
@@ -1669,11 +1648,7 @@ cat >config.log <<_ACEOF
 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 $@
@@ -2363,11 +2338,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='zynjacku'
-<<<<<<< HEAD:configure
- VERSION='5.1'
-=======
  VERSION='5.2'
->>>>>>> upstream/5.2:configure
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21115,11 +21086,7 @@ exec 6>&1
 # 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
@@ -21172,11 +21139,7 @@ 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 --git a/configure.ac b/configure.ac
index 3c28edf..759de4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,11 +20,7 @@
 #
 
 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 --git a/zynworld/host.py b/zynworld/host.py
index bf66cd8..9e87a09 100644
--- a/zynworld/host.py
+++ b/zynworld/host.py
@@ -31,14 +31,11 @@ from math import pi, sin, cos, atan2
 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