Another attempt at weekly versions.

package-deb

@@ -65,7 +65,7 @@ sed -i -e "s|^Section: \([^/]*\)\$|Section: varnish-$V/\1|" debian/control
 
 # Take version override set on Jenkins builds into account.
 if [ -n "$WEEKLY_VERSION" ]; then
-    FULL_VERSION="trunk-${WEEKLY_VERSION}"
+    FULL_VERSION="${WEEKLY_VERSION}+${DEBVERSION}"
     dch -v "$FULL_VERSION" "Release build #$BUILD_NUMBER ID: $BUILD_ID"
 elif [[ -n "${DEBVERSION}" ]]; then
     if [ "$RELEASE" == "" ]; then

package-rpm

@@ -23,8 +23,8 @@ cp -r ../redhat/* .
 ln "$SOURCE" `basename "$SOURCE"`
 
 if [ -n "$WEEKLY_VERSION" ]; then
-    sed -i -e "s/^Version:.*/Version: trunk/" ./*.spec
-    sed -i -e "s/.*define v_rc.*/\%define v_rc $WEEKLY_VERSION/" ./*.spec
+    sed -i -e "s/^Version:.*/Version: $WEEKLY_VERSION/" ./*.spec
+    sed -i -e "s/.*define v_rc.*/\%define v_rc 0/" ./*.spec
 else
     findversion "$SOURCE"
     sed -i -e "s/^Version:.*/Version: $V.$MINOR/" ./*.spec