diff -Nru msrtool-20141027/debian/changelog msrtool-20141027/debian/changelog --- msrtool-20141027/debian/changelog 2015-09-02 19:21:25.000000000 +0000 +++ msrtool-20141027/debian/changelog 2016-12-05 14:47:41.000000000 +0000 @@ -1,3 +1,17 @@ +msrtool (1:20141027-1.1ubuntu1) zesty; urgency=medium + + * Merge from Debian (LP: #1647246). Remaining changes: + - Restrict build arches to i386 and amd64. + + -- Simon Quigley Sun, 04 Dec 2016 20:54:30 -0600 + +msrtool (1:20141027-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with PIE enabled, patch by Adrian Bunk (Closes: #837570). + + -- Andrey Rahmatullin Sat, 26 Nov 2016 23:42:53 +0500 + msrtool (1:20141027-1ubuntu1) wily; urgency=medium * Restrict build arches to i386 and amd64. diff -Nru msrtool-20141027/debian/patches/fix-pie.patch msrtool-20141027/debian/patches/fix-pie.patch --- msrtool-20141027/debian/patches/fix-pie.patch 1970-01-01 00:00:00.000000000 +0000 +++ msrtool-20141027/debian/patches/fix-pie.patch 2016-12-05 14:47:41.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Don't build with -fno-pic + -fno-pic isn't needed, and it breaks building when + the compiler defaults to PIE. +Author: Adrian Bunk +Bug-Debian: https://bugs.debian.org/837570 + +--- msrtool-20141027.orig/Makefile.in ++++ msrtool-20141027/Makefile.in +@@ -23,7 +23,7 @@ PROGRAM = msrtool + CC = @CC@ + INSTALL = @INSTALL@ + PREFIX = @PREFIX@ +-CFLAGS = @CFLAGS@ -fno-pic ++CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ + + TARGETS = geodegx2.o geodelx.o cs5536.o k8.o intel_pentium3_early.o intel_pentium3.o intel_pentium4_early.o intel_pentium4_later.o intel_core1.o intel_core2_early.o intel_core2_later.o intel_nehalem.o intel_atom.o diff -Nru msrtool-20141027/debian/patches/series msrtool-20141027/debian/patches/series --- msrtool-20141027/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ msrtool-20141027/debian/patches/series 2016-12-05 14:47:41.000000000 +0000 @@ -0,0 +1 @@ +fix-pie.patch