From fbd71151747c72b59a2865ff60ee526c4bb27a06 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Sun, 31 May 2015 15:29:41 +0000
Subject: [PATCH] create-mkdebian.sh, pkg.sh: Upload to debian stable

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 scripts/create-mkdebian.sh |  2 +-
 scripts/pkg.sh             | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/scripts/create-mkdebian.sh b/scripts/create-mkdebian.sh
index a302d945..06662169 100644
--- a/scripts/create-mkdebian.sh
+++ b/scripts/create-mkdebian.sh
@@ -128,7 +128,7 @@ done
 chmod 755 rules
 
 cd ..
-dch  --create --newversion \$VERSION-\$RELEASE --controlmaint --package \$NAME --distribution unstable "Release built by $0"
+dch  --create --newversion \$VERSION-\$RELEASE --controlmaint --package \$NAME --distribution stable "Release built by $0"
 
 echo "Produced by $0, the output should be in the \"debian\" sub-directory."
 EOT
diff --git a/scripts/pkg.sh b/scripts/pkg.sh
index 16320bd3..d134f2be 100644
--- a/scripts/pkg.sh
+++ b/scripts/pkg.sh
@@ -66,12 +66,12 @@ abspath()
 
 read_map()
 {
-	cmd_version -m $MOD_SCRIPT_DIR -p `platform` $@ read | sed 's/-dev//'
+	cmd_version -p `platform` $@ read | sed 's/-dev//'
 }
 
 write_map()
 {
-	cmd_version -m $MOD_SCRIPT_DIR -p `platform` $1 write $2
+	cmd_version -p `platform` $1 write $2
 }
 
 find_path()
@@ -308,14 +308,14 @@ cmd_version()
 	}
 
 	# -- here we go
-	local mod_script_dir=/opt/ytools/bin/get_os.sh
 	local strip_dev=cmd_version_strip_dev_dummy
-	local platform_patt="\(^debian-[0-9.]\+\|^suse-[0-9.]\+\)/\(i.86\|x86_64\): *"
+	local platform_patt="\(^debian-[0-9.]\+\|^suse-[0-9.]\+\)/\(i.86\|x86_64\|amd64\): *"
 	local no_compat=
+	local platform=`platform`
 
 	[ $# -lt 2 ] && cmd_version_usage 1
 
-	set -- `getopt 'hsnp:m:' "$@"`
+	set -- `getopt 'hsnp:' "$@"`
 	while [ "$1" != -- ] ; do
 		case "$1" in
 		-n)
@@ -324,8 +324,6 @@ cmd_version()
 			strip_dev=cmd_version_strip_dev_real;;
 		-p)
 			platform="$2"; shift;;
-		-m)
-			mod_script_dir="$2"; shift;;
 		-h)
 			cmd_version_usage 0;;
 		*)
@@ -341,9 +339,6 @@ cmd_version()
 	local cmd=$1
 	shift
 
-	local platform
-	[ "$platform" ] || platform=`bash $mod_script_dir/get_os.sh`/`arch`
-
 	case $cmd in
 	read)
 		local p=`echo $platform | sed 's%/%\\\/%g'`
@@ -539,7 +534,7 @@ upload_pkg()
 		hash = sha
 		allow_unsigned_uploads = yes
 		distributions = debian-8
-		allowed_distributions = unstable
+		allowed_distributions = stable
 		delayed =
 		run_lintian = no
 		run_dinstall = no