From f0bc3d925d7ecd8de146642f98d8336fb8015979 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sat, 18 Jun 2011 22:02:40 +0000
Subject: [PATCH 1/4] Bump dependencies of Common and DBAL to 2.1.0RC1

---
 lib/vendor/doctrine-common | 2 +-
 lib/vendor/doctrine-dbal   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/vendor/doctrine-common b/lib/vendor/doctrine-common
index f87ee1be5..565674b9b 160000
--- a/lib/vendor/doctrine-common
+++ b/lib/vendor/doctrine-common
@@ -1 +1 @@
-Subproject commit f87ee1be5113a4a594827731dd1f5647cfc288fc
+Subproject commit 565674b9b376edbc5e31070e91fd85ea6dbd5d60
diff --git a/lib/vendor/doctrine-dbal b/lib/vendor/doctrine-dbal
index 0a9943872..f2c150d19 160000
--- a/lib/vendor/doctrine-dbal
+++ b/lib/vendor/doctrine-dbal
@@ -1 +1 @@
-Subproject commit 0a99438729e59bcb5262b22c06c782de4dfacbb0
+Subproject commit f2c150d194af4ac846362ef8c6bf002402ed5f63

From c6746d4a4a0b66bd7eeb8a2118dd3a786d88f753 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sat, 18 Jun 2011 22:07:14 +0000
Subject: [PATCH 2/4] Merge 2.0.x build.xml changes into master build.xml

---
 build.xml | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/build.xml b/build.xml
index e4c138ef6..e9d2115f0 100644
--- a/build.xml
+++ b/build.xml
@@ -100,6 +100,9 @@
         </copy>
         <exec command="sed 's/${version}-DEV/${version}/' ${build.dir}/doctrine-orm/Doctrine/ORM/Version.php > ${build.dir}/doctrine-orm/Doctrine/ORM/Version2.php" passthru="true" />
         <exec command="mv ${build.dir}/doctrine-orm/Doctrine/ORM/Version2.php ${build.dir}/doctrine-orm/Doctrine/ORM/Version.php" passthru="true" />
+	<delete dir="${build.dir}/doctrine-orm/Doctrine/Symfony/Component/Yaml/.git" includeemptydirs="true"/>
+        <delete dir="${build.dir}/doctrine-orm/Doctrine/Symfony/Component/Console/.git" includeemptydirs="true"/>
+
     </target>
 
     <target name="build" depends="test, build-orm"/>
@@ -166,7 +169,7 @@
            <dirroles key="bin">script</dirroles>
            <ignore>Doctrine/Common/</ignore>
            <ignore>Doctrine/DBAL/</ignore>
-           <ignore>Symfony/Component/Yaml/</ignore>
+	   <ignore>Symfony/Component/Yaml/</ignore>
            <ignore>Symfony/Component/Console/</ignore>
            <release>
                 <install as="doctrine" name="bin/doctrine" />
@@ -188,9 +191,12 @@
     </target>
 
     <target name="git-tag">
-        <exec command="grep '${version}' ${project.basedir}/lib/Doctrine/ORM/Version.php" checkreturn="true"/>
-        <exec command="git tag -a ${version}" passthru="true" />
-        <exec command="git push origin ${version}" passthru="true" />
+        <exec command="grep '${version}-DEV' ${project.basedir}/lib/Doctrine/ORM/Version.php" checkreturn="true"/>
+        <exec command="sed 's/${version}-DEV/${version}/' ${project.basedir}/lib/Doctrine/ORM/Version.php > ${project.basedir}/lib/Doctrine/ORM/Version2.php" passthru="true" />
+        <exec command="mv ${project.basedir}/lib/Doctrine/ORM/Version2.php ${project.basedir}/lib/Doctrine/ORM/Version.php" passthru="true" />
+        <exec command="git add ${project.basedir}/lib/Doctrine/ORM/Version.php" passthru="true" />
+        <exec command="git commit -m 'Release ${version}'" />
+        <exec command="git tag -m 'Tag ${version}' -a ${version}" passthru="true" />
     </target>
 
     <target name="pirum-release">
