From 0aaec6f19b4fb432dcc7672b4f715de3f165b34a Mon Sep 17 00:00:00 2001 From: Sojourner Truth <jon.w.wilkes@gmail.com> Date: Sun, 19 Jun 2016 21:12:37 -0400 Subject: [PATCH] port agraef's commit from Pd-l2ork: debuild: Add short sha to Debian package version for easier identification. commit a1c6862d5324eb014b573f6acc9ac668979d4c4f --- debuild/Makefile | 2 +- debuild/debian/changelog | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/debuild/Makefile b/debuild/Makefile index 21987deb7..7ddd8c729 100644 --- a/debuild/Makefile +++ b/debuild/Makefile @@ -34,7 +34,7 @@ # The Debian version gets derived from the date and serial number of the last # commit. You can print it with 'make debversion'. -debversion = $(shell git log -1 --format=%cd --date=short | sed -e 's/-//g')+git$(shell git rev-list --count HEAD) +debversion = $(shell git log -1 --format=%cd --date=short | sed -e 's/-//g')+git$(shell git rev-list --count HEAD)+$(shell git rev-parse --short HEAD) # Debian revision number of the package. debrevision = 1 # Source tarball and folder. diff --git a/debuild/debian/changelog b/debuild/debian/changelog index 761c24888..063961f64 100644 --- a/debuild/debian/changelog +++ b/debuild/debian/changelog @@ -1,20 +1,8 @@ -pd-l2ork (20160614+git1702-1) xenial; urgency=low +pd-l2ork (20160614+git1705+ea4eb01-1) xenial; urgency=low * Build from latest upstream source. - -- Albert Graef <aggraef@gmail.com> Tue, 14 Jun 2016 15:13:43 +0200 - -pd-l2ork (20160608+git1683-1) xenial; urgency=low - - * Build from latest upstream source. - - -- Albert Graef <aggraef@gmail.com> Thu, 09 Jun 2016 19:54:47 +0200 - -pd-l2ork (20160606+git1681-1) xenial; urgency=low - - * Build from latest upstream source. - - -- Albert Graef <aggraef@gmail.com> Tue, 07 Jun 2016 09:50:25 +0200 + -- Albert Graef <aggraef@gmail.com> Thu, 16 Jun 2016 09:58:18 +0200 pd-l2ork (0.42.6+git20141114+1491-1) trusty; urgency=low -- GitLab