Ubuntu Pastebin

Paste from xnox at Fri, 8 Sep 2017 11:24:11 +0000

Download as text
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
=== modified file 'debian/rules'
--- debian/rules	2017-09-08 10:39:55 +0000
+++ debian/rules	2017-09-08 11:23:55 +0000
@@ -57,14 +57,13 @@
 MIRAL_VERSION_MAJOR = $(shell perl -n -e '/^set\(MIRAL_VERSION_MAJOR ([0-9]*)\)$$/ && print $$1' src/CMakeLists.txt)
 MIRAL_VERSION_MINOR = $(shell perl -n -e '/^set\(MIRAL_VERSION_MINOR ([0-9]*)\)$$/ && print $$1' src/CMakeLists.txt)
 MIRAL_VERSION_PATCH = $(shell perl -n -e '/^set\(MIRAL_VERSION_PATCH ([0-9]*)\)$$/ && print $$1' src/CMakeLists.txt)
-MIRAL_RELEASE=$(MIRAL_VERSION_MAJOR).$(MIRAL_VERSION_MINOR).$(MIRAL_VERSION_PATCH)
-MIRAL_VERSION=$(MIRAL_RELEASE)-$(shell echo $(DEB_VERSION) | cut -d- -f 2)
+MIRAL_VERSION=$(MIRAL_VERSION_MAJOR).$(MIRAL_VERSION_MINOR).$(MIRAL_VERSION_PATCH).$(DEB_VERSION)
 
 # TODO: we'll use a symbol file once mir is abi stable
 override_dh_makeshlibs:
 	dh_makeshlibs -Nlibmiral2 -V -Nmir-test-tools
 	# libmiral2 *has* a symbols file, so we don't need to -V it!
-	dh_makeshlibs -plibmiral2 -- -v$(MIRAL_RELEASE)
+	dh_makeshlibs -plibmiral2 -- -v$(MIRAL_VERSION)
 
 override_dh_install:
 # Nothing outside Mir should link to libmirprotobuf directly.
Download as text