summaryrefslogtreecommitdiff
path: root/version.conf
diff options
context:
space:
mode:
authorJeff Morriss <morriss@ulticom.com>2014-07-01 16:39:15 -0400
committerGerald Combs <gerald@wireshark.org>2014-07-21 22:22:12 +0000
commitdcf071714461b4021574b2ed17b71a08854d707d (patch)
treea04afe1a8df0d90aad55f1b139dd562d3aece58d /version.conf
parentfd12a881a6989ee9406c5f575b2329c4e1a94980 (diff)
downloadwireshark-dcf071714461b4021574b2ed17b71a08854d707d.tar.gz
Don't put hyphens in the rc's versions.
Apparently neither RPM nor the Debian packaging systems like having hyphens in in the version. This change leaves a hyphen in the daily builds (which means we can't build RPMs or .debs of those); we might want to consider changing that to a tilde (~). Change-Id: Iaa4f3135e9e6452c2e1e199d85540e50778c5cdc Reviewed-on: https://code.wireshark.org/review/2759 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'version.conf')
-rw-r--r--version.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/version.conf b/version.conf
index 2ae4ee138b..6811e55e10 100644
--- a/version.conf
+++ b/version.conf
@@ -1,11 +1,11 @@
# Interim releases: Enable packaging, add a "rc" to the version.
enable: 1
-pkg_format: -rc2-%#
+pkg_format: rc2-%#
pkg_enable: 1
# Release candidates
#enable: 1
-#pkg_format: -rc2
+#pkg_format: rc2
#pkg_enable: 1
# Final release: Disable package version stamps.