summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Mitchell <kevmitch@gmail.com>2014-04-19 19:56:38 -0700
committerKevin Mitchell <kevmitch@gmail.com>2014-04-19 19:56:38 -0700
commitfb333431005ac55b5baa3c9d54414f83beef98d4 (patch)
tree826144883ac3f7047530ca5af4f4397d7603dc58
parent437784e750dfb20c74e10441a771d653a01ef244 (diff)
downloadmpv-build-fb333431005ac55b5baa3c9d54414f83beef98d4.tar.bz2
mpv-build-fb333431005ac55b5baa3c9d54414f83beef98d4.tar.xz
increment the debian epoch (the number before : in the version) for git master so that
1:0.3.8 and with --master 2:2014.04.19.0879db9 This ensures that --master is considered "newer"
-rwxr-xr-xscripts/debian-update-versions7
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/debian-update-versions b/scripts/debian-update-versions
index f4f2ef4..ae24849 100755
--- a/scripts/debian-update-versions
+++ b/scripts/debian-update-versions
@@ -4,7 +4,8 @@ get_version()
{
(
cd $1
- git describe --tags | sed 's/^[^0-9]*//'
+ VERSION=$(git describe --tags | sed 's/^[^0-9]*//')
+ echo 1:${VERSION}
)
}
@@ -14,12 +15,12 @@ get_timestamp_commit()
cd $1
TIMESTAMP=$(git log -1 --date=short --format=%cd | sed 's/-/./g')
COMMIT=$(git rev-parse --short HEAD)
- echo ${TIMESTAMP}.${COMMIT}
+ echo 2:${TIMESTAMP}.${COMMIT}
)
}
do_subst() {
- sed -e "0,/^mpv (.*)/s/(.*)/(1:$1)/" \
+ sed -e "0,/^mpv (.*)/s/(.*)/($1)/" \
-e "s/^ \* local build.*/ \* local build with ffmpeg $2, libass $3/" \
-e"s/\(^ -- Local User <localuser@localhost>\).*/\1 $(date -R)/" debian/changelog.TEMPLATE > debian/changelog
}