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

[Federico Gimenez Nieto]

The following commit has been merged in the master branch:
commit 3de63f6493f017738237dfe1bd11e1d40bf82437
Author: Federico Gimenez Nieto <fgimenez at coit.es>
Date:   Sat Sep 11 12:32:33 2010 +0200

    New upstream version; patch for adding the doctrine path to php ini

diff --git a/debian/changelog b/debian/changelog
index 757f294..0eb06d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+doctrine (1.2.3-1) unstable; urgency=low
+
+  * New upstream version. (closes: #594410)
+  * debian/rules: removed the comands related to test running, there are no tests
+    included in this version (closes: #591115)
+  * Added doctrine ini file for php (closes: #590006), patch by Micah <micahg at ubuntu.com>
+  * Removed patch for the test run.
+  * debian/control: bumped standards version (3.9.1)
+
+ -- Federico Gimenez Nieto <fgimenez at coit.es>  Sat, 11 Sep 2010 12:30:08 +0200
+
 doctrine (1.2.2-1) unstable; urgency=low
 
   * Initial Release. (closes: #568501)
diff --git a/debian/control b/debian/control
index dcc0923..d65d8c7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Symfony Maintainers <pkg-symfony-maint at lists.alioth.debian.org>
 Uploaders: Federico Gimenez Nieto <fgimenez at coit.es>
 Build-Depends: debhelper (>= 7.0.50~), php5-cli, php5-sqlite
-Standards-Version: 3.9.0.0
+Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/pkg-symfony/doctrine.git
 Vcs-Browser: http://git.debian.org/?p=pkg-symfony/doctrine.git
 Homepage: http://www.doctrine-project.org/
diff --git a/debian/doctrine.ini b/debian/doctrine.ini
new file mode 100644
index 0000000..a139b37
--- /dev/null
+++ b/debian/doctrine.ini
@@ -0,0 +1,2 @@
+[Doctrine]
+; include_path=${include_path} ":/usr/share/php/Doctrine/lib"
\ No newline at end of file
diff --git a/debian/install b/debian/install
index 48fb68d..4860caa 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,2 @@
-Doctrine-*/lib	usr/share/php/Doctrine
-
-
+Doctrine-*/lib	      usr/share/php/Doctrine
+debian/doctrine.ini   etc/php5/conf.d
\ No newline at end of file
diff --git a/debian/patches/dc292_fix.diff b/debian/patches/dc292_fix.diff
deleted file mode 100644
index 0de2a75..0000000
--- a/debian/patches/dc292_fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-# Description: add missing 'migrations' directory to run DC292 test
-# Author: Federico Gimenez Nieto <fgimenez at coit.es>
-# Forwarded: http://www.doctrine-project.org/jira/browse/DC-699
-# Last-update: 2010-05-24
-
-Index: doctrine/Doctrine-1.2.2/tests/Ticket/DC292/migrations/placeholder
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ doctrine/Doctrine-1.2.2/tests/Ticket/DC292/migrations/placeholder	2010-05-24 20:08:42.000000000 +0200
-@@ -0,0 +1 @@
-+#placeholder
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 66fa7ee..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-dc292_fix.diff
diff --git a/debian/rules b/debian/rules
index fa39b9a..9ea2078 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 
-PACKAGE_VER :=  Doctrine-1.2.2
-
-test_stamp = debian/test-stamp
+PACKAGE_VER :=  Doctrine-1.2.3
 
 %:
 	dh $@
@@ -16,15 +14,8 @@ override_dh_fixperms:
 	#fix mode for executable files  
 	find debian/doctrine -perm -a=x -type f | xargs chmod -c a-x
 
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-build:: $(test_stamp)
-$(test_stamp):
-	cd $(PACKAGE_VER)/tests && php ./run.php
-	touch $@
-
 override_dh_clean:
 	dh_clean
-	$(RM) $(test_stamp)
 	$(RM) -rf $(PACKAGE_VER)/tests/DbTestCase.php \
 		  $(PACKAGE_VER)/tests/DoctrineTest/doctrine_tests/ \
 		  $(PACKAGE_VER)/tests/tmp

-- 
Doctrine repository under the pkg-symfony Debian group