summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xjenkins-makesources8
1 files changed, 7 insertions, 1 deletions
diff --git a/jenkins-makesources b/jenkins-makesources
index caecb71..fb5854d 100755
--- a/jenkins-makesources
+++ b/jenkins-makesources
@@ -59,6 +59,12 @@ upstream_commit=`cd $upstream_source && git log -n1 --pretty=format:%h`
git_version=`cd $upstream_source && git describe --match='v*'`||git_version=$base_version.`date +%Y%m%d`
pkg_version=`echo $git_version|sed -e 's/^v//' -e 's/-rc/~rc/' -e 's/-\([0-9]*\)-/+git\1+/'`
+if [ "x$epoch" != "x" ]
+then
+ e_version="$epoch:$pkg_version"
+else
+ e_version=$pkg_version
+fi
currentdate=`date -R`
pkg_dir=${upstream_source}-${pkg_version}
@@ -69,7 +75,7 @@ cp -a "${pkg_dir}.orig" "${pkg_dir}"
cp -a $packaging_dir "${pkg_dir}/debian/"
tar caf ${upstream_source}_${pkg_version}.orig.tar.xz ${pkg_dir}.orig
-version=${pkg_version}-${extraver}
+version=${e_version}-${extraver}
echo "Preparing ${version}"