packaging/tinyos-tools-devel: finish changing tinyos-tools-15 to -devel

packaging/tinyos-tools-devel/build.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 #
-# Builds against the trunk.  PACKAGE_RELEASE gets set to the tip
-# of the trunk (SHA).
+# Builds against the trunk.  PACKAGE_RELEASE gets set to version number
+# concatenated with the SHA of this branch's tip.
 #
 # The tinyos-tools package will pick up various tool scripts and binaries
 # built from the tinyos source tree.  This makes the tinyos-tools package
@@ -33,13 +33,13 @@ source ${COMMON_FUNCTIONS_SCRIPT}
 BUILD_ROOT=$(pwd)
 CODENAME=squeeze
 
-SOURCENAME=tinyos-tools-15
+SOURCENAME=tinyos-tools-devel
 SOURCEVERSION=1.5.0
 SOURCEDIRNAME=${SOURCENAME}_${SOURCEVERSION}
 TIP=`git rev-parse --short HEAD`
 PACKAGE_RELEASE=${TIP}
 PREFIX=/usr
-MAKE="make -j8"
+MAKE="make -j1"
 
 download()
 {

packaging/tinyos-tools-devel/tinyos-tools.control

@@ -1,10 +1,8 @@
-Package: tinyos-tools-15
+Package: tinyos-tools-devel
 Version: %{version}
 Section: devel
 Priority: optional
 Architecture: %{architecture}
 Depends: python, python-serial, perl, nesc, default-jdk, default-jre
 Maintainer: Eric B. Decker <cire831@gmail.com>, Andras Biro <andras.biro@ucmote.com>
-Description: Development-tools for TinyOS.   For development trunk after .platform
-    to platform conversion (post SHA 6dc714b).  The tinyos-tools situation will also
-    change again after #190 is commited.
+Description: Experimental (development trunk) tools for TinyOS.

packaging/tinyos-tools-devel/tinyos-tools.spec

@@ -1,5 +1,5 @@
 Summary: TinyOS tools 
-Name: tinyos-tools-15
+Name: tinyos-tools-devel
 Version: %{version}
 Release: %{release}
 License: GNU GPL Version 2
@@ -13,9 +13,9 @@ Provides: /bin/sh /bin/bash
 Requires: nesc >= 1.3
 
 %description
-Tools for use with tinyos. Includes, for example: uisp, motelist, pybsl, mig,
-ncc and nesdoc. The source for these tools is found in the TinyOS CVS
-repository under tinyos-2.x/tools.
+Experimental (development trunk) tools for use with tinyos. Includes, for example:
+uisp, motelist, pybsl, mig, ncc and nesdoc. The source for these tools is found
+in the TinyOS git repository under tinyos-2.x/tools.
 
 Development trunk release (post .platform -> platform change).