From: Pavel Charvat <pchar@ucw.cz>
Date: Tue, 4 Feb 2014 12:29:25 +0000 (+0100)
Subject: Packages: The version number appended to names of libraries is detected from ucw... 
X-Git-Tag: v6.0~71
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=6de1e8ff2085b921dfd2dd05ab4a6bdb22ed3048;p=libucw.git

Packages: The version number appended to names of libraries is detected from ucw/default.cfg instead of the tag.
---

diff --git a/debian/mk b/debian/mk
index e4852337..210fd05e 100755
--- a/debian/mk
+++ b/debian/mk
@@ -9,9 +9,10 @@ function usage {
 	cat >&2 <<EOF
 Usage: $0 <options>
 Options:
---archonly      Build only binary packages
---cleanup       Cleanup temporary files when finished
---version=<ver> Custom version number of resulting packages (default: autodetect from git-describe)
+--archonly		Build only binary packages
+--cleanup		Cleanup temporary files when finished
+--version=<ver>		Custom version number of resulting packages (default: autodetect from git-describe)
+--abi-version=<ver>	Custom version number of the LibUCW's ABI (default: defined in ucw/default.cfg)
 EOF
 	exit 1
 }
@@ -23,9 +24,7 @@ function pkg-gen-debian {(
 		PREFIX=/ \
 		INSTALL_INCLUDE_DIR=/usr/include/libucw \
 		INSTALL_DOC_DIR=/usr/share/doc/libucw/html \
-		INSTALL_CONFIG_DIR=/usr/share/doc/libucw/examples/etc \
-		UCW_VERSION="$VER" \
-		UCW_ABI_SUFFIX="-$VER"
+		INSTALL_CONFIG_DIR=/usr/share/doc/libucw/examples/etc
 
 	echo "Creating debian/control"
 	build/genconf debian/control.in debian/control obj/config.mk
@@ -52,6 +51,8 @@ while [ -n "$1" ] ; do
 			;;
 	--version=*)	PKGVER="${1:10}"
 			;;
+	--abi-version=*)CONF="$CONF UCW_ABI_SUFFIX=-${1:14}"
+			;;
         *)		usage
 			;;
 	esac