tags 640630 + pending tags 652758 + pending thanks Dear maintainer,
I've prepared an NMU for policycoreutils (versioned as 2.1.0-3.1), based on the patches from Mitsuya Shibata and Hideki Yamane in #640630 and #652758, and uploaded it to DELAYED/4. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Supertramp: Try Again
diff -u policycoreutils-2.1.0/Makefile policycoreutils-2.1.0/Makefile
--- policycoreutils-2.1.0/Makefile
+++ policycoreutils-2.1.0/Makefile
@@ -1,8 +1,8 @@
SUBDIRS = setfiles semanage load_policy newrole run_init sandbox secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
-INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
+INOTIFYH = $(shell ls /usr/include/$(DEB_HOST_MULTIARCH)/sys/inotify.h 2>/dev/null)
-ifeq (${INOTIFYH}, /usr/include/sys/inotify.h)
+ifneq (${INOTIFYH},)
SUBDIRS += restorecond
endif
diff -u policycoreutils-2.1.0/debian/control policycoreutils-2.1.0/debian/control
--- policycoreutils-2.1.0/debian/control
+++ policycoreutils-2.1.0/debian/control
@@ -9,7 +9,7 @@
Build-Depends: libselinux1-dev (>= 2.1.0), libpam0g-dev,
libsepol1-dev (>= 2.1.0), file, gettext, libsemanage1-dev (>= 2.1.0),
python-sepolgen (>=1.1.0), libaudit-dev, libcap-ng-dev, libcap-dev,
- libpcre3-dev
+ libpcre3-dev, dpkg-dev (>= 1.16.0)
XS-Python-Version: >= 2.5
Package: policycoreutils
diff -u policycoreutils-2.1.0/debian/local-vars.mk policycoreutils-2.1.0/debian/local-vars.mk
--- policycoreutils-2.1.0/debian/local-vars.mk
+++ policycoreutils-2.1.0/debian/local-vars.mk
@@ -29,7 +29,7 @@
SBINDIR = $(TMPTOP)$(PREFIX)/sbin
BINDIR = $(TMPTOP)$(PREFIX)/bin
-LIBDIR = $(TMPTOP)$(PREFIX)/lib
+LIBDIR = $(TMPTOP)$(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
# Man Pages
MANDIR = $(TMPTOP)/usr/share/man
MAN1DIR = $(MANDIR)/man1
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,14 @@
+policycoreutils (2.1.0-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Adjust package to multiarch: export/use DEB_HOST_MULTIARCH in
+ debian/common/* and in some Makefiles; build-depend on dpkg-dev (>=
+ 1.16.0). Based on patches from Mitsuya Shibata and Hideki Yamane.
+ Closes: #640630, #652758
+ LP: #832802
+
+ -- gregor herrmann <gre...@debian.org> Wed, 15 Feb 2012 19:10:41 +0100
+
policycoreutils (2.1.0-3) unstable; urgency=low
* Add mcstrans examples in /usr/share/doc/policycoreutils/mcstrans-examples
diff -u policycoreutils-2.1.0/debian/common/checklibs policycoreutils-2.1.0/debian/common/checklibs
--- policycoreutils-2.1.0/debian/common/checklibs
+++ policycoreutils-2.1.0/debian/common/checklibs
@@ -50,7 +50,7 @@
while read lib; do
# For each library, see where it lives on the file system
LIB=
- for library_dir in "/lib" "/usr/lib" $LOCAL_LIBS $EXTRA_LIBRARY_PATHS; do
+ for library_dir in "/lib" "/lib/$DEB_HOST_MULTIARCH" "/usr/lib" "/usr/lib/$DEB_HOST_MULTIARCH" $LOCAL_LIBS $EXTRA_LIBRARY_PATHS; do
if [ -e "$library_dir/$lib" ]; then
LIB="$library_dir/$lib";
break
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
@@ -80,6 +80,7 @@
export DEB_HOST_GNU_CPU := $(shell $(DPKG_ARCH) $(ha) -qDEB_HOST_GNU_CPU)
export DEB_HOST_GNU_SYSTEM := $(shell $(DPKG_ARCH) $(ha) -qDEB_HOST_GNU_SYSTEM)
export DEB_HOST_GNU_TYPE := $(shell $(DPKG_ARCH) $(ha) -qDEB_HOST_GNU_TYPE)
+export DEB_HOST_MULTIARCH := $(shell $(DPKG_ARCH) $(ha) -qDEB_HOST_MULTIARCH)
# arrgh. future proofing
ifeq ($(DEB_HOST_GNU_SYSTEM), linux)
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
signature.asc
Description: Digital signature
