diff -u policycoreutils-2.1.0/debian/changelog policycoreutils-2.1.0/debian/changelog --- policycoreutils-2.1.0/debian/changelog +++ policycoreutils-2.1.0/debian/changelog @@ -1,3 +1,13 @@ +policycoreutils (2.1.0-3ubuntu1.1) precise-proposed; urgency=low + + * Fix FTBFS in precise: (LP: #935368) + - Define _GNU_SOURCE earlier in seunshare.c + - Update to multiarch path of libsepol.a + * debian/policycoreutils.postrm: + - Remove the rc.d links on purge (LP: #1005398) + + -- Jason Conti Mon, 04 Jun 2012 12:09:07 -0400 + policycoreutils (2.1.0-3ubuntu1) precise; urgency=low * Merge from Debian testing (LP: #896730). Remaining changes: diff -u policycoreutils-2.1.0/debian/policycoreutils.postrm policycoreutils-2.1.0/debian/policycoreutils.postrm --- policycoreutils-2.1.0/debian/policycoreutils.postrm +++ policycoreutils-2.1.0/debian/policycoreutils.postrm @@ -92,9 +92,9 @@ ##: ucf --purge /etc/${package_name}.conf # Remove symlinks from /etc/rc?.d - update-rc.d policycoreutils defaults >/dev/null - update-rc.d mcstrans defaults >/dev/null - update-rc.d sandbox defaults >/dev/null + update-rc.d policycoreutils remove >/dev/null + update-rc.d mcstrans remove >/dev/null + update-rc.d sandbox remove >/dev/null ##: if [ -e /usr/share/debconf/confmodule ]; then ##: # Purge this package's data from the debconf database. diff -u policycoreutils-2.1.0/debian/common/archvars.mk policycoreutils-2.1.0/debian/common/archvars.mk --- policycoreutils-2.1.0/debian/common/archvars.mk +++ policycoreutils-2.1.0/debian/common/archvars.mk @@ -73,6 +73,7 @@ export DEB_BUILD_GNU_SYSTEM:= $(shell $(DPKG_ARCH) -qDEB_BUILD_GNU_SYSTEM) export DEB_BUILD_GNU_TYPE := $(shell $(DPKG_ARCH) -qDEB_BUILD_GNU_TYPE) export DEB_HOST_ARCH := $(shell $(DPKG_ARCH) $(ha) -qDEB_HOST_ARCH) +export DEB_HOST_MULTIARCH := $(shell $(DPKG_ARCH) -qDEB_HOST_MULTIARCH) export DEB_HOST_ARCH_OS := $(shell $(DPKG_ARCH) $(ha) -qDEB_HOST_ARCH_OS \ 2>/dev/null|| true) export DEB_HOST_ARCH_CPU := $(shell $(DPKG_ARCH) $(ha) -qDEB_HOST_ARCH_CPU \ diff -u policycoreutils-2.1.0/mcstrans/utils/Makefile policycoreutils-2.1.0/mcstrans/utils/Makefile --- policycoreutils-2.1.0/mcstrans/utils/Makefile +++ policycoreutils-2.1.0/mcstrans/utils/Makefile @@ -17,7 +17,7 @@ endif endif endif -LIBDIR=/usr/lib +LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) CFLAGS ?= -Wall override CFLAGS += -I../src -D_GNU_SOURCE diff -u policycoreutils-2.1.0/mcstrans/src/Makefile policycoreutils-2.1.0/mcstrans/src/Makefile --- policycoreutils-2.1.0/mcstrans/src/Makefile +++ policycoreutils-2.1.0/mcstrans/src/Makefile @@ -13,7 +13,7 @@ endif endif endif -LIBDIR=/usr/lib +LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) # Installation directories. PREFIX ?= $(DESTDIR)/usr SBINDIR ?= $(DESTDIR)/sbin only in patch2: unchanged: --- policycoreutils-2.1.0.orig/semodule_deps/Makefile +++ policycoreutils-2.1.0/semodule_deps/Makefile @@ -2,7 +2,7 @@ PREFIX ?= ${DESTDIR}/usr INCLUDEDIR ?= $(PREFIX)/include BINDIR ?= $(PREFIX)/bin -LIBDIR ?= ${PREFIX}/lib +LIBDIR ?= ${PREFIX}/lib/$(DEB_HOST_MULTIARCH) MANDIR ?= $(PREFIX)/share/man CFLAGS ?= -Werror -Wall -W only in patch2: unchanged: --- policycoreutils-2.1.0.orig/sandbox/seunshare.c +++ policycoreutils-2.1.0/sandbox/seunshare.c @@ -1,10 +1,10 @@ +#define _GNU_SOURCE #include #include #include #include #include #include -#define _GNU_SOURCE #include #include #include