[Pkg-symfony-commits] [SCM] Phing repository under the pkg-symfony Debian group branch, master, updated. upstream/2.4.5-9-g846908b

Nicolas Roudaire nikrou77 at gmail.com
Fri Jul 1 22:04:16 UTC 2011


The following commit has been merged in the master branch:
commit 846908b1d4fa0d00f896fb9acea3e57d81190cca
Author: Nicolas Roudaire <nikrou77 at gmail.com>
Date:   Fri Jul 1 22:38:36 2011 +0200

    Upgrade debhelper
    Simplify debian/rules
    Removes quil dependency

diff --git a/debian/changelog b/debian/changelog
index 94d3617..1871a58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,5 +2,5 @@ phing (2.4.5-1) unstable; urgency=low
 
   * Initial release (Closes: #283085)
 
- -- Nicolas Roudaire <nikrou77 at gmail.com>  Wed, 06 Apr 2011 20:33:13 +0200
+ -- Nicolas Roudaire <nikrou77 at gmail.com>  Fri, 01 Jul 2011 22:33:34 +0200
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index c8094c1..ac96ffe 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: phing
 Section: devel
 Priority: optional
 Maintainer: Nicolas Roudaire <nikrou77 at gmail.com>
-Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7~)
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 8.0.0)
+Standards-Version: 3.9.2
 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 1d42538..c6c92e0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Format-Specification: http://dep.debian.net/deps/dep5
 Name: phing
 Maintainer: Nicolas Roudaire <nikrou77 at gmail.com>
 Source: http://phing.info/
@@ -24,6 +24,49 @@ License: LGPL
  version 3 can be found in the file
  `/usr/share/common-licenses/LGPL-3'.
 
+Files: classes/phing/IntrospectionHelper.php classes/phing/TaskContainer.php 
+ classes/phing/Task.php classes/phing/listener/DefaultLogger.php 
+ classes/phing/listener/NoBannerLogger.php classes/phing/Target.php
+ classes/phing/tasks/system/AvailableTask.php classes/phing/TaskAdapter.php
+ classes/phing/tasks/system/ConditionTask.php 
+ classes/phing/tasks/system/PhingCallTask.php
+ classes/phing/tasks/system/condition/NotCondition.php
+ classes/phing/tasks/system/condition/AndCondition.php
+ classes/phing/tasks/system/condition/ConditionBase.php
+ classes/phing/tasks/system/condition/OsCondition.php
+ classes/phing/tasks/system/condition/EqualsCondition.php
+ classes/phing/tasks/system/condition/OrCondition.php
+ classes/phing/parser/ProjectConfigurator.php
+ classes/phing/parser/ExpatParser.php
+ classes/phing/parser/NestedElementHandler.php
+ classes/phing/parser/AbstractHandler.php
+ classes/phing/parser/AbstractSAXParser.php
+ classes/phing/parser/TaskHandler.php
+ classes/phing/parser/DataTypeHandler.php
+ classes/phing/parser/Location.php
+ classes/phing/parser/TargetHandler.php
+ classes/phing/parser/ProjectHandler.php
+ classes/phing/parser/RootHandler.php
+Copyright: @copyright 2001,2002 THYRELL.
+License: All rights reserved
+
+Files: classes/phing/filters/TailFilter.php classes/phing/filters/BaseParamFilterReader.php
+Copyright: @copyright © 2003 seasonfive.
+License: All rights reserved
+
+Files: classes/phing/tasks/ext/PatchTask.php
+Copyright: @copyright Mikhail Krasilnikov <mk at 3wstyle>
+License: Apache
+
+Files: classes/phing/tasks/ext/JsMin.php
+Copyright: Copyright (c) 2002 Douglas Crockford
+License: Expat
+
+Files: etc/coverage-frames.xsl etc/phpunit-noframes.xsl tc/phpunit-frames.xsl
+ etc/log.xsl
+Copyright: 2001-2004 The Apache Software Foundation
+License: Apache
+
 Files: debian/*
 Copyright: 2011, Nicolas Roudaire <nikrou77 at gmail.com>
 License: LGPL
diff --git a/debian/patches/wrapper b/debian/patches/wrapper
index d2bdc74..685c331 100644
--- a/debian/patches/wrapper
+++ b/debian/patches/wrapper
@@ -1,5 +1,5 @@
-# Author: Nicolas Roudaire <nikrou77 at gmail.com>
-# Description: Use default paths for application instead of try to guess it.
+Author: Nicolas Roudaire <nikrou77 at gmail.com>
+Description: Use default paths for application instead of try to guess it.
 
 --- phing.orig/bin/phing
 +++ phing/bin/phing
diff --git a/debian/rules b/debian/rules
index d367549..955dd78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,13 +9,5 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
-
 %:
-	dh --with quilt $@
-
-override_dh_quilt_patch:
-	dh_quilt_patch	
-
-override_dh_quilt_unpatch:
-	dh_quilt_unpatch
+	dh $@

-- 
Phing repository under the pkg-symfony Debian group



More information about the Pkg-symfony-commits mailing list