Fix remove_tmpl() and misc cosmetics to info_tmpl().

--HG--
extra : convert_revision : fa0c299f6d8a85c2a99932eef471dd46a5c31a9c

pkgfs.sh

@@ -174,9 +174,8 @@ info_tmpl()
 
 	run_file $PKGFS_TEMPLATESDIR/$tmpl.tmpl
 
-	echo " pkgfs template definitions:"
-	echo
 	echo "pkgname:	$pkgname"
+	echo "version:	$version"
 	for i in "${distfiles}"; do
 		[ -n "$i" ] && echo "distfile:	$i"
 	done
@@ -1053,7 +1052,7 @@ remove_tmpl()
 		exit 1
 	fi
 
-	unstow_tmpl $pkg-$version
+	unstow_tmpl $pkg
 	$rm_cmd -rf $PKGFS_DESTDIR/$pkg-$version
 	return "$?"
 }