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

[Iain Lane (none)]

The following commit has been merged in the master branch:
commit cd8530116dcdc1f1fb4f130fb965280822ce6b3b
Merge: ab92ea63d01724ec4a762ac14981e5836d282a27 bf6873b51c0c1e7d72499c537edba1978ebb7b7c
Author: Iain Lane <iain at jacob.(none)>
Date:   Tue Apr 7 12:48:55 2009 +0100

    Merge commit 'upstream/2.0'
    
    Conflicts:
    	AssemblyInfo.cs
    	ValaBinding.addin.xml
    	configure
    	configure.in

diff --combined configure
index ba86721,cda263a..7e31350
--- 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 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>.
  #
@@@ -574,8 -574,8 +578,13 @@@ 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
@@@ -1215,7 -1215,7 +1224,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 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]...
  
@@@ -1281,7 -1281,7 +1294,11 @@@ f
  
  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
  
@@@ -1409,7 -1409,7 +1426,11 @@@ f
  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,
@@@ -1423,7 -1423,7 +1444,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 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 $@
@@@ -2114,7 -2114,7 +2139,11 @@@ f
  
  # 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
@@@ -2364,7 -2364,7 +2393,11 @@@ f
  
  
  
++<<<<<<< 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
@@@ -2882,7 -2882,7 +2915,11 @@@ f
  
  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
@@@ -4446,7 -4446,7 +4483,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 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
@@@ -4489,7 -4489,7 +4530,11 @@@ 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