summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2012-10-08 09:35:14 (EDT)
committer P. J. McDermott <pjm@nac.net>2012-10-08 09:35:14 (EDT)
commit42e0c09a856c9d55a42d649c3dcb05b32e6b607b (patch)
treeddd94c0a8faef1c7166a2d9c66cf9e2e318f2715
parent8304bbf781833b3c084f1d82d478483cfc965919 (diff)
Use "~" after <dist>; allow hyphens in <pkgver>.
-rw-r--r--specs/spf-2.0/metadata.mdwn10
1 files changed, 5 insertions, 5 deletions
diff --git a/specs/spf-2.0/metadata.mdwn b/specs/spf-2.0/metadata.mdwn
index 3df6575..90e88fa 100644
--- a/specs/spf-2.0/metadata.mdwn
+++ b/specs/spf-2.0/metadata.mdwn
@@ -100,12 +100,12 @@ Source Package Version Identifier [src-ver]
In general, the syntax of source package version identifiers is:
- <pkgver>[+sip<siprev>][-<pkgrev>][+<dist>-<distrev>]
+ <pkgver>[+sip<siprev>][-<pkgrev>][+<dist>~<distrev>]
`<pkgver>` is the version of the original upstream package or the native
-package. It may only consist of lowercase Latin letters, digits, periods, and
-tildes. It must be at least one character long. (A regular expression for this
-is `[0-9a-z.~]+`.)
+package. It may only consist of lowercase Latin letters, digits, minus signs,
+periods, and tildes. It must be at least one character long. (A regular
+expression for this is `[0-9a-z.~-]+`.)
If the upstream source archive needs to be repacked with certain changes for
compliance with the Software Inclusion Policy, the string `+sip<siprev>` must be
@@ -124,7 +124,7 @@ digits, the first of which must be greater than or equal to `1`. (A regular
expression for this is `[1-9][0-9]*`.)
If the package is to be installed into a distribution other than `trunk`, the
-string `+<dist>-<distrev>` must be appended to the end of the version
+string `+<dist>~<distrev>` must be appended to the end of the version
identifier. `<dist>` is the distribution into which the package is to be
installed, may only consist of lowercase Latin letters and digits, and must be
at least one character long. (A regular expression for this is `[a-z0-9]+`.)