[Pkg-php-commits] r1107 - ffmpeg-php/trunk/debian

[Raphael Geissert]

Author: atomo64-guest
Date: 2008-06-30 23:26:30 +0000 (Mon, 30 Jun 2008)
New Revision: 1107

Modified:
   ffmpeg-php/trunk/debian/changelog
   ffmpeg-php/trunk/debian/control
   ffmpeg-php/trunk/debian/rules
Log:
Use getconf LFS_CFLAGS instead of hard-coding the LFS flags
DM-Upload-Allowed: yes
s/find/filter


Modified: ffmpeg-php/trunk/debian/changelog
===================================================================
--- ffmpeg-php/trunk/debian/changelog	2008-06-30 23:05:50 UTC (rev 1106)
+++ ffmpeg-php/trunk/debian/changelog	2008-06-30 23:26:30 UTC (rev 1107)
@@ -1,9 +1,10 @@
-ffmpeg-php (0.5.3.1-1) UNRELEASED; urgency=low
+ffmpeg-php (0.5.3.1-1) unstable; urgency=low
 
   * New upstream release
   * debian/control:
     + Added Homepage and Vcs-* fields
     + Bumped Standards-Version: 3.8.0, no changes needed
+    + Added XS-DM-Upload-Allowed: yes
   * debian/patches/:
     + 01gd.patch: dropped, included by upstream
     + allow_persistent_on_persistentMovie.phpt.patch: fixes a test
@@ -13,7 +14,7 @@
   * debian/rules: removed some useless stuff
   * debian/ffmpeg.ini: added some new options as comments
 
- -- Raphael Geissert <atomo64 at gmail.com>  Sun, 29 Jun 2008 18:06:42 -0500
+ -- Raphael Geissert <atomo64 at gmail.com>  Mon, 30 Jun 2008 18:25:05 -0500
 
 ffmpeg-php (0.5.1-2) unstable; urgency=low
 

Modified: ffmpeg-php/trunk/debian/control
===================================================================
--- ffmpeg-php/trunk/debian/control	2008-06-30 23:05:50 UTC (rev 1106)
+++ ffmpeg-php/trunk/debian/control	2008-06-30 23:26:30 UTC (rev 1107)
@@ -9,6 +9,7 @@
 Homepage: http://ffmpeg-php.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/pkg-php/ffmpeg-php/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-php/ffmpeg-php/trunk
+XS-DM-Upload-Allowed: yes
 
 Package: php5-ffmpeg
 Architecture: any

Modified: ffmpeg-php/trunk/debian/rules
===================================================================
--- ffmpeg-php/trunk/debian/rules	2008-06-30 23:05:50 UTC (rev 1106)
+++ ffmpeg-php/trunk/debian/rules	2008-06-30 23:26:30 UTC (rev 1107)
@@ -6,7 +6,7 @@
 #export DH_VERBOSE=1
 
 CFLAGS += -fno-strict-aliasing
-LFSFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+LFSFLAGS += $(shell getconf LFS_CFLAGS)
 
 include /usr/share/quilt/quilt.make
 
@@ -27,17 +27,17 @@
 test: test-stamp
 test-stamp: modules/$(EXTN).so
 	dh_testdir
-ifeq (,$(find nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	# prevent php from throwing warnings, causing the tests to fail
 	ln -s $(PHP_EX)/*.so $(CURDIR)/modules/
 	$(MAKE) test > test-results.txt 2>&1
 	@cat test-results.txt
-	# this prints the failed tests output
+	# Print the failed tests output:
 	@sed -r 's,^ffmpeg\s+[^\[]+\s+\[(tests/\w+)\.phpt\]$$,\1.log,g' \
 		< test-results.txt | egrep "^tests/.*\.log" | \
 		xargs cat
 else
-        echo 'Skipping test...'
+	echo 'Skipping test...'
 endif
 	touch $@