diff -u gnu-efi-3.0i/debian/control gnu-efi-3.0i/debian/control --- gnu-efi-3.0i/debian/control +++ gnu-efi-3.0i/debian/control @@ -1,7 +1,8 @@ Source: gnu-efi Section: devel Priority: optional -Maintainer: Nigel Croxon +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Nigel Croxon Uploaders: Bdale Garbee , Julien BLACHE Build-Depends: debhelper (>> 5), binutils (>= 2.17.50.0.14), gcc-multilib [i386 amd64 kfreebsd-amd64] Standards-Version: 3.8.4 diff -u gnu-efi-3.0i/debian/changelog gnu-efi-3.0i/debian/changelog --- gnu-efi-3.0i/debian/changelog +++ gnu-efi-3.0i/debian/changelog @@ -1,3 +1,10 @@ +gnu-efi (3.0i-3ubuntu1) maverick; urgency=low + + * Merge from debian unstable. Remaining changes: LP: #595499 + - Build with -fno-stack-protector. + + -- Bhavani Shankar Thu, 17 Jun 2010 18:20:21 +0530 + gnu-efi (3.0i-3) unstable; urgency=low * Re-enable optimisation for x64 builds; culprit found & fixed, not related @@ -9,6 +16,13 @@ -- Julien BLACHE Wed, 05 May 2010 18:18:54 +0200 +gnu-efi (3.0i-2ubuntu1) lucid; urgency=low + + * Merge from debian testing. (LP: #488797) Remaining changes: + - Build with -fno-stack-protector. + + -- Bhavani Shankar Fri, 08 Jan 2010 13:14:01 +0530 + gnu-efi (3.0i-2) unstable; urgency=low * Disable optimization for x64 builds; it looks very much like there is an only in patch2: unchanged: --- gnu-efi-3.0i.orig/Make.defaults +++ gnu-efi-3.0i/Make.defaults @@ -35,7 +35,7 @@ OS = $(shell uname -s) INCDIR = -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) -I$(TOPDIR)/inc/protocol CPPFLAGS = -DCONFIG_$(ARCH) -CFLAGS = $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants +CFLAGS = $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants -fno-stack-protector ASFLAGS = $(ARCH3264) LDFLAGS = -nostdlib INSTALL = install