@@ -205,11 +211,10 @@
     <target name="update-dev-version">
         <exec command="grep '${version}' ${project.basedir}/lib/Doctrine/ORM/Version.php" checkreturn="true"/>
         <propertyprompt propertyName="next_version" defaultValue="${version}" promptText="Enter next version string (without -DEV)" />
-        <exec command="sed 's/${version}-DEV/${next_version}-DEV/' ${project.basedir}/lib/Doctrine/ORM/Version.php > ${project.basedir}/lib/Doctrine/ORM/Version2.php" passthru="true" />
+        <exec command="sed 's/${version}/${next_version}-DEV/' ${project.basedir}/lib/Doctrine/ORM/Version.php > ${project.basedir}/lib/Doctrine/ORM/Version2.php" passthru="true" />
         <exec command="mv ${project.basedir}/lib/Doctrine/ORM/Version2.php ${project.basedir}/lib/Doctrine/ORM/Version.php" passthru="true" />
         <exec command="git add ${project.basedir}/lib/Doctrine/ORM/Version.php" passthru="true" />
         <exec command="git commit -m 'Bump Dev Version to ${next_version}-DEV'" passthru="true" />
-        <exec command="git push origin master" passthru="true" />
     </target>
 
     <target name="release" depends="git-tag,build-packages,distribute-download,pirum-release,update-dev-version" />
@@ -232,7 +237,7 @@
                <php minimum_version="5.3.0" />
                <pear minimum_version="1.6.0" recommended_version="1.6.1" />
            </dependencies>
-           <ignore>bin</ignore>
+	   <ignore>bin/</ignore>
            <ignore>Doctrine/Common/</ignore>
            <ignore>Doctrine/DBAL/</ignore>
            <ignore>Doctrine/ORM/</ignore>
@@ -255,7 +260,7 @@
                <php minimum_version="5.3.0" />
                <pear minimum_version="1.6.0" recommended_version="1.6.1" />
            </dependencies>
-           <ignore>bin</ignore>
+	   <ignore>bin/</ignore>
            <ignore>Doctrine/Common/</ignore>
            <ignore>Doctrine/DBAL/</ignore>
            <ignore>Doctrine/ORM/</ignore>
@@ -268,4 +273,5 @@
         <exec command="sudo pirum add ${project.pirum_dir} ${project.basedir}/dist/DoctrineSymfonyYaml-${version}.tgz" dir="."  passthru="true" />
         <exec command="sudo pirum build ${project.pirum_dir}" passthru="true" />
     </target>
-</project>
\ No newline at end of file
+</project>
+

From 054ac220ac8c24eaeea082aeb4efa06d33318930 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sat, 18 Jun 2011 22:08:37 +0000
Subject: [PATCH 3/4] Release 2.1.0RC1

---
 lib/Doctrine/ORM/Version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php
index 002e28930..ac5e7463e 100644
--- a/lib/Doctrine/ORM/Version.php
+++ b/lib/Doctrine/ORM/Version.php
@@ -36,7 +36,7 @@ class Version
     /**
      * Current Doctrine Version
      */
-    const VERSION = '2.1.0BETA2-DEV';
+    const VERSION = '2.1.0RC1';
 
     /**
      * Compares a Doctrine version with the current one.

From 197744a57fc3cdc6ee58083fa48aaea37453cb37 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sat, 18 Jun 2011 22:08:52 +0000
Subject: [PATCH 4/4] Bump Dev Version to 2.1.0RC2-DEV

---
 lib/Doctrine/ORM/Version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php
index ac5e7463e..7041ecf03 100644
--- a/lib/Doctrine/ORM/Version.php
+++ b/lib/Doctrine/ORM/Version.php
@@ -36,7 +36,7 @@ class Version
     /**
      * Current Doctrine Version
      */
-    const VERSION = '2.1.0RC1';
+    const VERSION = '2.1.0RC2-DEV';
 
     /**
      * Compares a Doctrine version with the current one.