[Pkg-loop-aes-commits] r1429 - in /trunk/loop-aes-utils: ./ debian/changelog debian/control debian/rules

[xam at users.alioth.debian.org]

Author: xam
Date: Sat Aug 11 14:25:34 2007
New Revision: 1429

URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1429
Log:
Build with SELinux support

Modified:
    trunk/loop-aes-utils/   (props changed)
    trunk/loop-aes-utils/debian/changelog
    trunk/loop-aes-utils/debian/control
    trunk/loop-aes-utils/debian/rules

Propchange: trunk/loop-aes-utils/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Aug 11 14:25:34 2007
@@ -1,4 +1,4 @@
-02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:10990
+02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:10991
 53348a03-e5de-0310-b097-96e6f85ea926:/import/loop-aes-utils/branches/2.12-alternative:120
 53348a03-e5de-0310-b097-96e6f85ea926:/import/loop-aes-utils/branches/2.12-dpatch:196
 53348a03-e5de-0310-b097-96e6f85ea926:/import/loop-aes-utils/trunk/current:338

Modified: trunk/loop-aes-utils/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/changelog?rev=1429&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/changelog (original)
+++ trunk/loop-aes-utils/debian/changelog Sat Aug 11 14:25:34 2007
@@ -3,7 +3,7 @@
   * New upstream release
   * Sync with util-linux 2.13~rc-3: All patches in
     debian/patches/* included upstream.
-  * Build with libvolume-id
+  * Build with libvolume-id, libselinux
   * Update loop-AES patch to v3.2a and rebase against
     util-linux-ng 2.13-rc3
 

Modified: trunk/loop-aes-utils/debian/control
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/control?rev=1429&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/control (original)
+++ trunk/loop-aes-utils/debian/control Sat Aug 11 14:25:34 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Loop-AES Team <pkg-loop-aes-maint at lists.alioth.debian.org>
 Uploaders: Max Vozeler <xam at debian.org>
-Build-Depends: debhelper (>= 4.2), dpatch (>= 2.0.0), gettext, libvolume-id-dev (>=0.113-2), uuid-dev
+Build-Depends: debhelper (>= 4.2), dpatch (>= 2.0.0), gettext, libvolume-id-dev (>=0.113-2), uuid-dev, libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
 Standards-Version: 3.7.2
 
 Package: loop-aes-utils

Modified: trunk/loop-aes-utils/debian/rules
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/rules?rev=1429&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/rules (original)
+++ trunk/loop-aes-utils/debian/rules Sat Aug 11 14:25:34 2007
@@ -12,10 +12,16 @@
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+CONFOPTS = --with-fsprobe=volume_id
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+CONFOPTS += --with-selinux
+endif
 
 config-stamp: patch-stamp configure
 	dh_testdir
-	./configure --with-fsprobe=volume_id
+	./configure $(CONFOPTS)
 	touch config-stamp
 
 build: build-stamp