r51736 - in /trunk/libcatalyst-modules-perl/debian: changelog make-module.sh

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Fri Jan 29 11:51:09 2010
New Revision: 51736

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=51736
Log:
debian/make-module.sh: use dh_* helpers and unify indentation.

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

Modified: trunk/libcatalyst-modules-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-modules-perl/debian/changelog?rev=51736&op=diff
==============================================================================
--- trunk/libcatalyst-modules-perl/debian/changelog (original)
+++ trunk/libcatalyst-modules-perl/debian/changelog Fri Jan 29 11:51:09 2010
@@ -1,3 +1,9 @@
+libcatalyst-modules-perl (37) UNRELEASED; urgency=low
+
+  * debian/make-module.sh: use dh_* helpers and unify indentation.
+
+ -- gregor herrmann <gregoa at debian.org>  Fri, 29 Jan 2010 12:49:41 +0100
+
 libcatalyst-modules-perl (36) unstable; urgency=low
 
   [ Jonathan Yu ]

Modified: trunk/libcatalyst-modules-perl/debian/make-module.sh
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-modules-perl/debian/make-module.sh?rev=51736&op=diff
==============================================================================
--- trunk/libcatalyst-modules-perl/debian/make-module.sh (original)
+++ trunk/libcatalyst-modules-perl/debian/make-module.sh Fri Jan 29 11:51:09 2010
@@ -16,75 +16,70 @@
 
 #--- unpacking tar.gz in proper folders
 if [ "$1" = "unpack" ]; then
-    test -d build-area || mkdir build-area
-    
-    cd tarballs
-    for dir in *
-    do
-    	if [ -d $dir ]; then
-    		cd $dir
+	test -d build-area || mkdir build-area
+	
+	cd tarballs
+	for dir in *
+	do
+		if [ -d $dir ]; then
+			cd $dir
 			for file in *.tar.gz
-			do 
+			do
 				test -d ../../build-area/$dir || mkdir ../../build-area/$dir
 				tar -C ../../build-area/$dir -xzf $file
 			done
 			cd ..
 		fi
-    done
-    cd ..
+	done
+	cd ..
 fi
 
 if [ "$1" = patch -o "$1" = unpatch ]; then
-    if [ "$1" = patch ]; then
-	action=push
-    else
-	action=pop
-    fi
-
-    for dir in build-area/*
-    do
-	[ -d $dir ] || continue
-	cd $dir
-	for module in *
+	if [ "$1" = patch ]; then
+		action=push
+	else
+		action=pop
+	fi
+	
+	for dir in build-area/*
 	do
-	    name=$(echo $module | sed 's,-[^-]*$,,')
-	    [ -d $ROOT/debian/patches/$name ] || continue
-	    echo "Applying patches for $name:"
-	    cd $module
-	    [ -h patches ] || ln -s ../../../debian/patches/$name patches
-	    QUILT_PATCHES=patches quilt --quiltrc /dev/null $action -a || test $? = 2
-	    cd ..
+		[ -d $dir ] || continue
+		cd $dir
+		for module in *
+		do
+			name=$(echo $module | sed 's,-[^-]*$,,')
+			[ -d $ROOT/debian/patches/$name ] || continue
+			echo "Applying patches for $name:"
+			cd $module
+			[ -h patches ] || ln -s ../../../debian/patches/$name patches
+			QUILT_PATCHES=patches quilt --quiltrc /dev/null $action -a || test $? = 2
+			cd ..
+		done
+		cd ../..
 	done
-	cd ../..
-    done
 fi
 
 if [ "$1" = "build" ]; then
-
+	
 	cd build-area
 	for dir in *
 	do
 		if [ -d $dir ]; then
-    		cd $dir
+			cd $dir
 			for module in *
-			do 
-				cd $module
-        		if [ -r Build.PL ];
-		        then
-					$PERL Build.PL installdirs=vendor
-					$PERL Build
-					$PERL Build test
-					$PERL Build install destdir=$DESTDIR
-	        	else
-					PERL5_CPANPLUS_IS_RUNNING=1 PERL5LIB=$PERL5LIB $PERL Makefile.PL INSTALLDIRS=vendor --skipdeps
-					PERL5LIB=$PERL5LIB $MAKE
-					PERL5LIB=$PERL5LIB $MAKE test
-					$MAKE install DESTDIR=$DESTDIR
-	    	    fi
-				cd ..
+			do
+				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