r42594 - in /trunk/libcatalyst-modules-extra-perl/debian: changelog make-module.sh rules

[ryan52-guest at users.alioth.debian.org]

Author: ryan52-guest
Date: Sun Aug 23 21:48:57 2009
New Revision: 42594

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=42594
Log:
dh7 awesomeness

Modified:
    trunk/libcatalyst-modules-extra-perl/debian/changelog
    trunk/libcatalyst-modules-extra-perl/debian/make-module.sh
    trunk/libcatalyst-modules-extra-perl/debian/rules

Modified: trunk/libcatalyst-modules-extra-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-modules-extra-perl/debian/changelog?rev=42594&op=diff
==============================================================================
--- trunk/libcatalyst-modules-extra-perl/debian/changelog (original)
+++ trunk/libcatalyst-modules-extra-perl/debian/changelog Sun Aug 23 21:48:57 2009
@@ -24,6 +24,7 @@
     Debian Catalyst Maintainers <pkg-catalyst-
     maintainers at lists.alioth.debian.org> moved to Uploaders.
   * Remove Florian Ragwitz from Uploaders (Closes: #523378)
+  * dh7 awesomeness
 
   [ Martín Ferrari ]
   * debian/watch: fix invalid watchfile, also putting some useful tests.

Modified: trunk/libcatalyst-modules-extra-perl/debian/make-module.sh
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-modules-extra-perl/debian/make-module.sh?rev=42594&op=diff
==============================================================================
--- trunk/libcatalyst-modules-extra-perl/debian/make-module.sh (original)
+++ trunk/libcatalyst-modules-extra-perl/debian/make-module.sh Sun Aug 23 21:48:57 2009
@@ -28,10 +28,7 @@
 		fi
     done
     cd ..
-fi
-
-if [ "$1" = "build" ]; then
-
+else
 	cd build-area
 	for dir in *
 	do
@@ -39,23 +36,18 @@
     		cd $dir
 			for module in *
 			do 
-				cd $module
-        		if [ -r Build.PL ];
-		        then
-					PERL5LIB=$PERL5LIB $PERL Build.PL installdirs=vendor
-					PERL5LIB=$PERL5LIB $PERL Build
-					PERL5LIB=$PERL5LIB TEST_POD=1 $PERL Build test
-					PERL5LIB=$PERL5LIB $PERL Build install destdir=$DESTDIR
-	        	else
-					PERL5LIB=$PERL5LIB $PERL Makefile.PL INSTALLDIRS=vendor
-					PERL5LIB=$PERL5LIB $MAKE
-					PERL5LIB=$PERL5LIB TEST_POD=1 $MAKE test
-					$MAKE install DESTDIR=$DESTDIR
-	    	    fi
-				cd ..
+                            cd ../..
+                            set -e
+                            d=build-area/$dir/$module
+                            dh_auto_configure -D $d
+                            dh_auto_build -D $d
+                            dh_auto_test -D $d
+                            dh_auto_install -D $d
+                            set +e
+                            cd build-area/$dir
 			done
 			cd ..
 		fi
 	done
-cd ..
+        cd ..
 fi

Modified: trunk/libcatalyst-modules-extra-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-modules-extra-perl/debian/rules?rev=42594&op=diff
==============================================================================
--- trunk/libcatalyst-modules-extra-perl/debian/rules (original)
+++ trunk/libcatalyst-modules-extra-perl/debian/rules Sun Aug 23 21:48:57 2009
@@ -9,8 +9,6 @@
 
 override_dh_auto_configure:
 	DESTDIR=$(TMP) debian/make-module.sh unpack
-	dh_auto_configure
 
-override_dh_auto_build:
+override_dh_auto_install:
 	DESTDIR=$(DESTDIR) debian/make-module.sh build
-	dh_auto_build