summaryrefslogtreecommitdiff
path: root/jenkinstool
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2012-09-01 08:53:53 +0100
committerLars Wirzenius <liw@liw.fi>2012-09-01 08:53:53 +0100
commitfe2f51bde6b3e83665d972647583b8509ea014b6 (patch)
tree407a2ddfa8b1e974e4a173306a77a77c8d2f4255 /jenkinstool
parent22810a3a82a85b0d5699330ff26563d70b5ef57e (diff)
downloadjenkinstool-fe2f51bde6b3e83665d972647583b8509ea014b6.tar.gz
Use per-debian-release versions; use right version
The per-debian-release version number is necessary so that stable and unstable both build a package.
Diffstat (limited to 'jenkinstool')
-rwxr-xr-xjenkinstool8
1 files changed, 4 insertions, 4 deletions
diff --git a/jenkinstool b/jenkinstool
index 237262f..da73f0f 100755
--- a/jenkinstool
+++ b/jenkinstool
@@ -95,7 +95,7 @@ then
version="$(upstream_version)"
version="$version.vcs$(commit_date)"
- debianversion="${version}-1"
+ debianversion="${version}-1.%(host.debian-dist)s"
debianurl="%(global.artifacts-url)s/debian"
tarball="${project}-${version}.tar.gz"
@@ -114,8 +114,8 @@ then
changes="${sourcepkg}_${debianversion}_source.changes"
dsc="${sourcepkg}_$debianversion.dsc"
dsc_url="$poolurl/$dsc"
- archany_changes="${sourcepkg}_${version}-1_%(host.arch)s.changes"
- archall_changes="${sourcepkg}_${version}-1_all.changes"
+ archany_changes="${sourcepkg}_${debianversion}_%(host.arch)s.changes"
+ archall_changes="${sourcepkg}_${debianversion}_all.changes"
fi
cd "$workdir"
@@ -567,7 +567,7 @@ fi
sudo pbuilder --update
sudo pbuilder --build --buildresult result $untrusted \
--debbuildopts $binopt *.dsc
-dput jenkins "result/${sourcepkg}_${version}-1_%(host.arch)s.changes"
+dput jenkins "result/$archany_changes"
cd "$curdir"
rm -rf "$temp"
''')