From 642c863bd358c33a3436ac376cb087cb92101071 Mon Sep 17 00:00:00 2001
From: "Jonathan H. Wage" <jonwage@gmail.com>
Date: Tue, 25 May 2010 15:52:13 -0400
Subject: [PATCH] Fixing build to place package.xml at root of package.

---
 build.properties.dev |  2 +-
 build.xml            | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/build.properties.dev b/build.properties.dev
index 4ad425aaa..20122b364 100644
--- a/build.properties.dev
+++ b/build.properties.dev
@@ -1,4 +1,4 @@
-version_name=2.0.0-ALPHA2
+version_name=2.0.0BETA2
 version=2.0.0
 stability=alpha
 build.dir=build
diff --git a/build.xml b/build.xml
index a2e5c2b6b..ef0137abf 100644
--- a/build.xml
+++ b/build.xml
@@ -17,8 +17,6 @@
     -->
     <fileset id="shared-artifacts" dir=".">
         <include name="LICENSE"/>
-        <include name="COPYRIGHT"/>
-        <include name="CHANGELOG"/>
     </fileset>
 
     <!--
@@ -146,7 +144,7 @@
     -->
     <target name="build-packages" depends="build-orm">
 
-        <d51pearpkg2 baseinstalldir="/" dir="${build.dir}/orm/DoctrineORM-${version}">
+        <d51pearpkg2 baseinstalldir="/" dir="${build.dir}/orm">
            <name>DoctrineORM</name>
            <summary>Doctrine Object Relationl Mapper</summary>
            <channel>pear.doctrine-project.org</channel>
@@ -162,13 +160,13 @@
                <php minimum_version="5.3.0" />
                <pear minimum_version="1.6.0" recommended_version="1.6.1" />
            </dependencies>
-           <dirroles key="bin">script</dirroles>
-           <replacement path="bin/doctrine" type="pear-config" from="@php_bin@" to="php_bin" />
-           <replacement path="bin/doctrine.php" type="pear-config" from="@php_bin@" to="php_bin" />
-           <replacement path="bin/doctrine.php" type="pear-config" from="@bin_dir@" to="bin_dir" />
+           <dirroles key="DoctrineORM-${version}/bin">script</dirroles>
+           <replacement path="DoctrineORM-${version}/bin/doctrine" type="pear-config" from="@php_bin@" to="php_bin" />
+           <replacement path="DoctrineORM-${version}/bin/doctrine.php" type="pear-config" from="@php_bin@" to="php_bin" />
+           <replacement path="DoctrineORM-${version}/bin/doctrine.php" type="pear-config" from="@bin_dir@" to="bin_dir" />
            <release>
-                <install as="doctrine" name="bin/doctrine" />
-                <install as="doctrine.php" name="bin/doctrine.php" />
+                <install as="doctrine" name="DoctrineORM-${version}/bin/doctrine" />
+                <install as="doctrine.php" name="DoctrineORM-${version}/bin/doctrine.php" />
            </release>
         </d51pearpkg2>
         <tar destfile="${dist.dir}/DoctrineORM-${version_name}.tgz" basedir="${build.dir}/orm" compression="gzip" />