[Pkg-symfony-commits] [SCM] Doctrine repository under the pkg-symfony Debian group branch, master, updated. upstream/1.2.2-13-g56cbf42

[Federico Gimenez Nieto]

The following commit has been merged in the master branch:
commit 56cbf424f2f2fd052ffc8da26b47b4643b4edae5
Author: Federico Gimenez Nieto <fgimenez at coit.es>
Date:   Mon May 24 20:04:06 2010 +0200

    ORed php5-cli dependency; added php5-sybase as pdo dependency (doctrine also supports mssql); debian/control: wrapped description lines at 73 columns; debian/rules: fixed command for running tests (the tests files were copied to the source tree)

diff --git a/debian/control b/debian/control
index 0d9ccd2..b16585d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,20 +11,17 @@ Homepage: http://www.doctrine-project.org/
  
 Package: doctrine
 Architecture: all
-Depends: php5, 
-	 php5-cli, 
-	 php5-mysql | php5-pgsql | php5-sqlite, 
+Depends: php5 | php5-cli, 
+	 php5-mysql | php5-pgsql | php5-sqlite | php5-sybase, 
 	 ${misc:Depends}
 Description: Tool for object-relational mapping in PHP
- The Doctrine library sits on top of PDO and is itself
- divided into two main layers, the DBAL (which represents a
- complete database abstraction API) and the ORM (the bridge
- between the relational model and the object model / domain
- model).
+ The Doctrine library sits on top of PDO and is itself divided into two 
+ main layers, the DBAL (which represents a complete database abstraction 
+ API) and the ORM (the bridge between the relational model and the object
+ model / domain model).
  .
- One of its key features is the option to write database 
- queries in a proprietary object oriented SQL dialect called 
- Doctrine Query Language (DQL), inspired by Hibernates HQL. 
- This provides developers with a powerful alternative to SQL 
- that maintains flexibility without requiring unnecessary code 
- duplication.
\ No newline at end of file
+ One of its key features is the option to write database queries in a 
+ proprietary object oriented SQL dialect called Doctrine Query Language 
+ (DQL), inspired by Hibernates HQL. This provides developers with a 
+ powerful alternative to SQL that maintains flexibility without requiring 
+ unnecessary code duplication.
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 886acb1..64616f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ override_dh_fixperms:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 build:: $(test_stamp)
 $(test_stamp):
-	cd $(PACKAGE_VER) && php ./tests/run.php
+	cd $(PACKAGE_VER)/tests && php ./run.php
 	touch $@
 
 override_dh_clean:

-- 
Doctrine repository under the pkg-symfony Debian group