Ubuntu Pastebin

Paste from xnox at Thu, 7 Sep 2017 10:29:30 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
=== modified file 'debian/control'
--- debian/control	2017-09-06 12:03:51 +0000
+++ debian/control	2017-09-07 10:21:35 +0000
@@ -147,7 +147,7 @@
 Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmiral2 (= ${binary:Version}),
+Depends: libmiral2 (= ${libmiral2:Version}),
          libmirserver45 (= ${binary:Version}),
          libmirplatform-dev (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),

=== modified file 'debian/rules'
--- debian/rules	2017-09-06 12:03:51 +0000
+++ debian/rules	2017-09-07 10:23:01 +0000
@@ -1,16 +1,12 @@
 #!/usr/bin/make -f
 
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-DEB_HOST_ARCH_ENDIAN ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_ENDIAN)
-EXACT_PACKAGE_VERSION = $(shell dpkg-parsechangelog | grep Version | cut -d' ' -f 2)
-DISTRIB_CODENAME = $(shell grep DISTRIB_CODENAME /etc/lsb-release | cut -d= -f2)
+include /usr/share/dpkg/default.mk
 
 # Reconstruct the MirAL version
 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_VERSION_SUFFIX= $(shell echo $(EXACT_PACKAGE_VERSION) | cut -d- -f 2)
+MIRAL_VERSION=$(MIRAL_VERSION_MAJOR).$(MIRAL_VERSION_MINOR).$(MIRAL_VERSION_PATCH).$(DEB_VERSION)
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
@@ -72,7 +68,7 @@
 # Delete the symlink so that --fail-missing doesn't think we've missed it
 # accidentally.
 	-rm debian/tmp/usr/lib/*/libmirprotobuf.so
-ifeq ($(filter xenial yakkety zesty,$(DISTRIB_CODENAME)),)
+ifeq ($(filter xenial yakkety zesty,$(DEB_DISTRIBUTION)),)
 	dh_install
 else
 	# xenial, yakkety & zesty predate dh_missing
@@ -88,5 +84,6 @@
 	dh_shlibdeps -Xmir-test-data
 
 override_dh_gencontrol:
-	dh_gencontrol
-	dh_gencontrol -- -plibmiral2 -v$(MIRAL_VERSION_MAJOR).$(MIRAL_VERSION_MINOR).$(MIRAL_VERSION_PATCH)-$(MIRAL_VERSION_SUFFIX)
+	dh_gencontrol -plibmiral2 -- -v$(MIRAL_VERSION)
+	dh_gencontrol -- -D'libmiral2:Version=$(MIRAL_VERSION)'
+
Download as text