r64186 - in /trunk/libapache2-reload-perl/debian: changelog rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sat Oct 23 15:43:56 2010
New Revision: 64186

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=64186
Log:
debian/rules: run configure and tests as user www-data.

Modified:
    trunk/libapache2-reload-perl/debian/changelog
    trunk/libapache2-reload-perl/debian/rules

Modified: trunk/libapache2-reload-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-reload-perl/debian/changelog?rev=64186&op=diff
==============================================================================
--- trunk/libapache2-reload-perl/debian/changelog (original)
+++ trunk/libapache2-reload-perl/debian/changelog Sat Oct 23 15:43:56 2010
@@ -13,10 +13,6 @@
     - "perl (>= 5.6.10-12)"
     - we could probably remove the breaks/replaces, since lenny has a newer
       version; or we leave it until the squeeze release to play it über-safe
-  + the package FBTFS in my sid cowbuilder chroot during tests with:
-    waiting 60 seconds for server to start: .apache2: bad user name gregoa
-    [  error] 
-    server has died with status 255 (t/logs/error_log wasn't created, start the server in the debug mode)
 
   [ gregor herrmann ]
   * debian/copyright: point to /usr/share/common-licenses/Apache-2.0 instead
@@ -39,6 +35,9 @@
   * Upped debhelper dependency to 7.0.50~ for overrides
   * Modernized build rules
 
+  [ gregor herrmann ]
+  * debian/rules: run configure and tests as user www-data.
+
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Sat, 23 Oct 2010 14:09:42 +0100
 
 libapache2-reload-perl (0.10-2) unstable; urgency=low

Modified: trunk/libapache2-reload-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-reload-perl/debian/rules?rev=64186&op=diff
==============================================================================
--- trunk/libapache2-reload-perl/debian/rules (original)
+++ trunk/libapache2-reload-perl/debian/rules Sat Oct 23 15:43:56 2010
@@ -8,33 +8,16 @@
 	dh $@
 
 override_dh_auto_configure:
-	sh -c ' \
-	    if [ "$${USER:-}" = "root" ]; then	\
-	    	user=www-data;			\
-		chown www-data t;		\
-	    else				\
-	    	user="$${USER}";		\
-	    fi;					\
-	    					\
-	    APACHE_TEST_HTTPD=/usr/sbin/apache2 \
-	    APACHE_TEST_APXS=/usr/bin/apxs2 \
-	    APACHE_TEST_USER=$$user \
-		$(PERL) Makefile.PL INSTALLDIRS=vendor;'
-	
+	APACHE_TEST_HTTPD=/usr/sbin/apache2 \
+		APACHE_TEST_APXS=/usr/bin/apxs2 \
+		APACHE_TEST_USER=www-data \
+		dh_auto_configure
 
 override_dh_auto_test:
-	sh -c ' \
-	    if [ "$${USER:-}" = "root" ]; then	\
-	    	user=www-data;			\
-		chown www-data t;		\
-	    else				\
-	    	user="$${USER}";		\
-	    fi;					\
-	    					\
-	    APACHE_TEST_HTTPD=/usr/sbin/apache2 \
-	    APACHE_TEST_APXS=/usr/bin/apxs2 \
-	    APACHE_TEST_USER=$$user \
-		$(MAKE) test;'
+	APACHE_TEST_HTTPD=/usr/sbin/apache2 \
+		APACHE_TEST_APXS=/usr/bin/apxs2 \
+		APACHE_TEST_USER=www-data \
+		dh_auto_test
 
 override_dh_install:
 	dh_install