[Pkg-loop-aes-commits] r1300 - in /trunk/loop-aes/debian: changelog templates/control.modules.in

[xam at users.alioth.debian.org]

Author: xam
Date: Sun Oct 15 14:37:50 2006
New Revision: 1300

URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1300
Log:
* Drop conflicts with loop-aes-ciphers-$KVERS

Modified:
    trunk/loop-aes/debian/changelog
    trunk/loop-aes/debian/templates/control.modules.in

Modified: trunk/loop-aes/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes/debian/changelog?rev=1300&op=diff
==============================================================================
--- trunk/loop-aes/debian/changelog (original)
+++ trunk/loop-aes/debian/changelog Sun Oct 15 14:37:50 2006
@@ -1,3 +1,9 @@
+loop-aes (3.1d-10) UNRELEASED; urgency=low
+
+  * Drop conflicts with loop-aes-ciphers-$KVERS
+
+ -- Max Vozeler <xam at debian.org>  Sun, 15 Oct 2006 16:36:59 +0200
+
 loop-aes (3.1d-9) unstable; urgency=low
 
   * Update to 2.6.18-1

Modified: trunk/loop-aes/debian/templates/control.modules.in
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes/debian/templates/control.modules.in?rev=1300&op=diff
==============================================================================
--- trunk/loop-aes/debian/templates/control.modules.in (original)
+++ trunk/loop-aes/debian/templates/control.modules.in Sun Oct 15 14:37:50 2006
@@ -3,8 +3,8 @@
 Priority: optional
 Depends: linux-image- at upstreamversion@@abiname@@localversion@, loop-aes-utils (>= 2.12p-1)
 Recommends: loop-aes-testsuite
-Replaces: loop-aes- at upstreamversion@@abiname@@localversion@, loop-aes-ciphers- at upstreamversion@@abiname@@localversion@
-Conflicts: loop-aes- at upstreamversion@@abiname@@localversion@, loop-aes-ciphers- at upstreamversion@@abiname@@localversion@
+Replaces: loop-aes- at upstreamversion@@abiname@@localversion@
+Conflicts: loop-aes- at upstreamversion@@abiname@@localversion@
 Description: loop-AES encryption modules for Linux @upstreamversion@ on @class@
  This package contains the loop-AES loadable Linux kernel modules
  compiled for kernel @upstreamversion@ on @longclass@ machines.