[Pkg-php-commits] r1035 - php5/trunk/debian

[Sean Finney]

Author: seanius
Date: 2008-05-03 11:47:01 +0000 (Sat, 03 May 2008)
New Revision: 1035

Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/rules
Log:
add some quilt options

Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2008-05-03 11:36:18 UTC (rev 1034)
+++ php5/trunk/debian/changelog	2008-05-03 11:47:01 UTC (rev 1035)
@@ -6,9 +6,11 @@
     using the system provided timezone database instead of the one bundled 
     with PHP.  Many thanks to Joe Orten from Red Hat for the patch!
     closes: #447174.
-  * update copyright information to have information about non-trivial 
+  * Update copyright information to have information about non-trivial 
     patches worthy of copyright attributions, and update information about
     current debian maintainers.
+  * Add some useful quilt settings in debian/rules to lower the amount of 
+    noise in future quilt updates.
 
   [ Thijs Kinkhorst ]
   * Checked for policy 3.7.3, no changes.

Modified: php5/trunk/debian/rules
===================================================================
--- php5/trunk/debian/rules	2008-05-03 11:36:18 UTC (rev 1034)
+++ php5/trunk/debian/rules	2008-05-03 11:47:01 UTC (rev 1035)
@@ -24,6 +24,9 @@
 PHP5_UPSTREAM_VERSION = $(shell echo $(PHP5_SOURCE_VERSION) | sed -e "s/-.*//" -e "s/.*://")
 PHP5_DEBIAN_REVISION  = $(shell echo $(PHP5_SOURCE_VERSION) | sed "s/.*-//")
 
+# specify some options to our patch system
+QUILT_DIFF_OPTS=-p
+QUILT_NO_DIFF_TIMESTAMPS=1 
 
 PROG_SENDMAIL = /usr/sbin/sendmail
 CFLAGS = -O2 -Wall -fsigned-char -fno-strict-aliasing