X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/projects.git/blobdiff_plain/160d72dfc4b7fbcd9f075fe71fd607e43c7b48c7..a90bb22f89db56adb14f48da5a6858ac8dcd20bc:/tools/make/mconfigure

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index c164f10..a6e919d 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -22,6 +22,11 @@ function set_build {
 		then
 			tag="0.0-TOP"
 		fi
+		tag_paket=${tag%_*}
+		if [ "$tag_paket" != "$paket" ]
+		then
+			tag="0.0-TOP"
+		fi
 		changes=$(git status -s |grep "^ *M") || true
 		if test -n "$changes"
 		then
@@ -37,6 +42,7 @@ function set_build {
 }
 
 function check_version {
+	
 	vline=$(head -1 debian/$paket.changelog)
 	vline=${vline%-*}
 	clversion=${vline#*(}
@@ -45,6 +51,13 @@ function check_version {
 		version=$clversion
 		return
 	fi
+
+	# do no check on a modified git repos
+	if [ "${build: -1}" == "M" ]
+	then
+		return
+	fi
+
 	if [ "$clversion" != $version ]
 	then
 		echo "version mismatch: git: $version, changelog: $clversion"
@@ -104,6 +117,9 @@ fi
 
 if [ $configure -eq 1 ]
 then
+	# delete changelog and control
+	rm debian/changelog debian/control || true
+	
 	echo "paket=$paket" > debian/rules.pre
 #	shift
 	ARCH=""
@@ -166,7 +182,8 @@ then
 	# copy package control
 	if [ -f debian/$paket.control ]
 	then
-		cp debian/$paket.control debian/control
+		# proceed
+		echo
 	else
 		# try old fashoned way
 		control=$(find etc -name $paket.control) || true
@@ -175,12 +192,12 @@ then
 			echo "warning: control file not found"
 			echo "  this file is necessary for any package production."
 		else	
-			echo "Source: $pwd
+			echo "Source: $paket
 	Section: main
 	Priority: optional
 	Maintainer: WagnerTech UG <mail@wagnertech.de>
-	" > debian/control
-			grep -v "Version:" $control |grep -v "Maintainer:" >> debian/control 
+	" > debian/$paket.control
+			grep -v "Version:" $control |grep -v "Maintainer:" >> debian/$paket.control 
 		fi
 	fi
 	
@@ -192,11 +209,15 @@ then
 			rm -rf ../build
 			mkdir ../build
 		fi
-		debian/$paket.build -prepare
+		if grep -- "-prepare" debian/$paket.build >/dev/null
+		then
+			debian/rules sync
+			debian/$paket.build -prepare
+		fi
 	fi
 	
 	# pack prepare
-	if [ -f debian/$paket.cp -a -f $paket.control ]
+	if [ -f debian/$paket.cp -a -f debian/$paket.control ]
 	then
 		echo "PACK=binary" >> debian/rules.pre
 	elif [ -f debian/$paket.cp ]
@@ -205,9 +226,10 @@ then
 	else
 		echo "PACK=version" >> debian/rules.pre
 	fi
+	cp debian/rules.pre debian/setenv.sh
 fi
 
-if [ $compile -eq 1 -a ! -e debian/build.sh ]
+if [ $compile -eq 1 -a ! -e debian/$paket.build ]
 then
 	echo "no debian/build.sh: skipping build step"
 	compile=0
@@ -215,12 +237,14 @@ fi
 if [ $compile -eq 1 ]
 then
 	# build artefacts
+	. debian/setenv.sh
 	debian/rules build
 fi
 
 if [ $pack -eq 1 ]
 then
 	# build package
+	. debian/setenv.sh
 	debian/rules pack
 fi