[Pkg-symfony-commits] [SCM] Phing repository under the pkg-symfony Debian group branch, master, updated. upstream/2.4.1-8-gfa8ee43
Nicolas Roudaire
nikrou77 at gmail.com
Sun Mar 6 19:34:48 UTC 2011
The following commit has been merged in the master branch:
commit fa8ee43905fccbe37e8155c8b4b1572348030eb3
Author: Nicolas Roudaire <nikrou77 at gmail.com>
Date: Sun Mar 6 20:33:48 2011 +0100
Update phing to release 2.4.5
Simplify patch
diff --git a/debian/changelog b/debian/changelog
index 320932f..ce4daf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-phing (2.4.1-1) unstable; urgency=low
+phing (2.4.5-1) unstable; urgency=low
* Initial release (Closes: #283085)
- -- Nicolas Roudaire <nikrou77 at gmail.com> Mon, 29 Mar 2010 20:54:37 +0200
+ -- Nicolas Roudaire <nikrou77 at gmail.com> Sun, 06 Mar 2011 20:19:46 +0100
diff --git a/debian/control b/debian/control
index 18a2fd2..c8094c1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
Priority: optional
Maintainer: Nicolas Roudaire <nikrou77 at gmail.com>
Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7~)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Homepage: http://phing.info/
Vcs-Git: git://git.debian.org/git/pkg-symfony/phing.git
Vcs-Browser: http://git.debian.org/?p=pkg-symfony/phing.git
diff --git a/debian/copyright b/debian/copyright
index 37b6bee..13e7171 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,13 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Format-Specification: http://dep.debian.net/deps/dep5
Name: phing
Maintainer: Nicolas Roudaire <nikrou77 at gmail.com>
Source: http://phing.info/
-Copyright: 2010, Hans Lellelid <hans at xmpl.org>
- 2010, Michiel Rook <michiel.rook at gmail.com>
- 2010, David Giffin <david at giffin.org>
- 2010, Manuel Holtgrewe <grin at gmx.net>
- 2010, Mehmet Emre Yilmaz <mehmety at gmail.com>
+Copyright: 2011, Hans Lellelid <hans at xmpl.org>
+ 2011, Michiel Rook <michiel.rook at gmail.com>
+ 2011, David Giffin <david at giffin.org>
+ 2011, Manuel Holtgrewe <grin at gmx.net>
+ 2011, Mehmet Emre Yilmaz <mehmety at gmail.com>
License: LGPL
This package is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public License
@@ -61,7 +61,7 @@ License: PHP license, version 3.0
license at php.net so we can mail you a copy immediately.
Files: debian/*
-Copyright: 2010, Nicolas Roudaire <nikrou77 at gmail.com>
+Copyright: 2011, Nicolas Roudaire <nikrou77 at gmail.com>
License: GPL-2
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2 as
diff --git a/debian/docs b/debian/docs
index 0bdc6e6..ca910f1 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1,3 @@
+README
+CREDITS
docs/*
diff --git a/debian/patches/wrapper b/debian/patches/wrapper
index 693d46b..d2bdc74 100644
--- a/debian/patches/wrapper
+++ b/debian/patches/wrapper
@@ -1,87 +1,17 @@
# Author: Nicolas Roudaire <nikrou77 at gmail.com>
-# Description: Use default path for php instead of try to guess it.
+# Description: Use default paths for application instead of try to guess it.
-Index: phing/bin/phing
-===================================================================
---- phing.orig/bin/phing 2010-02-22 22:28:12.000000000 +0100
-+++ phing/bin/phing 2010-02-22 22:29:49.000000000 +0100
-@@ -5,7 +5,7 @@
- # This script will do the following:
- # - check for PHP_COMMAND env, if found, use it.
- # - if not found assume php is on the path
--# - check for PHING_HOME evn, if found use it
-+# - check for PHING_HOME env, if found use it
- # - if not look for it
- # - check for PHP_CLASSPATH, if found use it
- # - if not found set it using PHING_HOME/classes
-@@ -19,49 +19,10 @@
+--- phing.orig/bin/phing
++++ phing/bin/phing
+@@ -18,6 +18,11 @@
+ phing_exec_args="$phing_exec_args \"$arg\""
done
++export PHP_COMMAND=/usr/bin/php
++export PHING_HOME=/usr/share/php/phing
++export PHP_CLASSPATH=${PHING_HOME}/classes
++export PATH=${PATH}:${PHING_HOME}/bin
++
if [ -z "$PHING_HOME" ] ; then
--
-- # echo "WARNING: PHING_HOME environment not set. Attempting to guess."
--
-- # try to find PHING
-- if [ -d /opt/phing ] ; then
-- PHING_HOME=/opt/phing
-- fi
--
-- if [ -d "${HOME}/opt/phing" ] ; then
-- PHING_HOME="${HOME}/opt/phing"
-- fi
--
-- if [ -d "/usr/local/phing" ] ; then
-- PHING_HOME="/usr/local/phing"
-+ if [ -d /usr/share/php/phing ] ; then
-+ PHING_HOME=/usr/share/php/phing
- fi
-- if [ -d "${HOME}/usr/phing" ] ; then
-- PHING_HOME="${HOME}/usr/phing"
-- fi
--
-- ## resolve links - $0 may be a link to phing's home
-- PRG="$0"
-- progname=`basename "$0"`
-- saveddir=`pwd`
--
-- # need this for relative symlinks
-- dirname_prg=`dirname "$PRG"`
-- cd "$dirname_prg"
--
-- while [ -h "$PRG" ] ; do
-- ls=`ls -ld "$PRG"`
-- link=`expr "$ls" : '.*-> \(.*\)$'`
-- if expr "$link" : '/.*' > /dev/null; then
-- PRG="$link"
-- else
-- PRG=`dirname "$PRG"`"/$link"
-- fi
-- done
--
-- PHING_HOME=`dirname "$PRG"`/..
--
-- cd "$saveddir"
--
- # make it fully qualified
- PHING_HOME=`cd "$PHING_HOME" && pwd`
-
-@@ -70,14 +31,13 @@
- fi
-
- if (test -z "$PHP_COMMAND") ; then
-- # echo "WARNING: PHP_COMMAND environment not set. (Assuming php on PATH)"
-- PHP_COMMAND=php
-- export PHP_COMMAND
-+ PHP_COMMAND=/usr/bin/php
-+ export PHP_COMMAND
- fi
-
- if (test -z "$PHP_CLASSPATH") ; then
-- PHP_CLASSPATH=$PHING_HOME/classes
-- export PHP_CLASSPATH
-+ PHP_CLASSPATH=$PHING_HOME/classes
-+ export PHP_CLASSPATH
- fi
-
- phing_exec_cmd="exec $PHP_COMMAND -d html_errors=off -qC \"$PHING_HOME/bin/phing.php\" -logger phing.listener.AnsiColorLogger $phing_exec_args"
+ # echo "WARNING: PHING_HOME environment not set. Attempting to guess."
diff --git a/debian/rules b/debian/rules
index 76ac30f..d367549 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,14 +16,6 @@ include /usr/share/quilt/quilt.make
override_dh_quilt_patch:
dh_quilt_patch
- chmod 644 etc/*.xsl
- chmod 644 classes/phing/tasks/ext/PatchTask.php
- chmod 644 classes/phing/tasks/ext/phpunit/formatter/CloverPHPUnitResultFormatter.php
- chmod 644 classes/phing/tasks/ext/simpletest/SimpleTestXmlResultFormatter.php
override_dh_quilt_unpatch:
- chmod 755 etc/*.xsl
- chmod 755 classes/phing/tasks/ext/PatchTask.php
- chmod 755 classes/phing/tasks/ext/phpunit/formatter/CloverPHPUnitResultFormatter.php
- chmod 755 classes/phing/tasks/ext/simpletest/SimpleTestXmlResultFormatter.php
dh_quilt_unpatch
--
Phing repository under the pkg-symfony Debian group
More information about the Pkg-symfony-commits
mailing list