[SCM] lives/master: Fix version handling
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Sun Jan 17 17:01:45 UTC 2016
The following commit has been merged in the master branch:
commit ac3134da8ffd9af222d1936cde4df0576dc6ac8d
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sun Jan 17 16:02:20 2016 +0100
Fix version handling
diff --git a/debian/rules b/debian/rules
index 4b51773..e3599d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,8 @@
export REPACK_SH=$(CURDIR)/debian/repack.sh
-UPSTREAM_VERSION=$(shell dpkg-parsechangelog | grep 'Version:' | sed 's/^Version:\s\(.*\)\(~ds[0-9]*\)-.*/\1/')
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/pkg-info.mk
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
@@ -20,7 +20,7 @@ override_dh_auto_configure:
override_dh_auto_install:
dh_auto_install
find debian/tmp -type f -name "*.la" -ls -delete
- cd debian/tmp/usr/share/doc/lives-$(UPSTREAM_VERSION) && \
+ cd debian/tmp/usr/share/doc/lives-$(DEB_VERSION_UPSTREAM) && \
rm \
ChangeLog \
FEATURES \
--
lives packaging
More information about the pkg-multimedia-commits
mailing list