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

[xam at users.alioth.debian.org]

Author: xam
Date: Sun Aug 26 13:40:29 2007
New Revision: 1451

URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1451
Log:
* Sync with util-linux 2.13~rc3-8
* Switch back to libblkid-dev

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 Sun Aug 26 13:40:29 2007
@@ -1,4 +1,4 @@
-02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:11051
+02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:11139
 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=1451&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/changelog (original)
+++ trunk/loop-aes-utils/debian/changelog Sun Aug 26 13:40:29 2007
@@ -1,9 +1,11 @@
 loop-aes-utils (2.13~rc3-2) UNRELEASED; urgency=low
 
+  * Sync with util-linux 2.13~rc3-8
+  * Switch back to libblkid-dev
   * initramfs/hook: Check that included loop module
     really is loop-AES.
 
- -- Max Vozeler <xam at debian.org>  Sun, 12 Aug 2007 18:15:17 +0200
+ -- Max Vozeler <xam at debian.org>  Sun, 26 Aug 2007 15:23:19 +0200
 
 loop-aes-utils (2.13~rc3-1) unstable; urgency=low
 

Modified: trunk/loop-aes-utils/debian/control
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/control?rev=1451&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/control (original)
+++ trunk/loop-aes-utils/debian/control Sun Aug 26 13:40:29 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), libblkid-dev, uuid-dev, libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
+Build-Depends: debhelper (>= 4.2), dpatch (>= 2.0.0), gettext, libblkid-dev, 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=1451&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/rules (original)
+++ trunk/loop-aes-utils/debian/rules Sun Aug 26 13:40:29 2007
@@ -11,7 +11,7 @@
 
 CFLAGS = -Wall -g
 
-confopts = --with-fsprobe=volume_id
+confopts = --with-fsprobe=blkid
 ifeq ($(DEB_HOST_ARCH_OS),linux)
   confopts += --with-selinux
 endif