Package: libsepol
Version: 2.0.32-1
Severity: wishlist
Tags: patch
Hi,
the attached patch converts libsepol to multiarch format.
MfG
Goswin
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (400, 'unstable-i386')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.26-xen-1 (SMP w/2 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/bash
diff -u libsepol-2.0.32/debian/local.mk libsepol-2.0.32/debian/local.mk
--- libsepol-2.0.32/debian/local.mk
+++ libsepol-2.0.32/debian/local.mk
@@ -15,6 +15,8 @@
##
###############################################################################
+export DEB_HOST_GNU_TYPE
+
testdir:
$(testdir)
@@ -95,7 +97,7 @@
$(make_directory) $(TMPTOP)
$(make_directory) $(DOCDIR)
$(make_directory) $(LIBDIR)
- $(make_directory) $(TMPTOP)/usr/lib
+ $(make_directory) $(TMPTOP)/usr/lib/$(DEB_HOST_GNU_TYPE)
$(make_directory) $(INCDIR)
$(make_directory) $(MAN3DIR)
$(make_directory) $(MAN8DIR)
@@ -104,8 +106,8 @@
$(MAKE) DESTDIR=$(TMPTOP) -C include install
$(MAKE) DESTDIR=$(TMPTOP) -C src install
rm -rf $(LIBDIR)
- rm -f $(TMPTOP)/usr/lib/libsepol.so
- ln -s /lib/libsepol.so.1 $(TMPTOP)/usr/lib/libsepol.so
+ rm -f $(TMPTOP)/usr/lib/$(DEB_HOST_GNU_TYPE)/libsepol.so
+ ln -s /lib/$(DEB_HOST_GNU_TYPE)/libsepol.so.1 $(TMPTOP)/usr/lib/$(DEB_HOST_GNU_TYPE)/libsepol.so
$(install_file) debian/changelog $(DOCDIR)/changelog.Debian
$(install_file) ChangeLog $(DOCDIR)/changelog
gzip -9fqr $(DOCDIR)/
diff -u libsepol-2.0.32/debian/changelog libsepol-2.0.32/debian/changelog
--- libsepol-2.0.32/debian/changelog
+++ libsepol-2.0.32/debian/changelog
@@ -1,3 +1,9 @@
+libsepol (2.0.32-1a0.multi.1) unstable; urgency=low
+
+ * Convert to multiarch
+
+ -- Goswin von Brederlow <[email protected]> Mon, 11 May 2009 12:37:16 +0200
+
libsepol (2.0.32-1) unstable; urgency=low
* New upstream release
diff -u libsepol-2.0.32/debian/local-vars.mk libsepol-2.0.32/debian/local-vars.mk
--- libsepol-2.0.32/debian/local-vars.mk
+++ libsepol-2.0.32/debian/local-vars.mk
@@ -26,7 +26,7 @@
PREFIX = /usr
BINDIR = $(TMPTOP)$(PREFIX)/bin
-LIBDIR = $(TMPTOP)/lib
+LIBDIR = $(TMPTOP)/lib/$(DEB_HOST_GNU_TYPE)
INCLUDE = $(TMPTOP)$(PREFIX)/include
INCDIR = $(INCLUDE)/sepol
diff -u libsepol-2.0.32/debian/control libsepol-2.0.32/debian/control
--- libsepol-2.0.32/debian/control
+++ libsepol-2.0.32/debian/control
@@ -10,6 +10,7 @@
Package: sepol-utils
Section: admin
Architecture: any
+Multi-Arch: no
Depends: ${shlibs:Depends}
Conflicts: checkpolicy (<= 1.20)
Description: Security Enhanced Linux policy utility programs
@@ -27,6 +28,7 @@
Section: libs
Priority: required
Architecture: any
+Multi-Arch: yes
Depends: ${shlibs:Depends}
Description: Security Enhanced Linux policy library for changing policy binaries
Security-enhanced Linux is a patch of the Linux kernel and a number
diff -u libsepol-2.0.32/src/Makefile libsepol-2.0.32/src/Makefile
--- libsepol-2.0.32/src/Makefile
+++ libsepol-2.0.32/src/Makefile
@@ -1,8 +1,8 @@
# Installation directories.
PREFIX ?= /usr
INCDIR ?= $(PREFIX)/include
-LIBDIR ?= $(PREFIX)/lib
-SHLIBDIR ?= $(DESTDIR)/lib
+LIBDIR ?= $(PREFIX)/lib/$(DEB_HOST_GNU_TYPE)
+SHLIBDIR ?= $(DESTDIR)/lib/$(DEB_HOST_GNU_TYPE)
VERSION = $(shell cat ../VERSION)
LIBVERSION = 1
