[Pkg-cli-apps-commits] [SCM] monodevelop-vala branch, master, updated. debian/1.9.3-1-4-gd22a7dd

[Jo Shields (none)]

The following commit has been merged in the master branch:
commit d22a7dd96f4c2ae8f3bb803bac7335ea7f362815
Author: Jo Shields <directhex at desire.(none)>
Date:   Tue Apr 7 20:58:08 2009 +0100

    Fix lingering conflicts in configure from bad merge

diff --git a/configure b/configure
index 7e31350..cda263a 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 monodevelop-vala 1.9.3.
-=======
 # Generated by GNU Autoconf 2.61 for monodevelop-vala 2.0.
->>>>>>> upstream/2.0:configure
 #
 # Report bugs to <taktaktaktaktaktaktaktaktaktak at gmail.com>.
 #
@@ -578,13 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='monodevelop-vala'
 PACKAGE_TARNAME='monodevelop-vala'
-<<<<<<< HEAD:configure
-PACKAGE_VERSION='1.9.3'
-PACKAGE_STRING='monodevelop-vala 1.9.3'
-=======
 PACKAGE_VERSION='2.0'
 PACKAGE_STRING='monodevelop-vala 2.0'
->>>>>>> upstream/2.0:configure
 PACKAGE_BUGREPORT='taktaktaktaktaktaktaktaktaktak at gmail.com'
 
 ac_subst_vars='SHELL
@@ -1224,11 +1215,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 monodevelop-vala 1.9.3 to adapt to many kinds of systems.
-=======
 \`configure' configures monodevelop-vala 2.0 to adapt to many kinds of systems.
->>>>>>> upstream/2.0:configure
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1294,11 +1281,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-<<<<<<< HEAD:configure
-     short | recursive ) echo "Configuration of monodevelop-vala 1.9.3:";;
-=======
      short | recursive ) echo "Configuration of monodevelop-vala 2.0:";;
->>>>>>> upstream/2.0:configure
    esac
   cat <<\_ACEOF
 
@@ -1426,11 +1409,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-<<<<<<< HEAD:configure
-monodevelop-vala configure 1.9.3
-=======
 monodevelop-vala configure 2.0
->>>>>>> upstream/2.0:configure
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1444,11 +1423,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 monodevelop-vala $as_me 1.9.3, which was
-=======
 It was created by monodevelop-vala $as_me 2.0, which was
->>>>>>> upstream/2.0:configure
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2139,11 +2114,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='monodevelop-vala'
-<<<<<<< HEAD:configure
- VERSION='1.9.3'
-=======
  VERSION='2.0'
->>>>>>> upstream/2.0:configure
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2393,11 +2364,7 @@ fi
 
 
 
-<<<<<<< HEAD:configure
-ASSEMBLY_VERSION=1.9.3.0
-=======
 ASSEMBLY_VERSION=2.0.0.0
->>>>>>> upstream/2.0:configure
 
 # Extract the first word of "mono", so it can be a program name with args.
 set dummy mono; ac_word=$2
@@ -2915,11 +2882,7 @@ fi
 
 MONOADDINS_REQUIRED_VERSION=0.3
 GTKSHARP_REQUIRED_VERSION=2.8.0
-<<<<<<< HEAD:configure
-MONODEVELOP_REQUIRED_VERSION=1.9.3
-=======
 MONODEVELOP_REQUIRED_VERSION=2.0
->>>>>>> upstream/2.0:configure
 
 
 pkg_failed=no
@@ -4483,11 +4446,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 monodevelop-vala $as_me 1.9.3, which was
-=======
 This file was extended by monodevelop-vala $as_me 2.0, which was
->>>>>>> upstream/2.0:configure
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4530,11 +4489,7 @@ Report bugs to <bug-autoconf at gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-<<<<<<< HEAD:configure
-monodevelop-vala config.status 1.9.3
-=======
 monodevelop-vala config.status 2.0
->>>>>>> upstream/2.0:configure
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

-- 
monodevelop-vala