Commit be70e15d authored by Dridi Boukelmoune's avatar Dridi Boukelmoune

Bring back one sed from the grave

And simplify its neighbor.
parent 6fb3a78b
varnish (6.0.0-0) UNRELEASED; urgency=medium varnish (@VERSION@) UNRELEASED; urgency=medium
* This changelog is not in use. See doc/changes.rst for release notes. * This changelog is not in use. See doc/changes.rst for release notes.
......
Source: varnish Source: varnish
Section: web Section: @SECTION@/web
Priority: optional Priority: optional
Maintainer: Varnish Software <opensource@varnish-software.com> Maintainer: Varnish Software <opensource@varnish-software.com>
Build-Depends: Build-Depends:
......
...@@ -37,13 +37,6 @@ MINOR=${MINOR%%-*} # 1 or 0 ...@@ -37,13 +37,6 @@ MINOR=${MINOR%%-*} # 1 or 0
RELEASE=${VERSION#*-} # 5.2.1 or rc1 RELEASE=${VERSION#*-} # 5.2.1 or rc1
RELEASE=${RELEASE#$VERSION} # '' or rc1 RELEASE=${RELEASE#$VERSION} # '' or rc1
cp -r -L ../debian "$DIST_DIR"/
# Modify Section to suit our repository software.
sed -i -e "s|^Section: \([^/]*\)\$|Section: varnish-$MAJOR/\1|" "$DIST_DIR/debian/control"
tar zcf "$DIST_DIR.orig.tar.gz" "$DIST_DIR"/
# Take version override set on Jenkins builds into account. # Take version override set on Jenkins builds into account.
if [ -n "${WEEKLY_VERSION:-}" ] if [ -n "${WEEKLY_VERSION:-}" ]
then then
...@@ -64,9 +57,17 @@ else ...@@ -64,9 +57,17 @@ else
DCH_TEXT="Automatic build from git" DCH_TEXT="Automatic build from git"
fi fi
FULL_VERSION="$VERSION${RELEASE:+~}$RELEASE-$DEBVERSION"
cp -r -L ../debian "$DIST_DIR"/
sed -i -e "s|@SECTION@|varnish-$MAJOR|" "$DIST_DIR/debian/control"
sed -i -e "s|@VERSION@|$FULL_VERSION|" "$DIST_DIR/debian/changelog"
tar zcf "$DIST_DIR.orig.tar.gz" "$DIST_DIR"/
cd "$DIST_DIR" cd "$DIST_DIR"
FULL_VERSION="$VERSION${RELEASE:+~}$RELEASE-$DEBVERSION"
dch -v "$FULL_VERSION" "$DCH_TEXT" dch -v "$FULL_VERSION" "$DCH_TEXT"
# Generate the source package used by subsequent sbuilds # Generate the source package used by subsequent sbuilds
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment