packaging: use plain 1.0beta1 as version number
Previously, 0.9.2+1.0beta1 was used, with the goal of ensuring proper versioning of Debian packages. This patch makes it explicit that the Debian package version must start with the version of the previous release to get proper versioning (0.9.2 < 0.9.2+1.0beta < 1.0).
This commit is contained in:
parent
addae0f0f7
commit
2307bf5c0f
|
@ -80,7 +80,7 @@ TYPE_rpm = -R
|
|||
# - don't force dependency on specific EDS libs via backends, their versions change too much (handled via --enable-evolution-compatibility and dynamic loading of the backends)
|
||||
# - ignore client-test dependencies (because users typically don't run it)
|
||||
REQUIRES_deb = --requires="'$(shell set -x; cd dist; LD_LIBRARY_PATH=$(distdir)/usr/lib:$(distdir)/usr/lib/syncevolution dpkg-shlibdeps -L$(srcdir)/src/shlibs.local --ignore-missing-info -O $$(for i in $$(find $(distdir) -type f -perm /u+x | grep -v -e client-test -e lib/syncevolution/sync); do if file $$i | grep ELF >/dev/null; then echo $$i; fi; done) | sed -e 's/[^=]*=//')'"
|
||||
VERSION_deb = `echo 1:$(VERSION) | perl -p -e 's/(\d+\.\d+)([-a-z0-9]+)/sprintf("%0.1f+$$1$$2", ($$1 - 0.1))/e'`
|
||||
VERSION_deb = 1:$(STABLE_VERSION)$(VERSION)
|
||||
VERSION_rpm = `echo $(VERSION) | sed -e s/-/_/g`
|
||||
RELEASE = 2
|
||||
|
||||
|
|
|
@ -1,7 +1,14 @@
|
|||
dnl -*- mode: Autoconf; -*-
|
||||
dnl Invoke autogen.sh to produce a configure script.
|
||||
|
||||
AC_INIT([syncevolution], [0.9.2+1.0beta1])
|
||||
# The STABLE_VERSION is used when building
|
||||
# Debian packages. For prereleases (beta, alpha),
|
||||
# set it to something like "0.9.2+" and the AC_INIT
|
||||
# VERSION to 1.0beta1 to produce 0.9.2+1.0beta1.
|
||||
AC_INIT([syncevolution], [1.0beta1])
|
||||
STABLE_VERSION=0.9.2+
|
||||
AC_SUBST(STABLE_VERSION)
|
||||
|
||||
AM_INIT_AUTOMAKE([tar-ustar])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
define([SYNTHESISSRC_REPO], [])
|
||||
|
|
Loading…
Reference in New Issue