X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/projects.git/blobdiff_plain/b51de7bb9a8b067840d509bedfdb55174bd4c00e..290f9a4e182a7c7a89765e58c9ba477be4fc4732:/tools/make/mconfigure

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index 09b6d3d..a1ea508 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -7,6 +7,7 @@ function echo_usage {
 	echo "	-c : configure"
 	echo "	-d : compile"
 	echo "	-p : pack default: do all"
+	echo "  -o : support old Debian 7 format"
 }
 
 function check_unversioned {
@@ -35,16 +36,11 @@ function set_build {
 		build="$build$(check_unversioned)"
 	elif [ -e .git ]
 	then
-		tag=$(git describe --tags 2>/dev/null) || true
+		tag=$(git describe --tags --match "${paket}_*" 2>/dev/null) || true
 		if test -z "$tag"
 		then
 			tag="0.0-0TOP"
 		fi
-		tag_paket=${tag%_*}
-		if [ "$tag_paket" != "$paket" ]
-		then
-			tag="0.0-0TOP"
-		fi
 		changes=$(check_unversioned)
 		tag="$tag$changes"
 		version=${tag%-*}
@@ -101,7 +97,7 @@ configure=0
 compile=0
 pack=0
 shift
-while getopts "a:cdp" opt; do
+while getopts "a:cdpo" opt; do
 	case $opt in
 		a) ARCH=$OPTARG
 			;;
@@ -111,6 +107,8 @@ while getopts "a:cdp" opt; do
 			;;
 		p)	pack=1
 			;;
+		o)	oldpack="-Zgzip"
+			;;
 		\?) echo "Invalid option: -$OPTARG"
 			echo_usage
 			exit 1
@@ -133,7 +131,7 @@ fi
 if [ $configure -eq 1 ]
 then
 	# delete changelog and control
-	rm debian/changelog debian/control || true
+	rm debian/changelog debian/control 2>/dev/null || true
 	
 	# mconfigure builds 2 environment files: setenv.sh + rules.pre
 	
@@ -145,7 +143,7 @@ then
 	echo "" > debian/rules.pre
 	
 	echo "paket=$paket" >> debian/setenv.sh
-
+	echo "oldpack=\"$oldpack\"" >> debian/setenv.sh
 	cpp_build=0
 
 	set_build