[Pkg-loop-aes-commits] r1315 - in /trunk/loop-aes/debian: changelog control control.md5sum rules rules.gen

xam at users.alioth.debian.org xam at users.alioth.debian.org
Wed Nov 8 19:43:02 CET 2006


Author: xam
Date: Wed Nov  8 19:43:02 2006
New Revision: 1315

URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1315
Log:
* Update modules to 2.6.18-2

Modified:
    trunk/loop-aes/debian/changelog
    trunk/loop-aes/debian/control
    trunk/loop-aes/debian/control.md5sum
    trunk/loop-aes/debian/rules
    trunk/loop-aes/debian/rules.gen

Modified: trunk/loop-aes/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes/debian/changelog?rev=1315&op=diff
==============================================================================
--- trunk/loop-aes/debian/changelog (original)
+++ trunk/loop-aes/debian/changelog Wed Nov  8 19:43:02 2006
@@ -1,10 +1,11 @@
 loop-aes (3.1d-11) UNRELEASED; urgency=low
 
+  * Update modules to 2.6.18-2
   * Add manpage for loop-aes-runtests
   * Make loop-aes-runtest quiet by default, add -v
   * Set maintainer to Debian Loop-AES Team
 
- -- Max Vozeler <xam at debian.org>  Sun, 22 Oct 2006 15:23:56 +0200
+ -- Max Vozeler <xam at debian.org>  Wed,  8 Nov 2006 19:35:57 +0100
 
 loop-aes (3.1d-10) unstable; urgency=low
 

Modified: trunk/loop-aes/debian/control
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes/debian/control?rev=1315&op=diff
==============================================================================
--- trunk/loop-aes/debian/control (original)
+++ trunk/loop-aes/debian/control Wed Nov  8 19:43:02 2006
@@ -4,7 +4,7 @@
 Maintainer: Debian Loop-AES Team <pkg-loop-aes-maint at lists.alioth.debian.org>
 Uploaders: Max Vozeler <xam at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4.0.0), module-assistant, bzip2, fakeroot, linux-support-2.6.18-1, linux-headers-2.6.18-1-all-alpha [alpha], linux-headers-2.6.18-1-all-amd64 [amd64], linux-headers-2.6.18-1-all-arm [arm], linux-headers-2.6.18-1-all-armeb [armeb], linux-headers-2.6.18-1-all-hppa [hppa], linux-headers-2.6.18-1-all-i386 [i386], linux-headers-2.6.18-1-all-ia64 [ia64], linux-headers-2.6.18-1-all-m68k [m68k], linux-headers-2.6.18-1-all-mips [mips], linux-headers-2.6.18-1-all-mipsel [mipsel], linux-headers-2.6.18-1-all-powerpc [powerpc], linux-headers-2.6.18-1-all-s390 [s390], linux-headers-2.6.18-1-all-sparc [sparc]
+Build-Depends: debhelper (>= 4.0.0), module-assistant, bzip2, fakeroot, linux-support-2.6.18-2, linux-headers-2.6.18-2-all-alpha [alpha], linux-headers-2.6.18-2-all-amd64 [amd64], linux-headers-2.6.18-2-all-arm [arm], linux-headers-2.6.18-2-all-hppa [hppa], linux-headers-2.6.18-2-all-i386 [i386], linux-headers-2.6.18-2-all-ia64 [ia64], linux-headers-2.6.18-2-all-m68k [m68k], linux-headers-2.6.18-2-all-mips [mips], linux-headers-2.6.18-2-all-mipsel [mipsel], linux-headers-2.6.18-2-all-powerpc [powerpc], linux-headers-2.6.18-2-all-s390 [s390], linux-headers-2.6.18-2-all-sparc [sparc]
 
 Package: loop-aes-source
 Architecture: all
@@ -37,14 +37,14 @@
  This package provides scripts for testing the loop-AES encryption kernel
  modules.
 
-Package: loop-aes-modules-2.6.18-1-alpha-generic
+Package: loop-aes-modules-2.6.18-2-alpha-generic
 Architecture: alpha
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-alpha-generic, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-alpha-generic
-Conflicts: loop-aes-2.6.18-1-alpha-generic
+Depends: linux-image-2.6.18-2-alpha-generic, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-alpha-generic
+Conflicts: loop-aes-2.6.18-2-alpha-generic
 Description: loop-AES encryption modules for Linux 2.6.18 on Alpha
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on Alpha machines.
@@ -69,19 +69,19 @@
 Architecture: alpha
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-alpha-generic
+Depends: loop-aes-modules-2.6.18-2-alpha-generic
 Description: loop-AES encryption modules for Linux 2.6 on Alpha
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for Alpha machines.
 
-Package: loop-aes-modules-2.6.18-1-alpha-smp
+Package: loop-aes-modules-2.6.18-2-alpha-smp
 Architecture: alpha
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-alpha-smp, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-alpha-smp
-Conflicts: loop-aes-2.6.18-1-alpha-smp
+Depends: linux-image-2.6.18-2-alpha-smp, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-alpha-smp
+Conflicts: loop-aes-2.6.18-2-alpha-smp
 Description: loop-AES encryption modules for Linux 2.6.18 on Alpha SMP
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on Alpha SMP machines.
@@ -106,19 +106,19 @@
 Architecture: alpha
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-alpha-smp
+Depends: loop-aes-modules-2.6.18-2-alpha-smp
 Description: loop-AES encryption modules for Linux 2.6 on Alpha SMP
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for Alpha SMP machines.
 
-Package: loop-aes-modules-2.6.18-1-alpha-legacy
+Package: loop-aes-modules-2.6.18-2-alpha-legacy
 Architecture: alpha
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-alpha-legacy, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-alpha-legacy
-Conflicts: loop-aes-2.6.18-1-alpha-legacy
+Depends: linux-image-2.6.18-2-alpha-legacy, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-alpha-legacy
+Conflicts: loop-aes-2.6.18-2-alpha-legacy
 Description: loop-AES encryption modules for Linux 2.6.18 on Alpha Legacy
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on Alpha Legacy machines.
@@ -143,19 +143,19 @@
 Architecture: alpha
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-alpha-legacy
+Depends: loop-aes-modules-2.6.18-2-alpha-legacy
 Description: loop-AES encryption modules for Linux 2.6 on Alpha Legacy
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for Alpha Legacy machines.
 
-Package: loop-aes-modules-2.6.18-1-vserver-alpha
+Package: loop-aes-modules-2.6.18-2-vserver-alpha
 Architecture: alpha
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-vserver-alpha, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-vserver-alpha
-Conflicts: loop-aes-2.6.18-1-vserver-alpha
+Depends: linux-image-2.6.18-2-vserver-alpha, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-vserver-alpha
+Conflicts: loop-aes-2.6.18-2-vserver-alpha
 Description: loop-AES encryption modules for Linux 2.6.18 on Alpha
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on Alpha machines.
@@ -180,19 +180,19 @@
 Architecture: alpha
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-vserver-alpha
+Depends: loop-aes-modules-2.6.18-2-vserver-alpha
 Description: loop-AES encryption modules for Linux 2.6 on Alpha
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for Alpha machines.
 
-Package: loop-aes-modules-2.6.18-1-amd64
+Package: loop-aes-modules-2.6.18-2-amd64
 Architecture: amd64
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-amd64, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-amd64
-Conflicts: loop-aes-2.6.18-1-amd64
+Depends: linux-image-2.6.18-2-amd64, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-amd64
+Conflicts: loop-aes-2.6.18-2-amd64
 Description: loop-AES encryption modules for Linux 2.6.18 on AMD64
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on all 64bit single- and multiprocessor AMD and Intel
@@ -218,20 +218,20 @@
 Architecture: amd64
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-amd64
+Depends: loop-aes-modules-2.6.18-2-amd64
 Description: loop-AES encryption modules for Linux 2.6 on AMD64
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for all 64bit single- and
  multiprocessor AMD and Intel machines.
 
-Package: loop-aes-modules-2.6.18-1-vserver-amd64
+Package: loop-aes-modules-2.6.18-2-vserver-amd64
 Architecture: amd64
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-vserver-amd64, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-vserver-amd64
-Conflicts: loop-aes-2.6.18-1-vserver-amd64
+Depends: linux-image-2.6.18-2-vserver-amd64, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-vserver-amd64
+Conflicts: loop-aes-2.6.18-2-vserver-amd64
 Description: loop-AES encryption modules for Linux 2.6.18 on AMD64
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on all 64bit single- and multiprocessor AMD and Intel
@@ -257,20 +257,20 @@
 Architecture: amd64
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-vserver-amd64
+Depends: loop-aes-modules-2.6.18-2-vserver-amd64
 Description: loop-AES encryption modules for Linux 2.6 on AMD64
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for all 64bit single- and
  multiprocessor AMD and Intel machines.
 
-Package: loop-aes-modules-2.6.18-1-xen-amd64
+Package: loop-aes-modules-2.6.18-2-xen-amd64
 Architecture: amd64
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-xen-amd64, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-xen-amd64
-Conflicts: loop-aes-2.6.18-1-xen-amd64
+Depends: linux-image-2.6.18-2-xen-amd64, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-xen-amd64
+Conflicts: loop-aes-2.6.18-2-xen-amd64
 Description: loop-AES encryption modules for Linux 2.6.18 on AMD64
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on all 64bit single- and multiprocessor AMD and Intel
@@ -296,20 +296,20 @@
 Architecture: amd64
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-xen-amd64
+Depends: loop-aes-modules-2.6.18-2-xen-amd64
 Description: loop-AES encryption modules for Linux 2.6 on AMD64
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for all 64bit single- and
  multiprocessor AMD and Intel machines.
 
-Package: loop-aes-modules-2.6.18-1-xen-vserver-amd64
+Package: loop-aes-modules-2.6.18-2-xen-vserver-amd64
 Architecture: amd64
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-xen-vserver-amd64, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-xen-vserver-amd64
-Conflicts: loop-aes-2.6.18-1-xen-vserver-amd64
+Depends: linux-image-2.6.18-2-xen-vserver-amd64, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-xen-vserver-amd64
+Conflicts: loop-aes-2.6.18-2-xen-vserver-amd64
 Description: loop-AES encryption modules for Linux 2.6.18 on AMD64
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on all 64bit single- and multiprocessor AMD and Intel
@@ -335,20 +335,20 @@
 Architecture: amd64
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-xen-vserver-amd64
+Depends: loop-aes-modules-2.6.18-2-xen-vserver-amd64
 Description: loop-AES encryption modules for Linux 2.6 on AMD64
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for all 64bit single- and
  multiprocessor AMD and Intel machines.
 
-Package: loop-aes-modules-2.6.18-1-footbridge
+Package: loop-aes-modules-2.6.18-2-footbridge
 Architecture: arm
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-footbridge, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-footbridge
-Conflicts: loop-aes-2.6.18-1-footbridge
+Depends: linux-image-2.6.18-2-footbridge, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-footbridge
+Conflicts: loop-aes-2.6.18-2-footbridge
 Description: loop-AES encryption modules for Linux 2.6.18 on Footbridge based
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on Footbridge (CATS, Netwinder) machines.
@@ -373,20 +373,20 @@
 Architecture: arm
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-footbridge
+Depends: loop-aes-modules-2.6.18-2-footbridge
 Description: loop-AES encryption modules for Linux 2.6 on Footbridge based
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for Footbridge (CATS, Netwinder)
  machines.
 
-Package: loop-aes-modules-2.6.18-1-iop32x
+Package: loop-aes-modules-2.6.18-2-iop32x
 Architecture: arm
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-iop32x, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-iop32x
-Conflicts: loop-aes-2.6.18-1-iop32x
+Depends: linux-image-2.6.18-2-iop32x, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-iop32x
+Conflicts: loop-aes-2.6.18-2-iop32x
 Description: loop-AES encryption modules for Linux 2.6.18 on IOP32x
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on IOP32x based (Thecus N2100, etc) machines.
@@ -411,20 +411,20 @@
 Architecture: arm
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-iop32x
+Depends: loop-aes-modules-2.6.18-2-iop32x
 Description: loop-AES encryption modules for Linux 2.6 on IOP32x
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for IOP32x based (Thecus N2100, etc)
  machines.
 
-Package: loop-aes-modules-2.6.18-1-ixp4xx
+Package: loop-aes-modules-2.6.18-2-ixp4xx
 Architecture: arm
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-ixp4xx, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-ixp4xx
-Conflicts: loop-aes-2.6.18-1-ixp4xx
+Depends: linux-image-2.6.18-2-ixp4xx, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-ixp4xx
+Conflicts: loop-aes-2.6.18-2-ixp4xx
 Description: loop-AES encryption modules for Linux 2.6.18 on IXP4xx
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on IXP4xx based (Linksys NSLU2, etc) machines.
@@ -449,20 +449,20 @@
 Architecture: arm
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-ixp4xx
+Depends: loop-aes-modules-2.6.18-2-ixp4xx
 Description: loop-AES encryption modules for Linux 2.6 on IXP4xx
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for IXP4xx based (Linksys NSLU2,
  etc) machines.
 
-Package: loop-aes-modules-2.6.18-1-rpc
+Package: loop-aes-modules-2.6.18-2-rpc
 Architecture: arm
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-rpc, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-rpc
-Conflicts: loop-aes-2.6.18-1-rpc
+Depends: linux-image-2.6.18-2-rpc, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-rpc
+Conflicts: loop-aes-2.6.18-2-rpc
 Description: loop-AES encryption modules for Linux 2.6.18 on RiscPC
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on Arcon RiscPC machines.
@@ -487,19 +487,19 @@
 Architecture: arm
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-rpc
+Depends: loop-aes-modules-2.6.18-2-rpc
 Description: loop-AES encryption modules for Linux 2.6 on RiscPC
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for Arcon RiscPC machines.
 
-Package: loop-aes-modules-2.6.18-1-s3c2410
+Package: loop-aes-modules-2.6.18-2-s3c2410
 Architecture: arm
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-s3c2410, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-s3c2410
-Conflicts: loop-aes-2.6.18-1-s3c2410
+Depends: linux-image-2.6.18-2-s3c2410, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-s3c2410
+Conflicts: loop-aes-2.6.18-2-s3c2410
 Description: loop-AES encryption modules for Linux 2.6.18 on Samsung S3C2410
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on Samsung S3C2410 based (BAST, IPAQ 1940, etc)
@@ -525,59 +525,20 @@
 Architecture: arm
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-s3c2410
+Depends: loop-aes-modules-2.6.18-2-s3c2410
 Description: loop-AES encryption modules for Linux 2.6 on Samsung S3C2410
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for Samsung S3C2410 based (BAST,
  IPAQ 1940, etc) machines.
 
-Package: loop-aes-modules-2.6.18-1-nslu2
-Architecture: armeb
-Section: admin
-Priority: optional
-Depends: linux-image-2.6.18-1-nslu2, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-nslu2
-Conflicts: loop-aes-2.6.18-1-nslu2
-Description: loop-AES encryption modules for Linux 2.6.18 on NSLU2
- This package contains the loop-AES loadable Linux kernel modules compiled
- for kernel 2.6.18 on Linksys NSLU2 (Network Storage Link for USB 2.0 Disk
- Drives) machines.
- .
- loop-AES can be used to encrypt disk partitions, removable media,  swap
- space and other devices.  It provides measures to strengthen the
- encryption: Passphrase seeds, multiple hash iterations, MD5 IV and use of
- alternating encryption keys.
- .
- Encryption keys can be stored in a GnuPG-encrypted keyfile, which allows
- the passphrase to be changed without re-encryption.  Keyfiles can also be
- encrypted asymmetrically for multi-user access.
- .
- This package includes the cipher modules blowfish, twofish and  serpent in
- addition to the default cipher (AES).
- .
- If you compiled a custom kernel, you will most likely need to compile a
- custom version of these modules as well.  The package loop-aes-source has
- been provided for this purpose.
-
-Package: loop-aes-modules-2.6-nslu2
-Architecture: armeb
-Section: admin
-Priority: optional
-Depends: loop-aes-modules-2.6.18-1-nslu2
-Description: loop-AES encryption modules for Linux 2.6 on NSLU2
- This package will always depend on the loop-AES module package built for
- the latest 2.6 kernel image available for Linksys NSLU2 (Network Storage
- Link for USB 2.0 Disk Drives) machines.
-
-Package: loop-aes-modules-2.6.18-1-parisc
+Package: loop-aes-modules-2.6.18-2-parisc
 Architecture: hppa
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-parisc, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-parisc
-Conflicts: loop-aes-2.6.18-1-parisc
+Depends: linux-image-2.6.18-2-parisc, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-parisc
+Conflicts: loop-aes-2.6.18-2-parisc
 Description: loop-AES encryption modules for Linux 2.6.18 on 32-bit PA-RISC
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on 32-bit PA-RISC machines.
@@ -602,19 +563,19 @@
 Architecture: hppa
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-parisc
+Depends: loop-aes-modules-2.6.18-2-parisc
 Description: loop-AES encryption modules for Linux 2.6 on 32-bit PA-RISC
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for 32-bit PA-RISC machines.
 
-Package: loop-aes-modules-2.6.18-1-parisc-smp
+Package: loop-aes-modules-2.6.18-2-parisc-smp
 Architecture: hppa
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-parisc-smp, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-parisc-smp
-Conflicts: loop-aes-2.6.18-1-parisc-smp
+Depends: linux-image-2.6.18-2-parisc-smp, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-parisc-smp
+Conflicts: loop-aes-2.6.18-2-parisc-smp
 Description: loop-AES encryption modules for Linux 2.6.18 on multiprocessor 32-bit PA-RISC
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on multiprocessor 32-bit PA-RISC machines.
@@ -639,20 +600,20 @@
 Architecture: hppa
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-parisc-smp
+Depends: loop-aes-modules-2.6.18-2-parisc-smp
 Description: loop-AES encryption modules for Linux 2.6 on multiprocessor 32-bit PA-RISC
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for multiprocessor 32-bit PA-RISC
  machines.
 
-Package: loop-aes-modules-2.6.18-1-parisc64
+Package: loop-aes-modules-2.6.18-2-parisc64
 Architecture: hppa
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-parisc64, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-parisc64
-Conflicts: loop-aes-2.6.18-1-parisc64
+Depends: linux-image-2.6.18-2-parisc64, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-parisc64
+Conflicts: loop-aes-2.6.18-2-parisc64
 Description: loop-AES encryption modules for Linux 2.6.18 on 64-bit PA-RISC
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on 64-bit PA-RISC machines.
@@ -677,19 +638,19 @@
 Architecture: hppa
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-parisc64
+Depends: loop-aes-modules-2.6.18-2-parisc64
 Description: loop-AES encryption modules for Linux 2.6 on 64-bit PA-RISC
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for 64-bit PA-RISC machines.
 
-Package: loop-aes-modules-2.6.18-1-parisc64-smp
+Package: loop-aes-modules-2.6.18-2-parisc64-smp
 Architecture: hppa
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-parisc64-smp, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-parisc64-smp
-Conflicts: loop-aes-2.6.18-1-parisc64-smp
+Depends: linux-image-2.6.18-2-parisc64-smp, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-parisc64-smp
+Conflicts: loop-aes-2.6.18-2-parisc64-smp
 Description: loop-AES encryption modules for Linux 2.6.18 on multiprocessor 64-bit PA-RISC
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on multiprocessor 64-bit PA-RISC machines.
@@ -714,20 +675,20 @@
 Architecture: hppa
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-parisc64-smp
+Depends: loop-aes-modules-2.6.18-2-parisc64-smp
 Description: loop-AES encryption modules for Linux 2.6 on multiprocessor 64-bit PA-RISC
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for multiprocessor 64-bit PA-RISC
  machines.
 
-Package: loop-aes-modules-2.6.18-1-486
+Package: loop-aes-modules-2.6.18-2-486
 Architecture: i386
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-486, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-486
-Conflicts: loop-aes-2.6.18-1-486
+Depends: linux-image-2.6.18-2-486, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-486
+Conflicts: loop-aes-2.6.18-2-486
 Description: loop-AES encryption modules for Linux 2.6.18 on x86
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on x86 and compatible machines.
@@ -752,19 +713,19 @@
 Architecture: i386
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-486
+Depends: loop-aes-modules-2.6.18-2-486
 Description: loop-AES encryption modules for Linux 2.6 on x86
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for x86 and compatible machines.
 
-Package: loop-aes-modules-2.6.18-1-686
+Package: loop-aes-modules-2.6.18-2-686
 Architecture: i386
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-686, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-686
-Conflicts: loop-aes-2.6.18-1-686
+Depends: linux-image-2.6.18-2-686, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-686
+Conflicts: loop-aes-2.6.18-2-686
 Description: loop-AES encryption modules for Linux 2.6.18 on PPro/Celeron/PII/PIII/P4
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
@@ -790,20 +751,20 @@
 Architecture: i386
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-686
+Depends: loop-aes-modules-2.6.18-2-686
 Description: loop-AES encryption modules for Linux 2.6 on PPro/Celeron/PII/PIII/P4
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for Pentium Pro/Celeron/Pentium
  II/Pentium III/Pentium 4 machines.
 
-Package: loop-aes-modules-2.6.18-1-k7
+Package: loop-aes-modules-2.6.18-2-k7
 Architecture: i386
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-k7, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-k7
-Conflicts: loop-aes-2.6.18-1-k7
+Depends: linux-image-2.6.18-2-k7, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-k7
+Conflicts: loop-aes-2.6.18-2-k7
 Description: loop-AES encryption modules for Linux 2.6.18 on AMD K7
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on 32bit AMD Duron/Athlon/AthlonXP machines.
@@ -828,20 +789,20 @@
 Architecture: i386
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-k7
+Depends: loop-aes-modules-2.6.18-2-k7
 Description: loop-AES encryption modules for Linux 2.6 on AMD K7
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for 32bit AMD Duron/Athlon/AthlonXP
  machines.
 
-Package: loop-aes-modules-2.6.18-1-686-bigmem
+Package: loop-aes-modules-2.6.18-2-686-bigmem
 Architecture: i386
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-686-bigmem, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-686-bigmem
-Conflicts: loop-aes-2.6.18-1-686-bigmem
+Depends: linux-image-2.6.18-2-686-bigmem, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-686-bigmem
+Conflicts: loop-aes-2.6.18-2-686-bigmem
 Description: loop-AES encryption modules for Linux 2.6.18 on PPro/Celeron/PII/PIII/P4
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
@@ -867,20 +828,20 @@
 Architecture: i386
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-686-bigmem
+Depends: loop-aes-modules-2.6.18-2-686-bigmem
 Description: loop-AES encryption modules for Linux 2.6 on PPro/Celeron/PII/PIII/P4
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for Pentium Pro/Celeron/Pentium
  II/Pentium III/Pentium 4 with 4-64G RAM machines.
 
-Package: loop-aes-modules-2.6.18-1-vserver-686
+Package: loop-aes-modules-2.6.18-2-vserver-686
 Architecture: i386
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-vserver-686, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-vserver-686
-Conflicts: loop-aes-2.6.18-1-vserver-686
+Depends: linux-image-2.6.18-2-vserver-686, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-vserver-686
+Conflicts: loop-aes-2.6.18-2-vserver-686
 Description: loop-AES encryption modules for Linux 2.6.18 on PPro/Celeron/PII/PIII/P4
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
@@ -906,20 +867,20 @@
 Architecture: i386
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-vserver-686
+Depends: loop-aes-modules-2.6.18-2-vserver-686
 Description: loop-AES encryption modules for Linux 2.6 on PPro/Celeron/PII/PIII/P4
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for Pentium Pro/Celeron/Pentium
  II/Pentium III/Pentium 4 machines.
 
-Package: loop-aes-modules-2.6.18-1-vserver-k7
+Package: loop-aes-modules-2.6.18-2-vserver-k7
 Architecture: i386
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-vserver-k7, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-vserver-k7
-Conflicts: loop-aes-2.6.18-1-vserver-k7
+Depends: linux-image-2.6.18-2-vserver-k7, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-vserver-k7
+Conflicts: loop-aes-2.6.18-2-vserver-k7
 Description: loop-AES encryption modules for Linux 2.6.18 on AMD K7
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on 32bit AMD Duron/Athlon/AthlonXP machines.
@@ -944,20 +905,20 @@
 Architecture: i386
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-vserver-k7
+Depends: loop-aes-modules-2.6.18-2-vserver-k7
 Description: loop-AES encryption modules for Linux 2.6 on AMD K7
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for 32bit AMD Duron/Athlon/AthlonXP
  machines.
 
-Package: loop-aes-modules-2.6.18-1-xen-686
+Package: loop-aes-modules-2.6.18-2-xen-686
 Architecture: i386
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-xen-686, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-xen-686
-Conflicts: loop-aes-2.6.18-1-xen-686
+Depends: linux-image-2.6.18-2-xen-686, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-xen-686
+Conflicts: loop-aes-2.6.18-2-xen-686
 Description: loop-AES encryption modules for Linux 2.6.18 on PPro/Celeron/PII/PIII/P4
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
@@ -983,20 +944,20 @@
 Architecture: i386
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-xen-686
+Depends: loop-aes-modules-2.6.18-2-xen-686
 Description: loop-AES encryption modules for Linux 2.6 on PPro/Celeron/PII/PIII/P4
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for Pentium Pro/Celeron/Pentium
  II/Pentium III/Pentium 4 machines.
 
-Package: loop-aes-modules-2.6.18-1-xen-k7
+Package: loop-aes-modules-2.6.18-2-xen-k7
 Architecture: i386
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-xen-k7, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-xen-k7
-Conflicts: loop-aes-2.6.18-1-xen-k7
+Depends: linux-image-2.6.18-2-xen-k7, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-xen-k7
+Conflicts: loop-aes-2.6.18-2-xen-k7
 Description: loop-AES encryption modules for Linux 2.6.18 on AMD K7
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on 32bit AMD Duron/Athlon/AthlonXP machines.
@@ -1021,20 +982,20 @@
 Architecture: i386
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-xen-k7
+Depends: loop-aes-modules-2.6.18-2-xen-k7
 Description: loop-AES encryption modules for Linux 2.6 on AMD K7
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for 32bit AMD Duron/Athlon/AthlonXP
  machines.
 
-Package: loop-aes-modules-2.6.18-1-xen-vserver-686
+Package: loop-aes-modules-2.6.18-2-xen-vserver-686
 Architecture: i386
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-xen-vserver-686, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-xen-vserver-686
-Conflicts: loop-aes-2.6.18-1-xen-vserver-686
+Depends: linux-image-2.6.18-2-xen-vserver-686, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-xen-vserver-686
+Conflicts: loop-aes-2.6.18-2-xen-vserver-686
 Description: loop-AES encryption modules for Linux 2.6.18 on PPro/Celeron/PII/PIII/P4
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
@@ -1060,20 +1021,20 @@
 Architecture: i386
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-xen-vserver-686
+Depends: loop-aes-modules-2.6.18-2-xen-vserver-686
 Description: loop-AES encryption modules for Linux 2.6 on PPro/Celeron/PII/PIII/P4
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for Pentium Pro/Celeron/Pentium
  II/Pentium III/Pentium 4 machines.
 
-Package: loop-aes-modules-2.6.18-1-itanium
+Package: loop-aes-modules-2.6.18-2-itanium
 Architecture: ia64
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-itanium, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-itanium
-Conflicts: loop-aes-2.6.18-1-itanium
+Depends: linux-image-2.6.18-2-itanium, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-itanium
+Conflicts: loop-aes-2.6.18-2-itanium
 Description: loop-AES encryption modules for Linux 2.6.18 on Itanium
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on Itanium machines.
@@ -1098,19 +1059,19 @@
 Architecture: ia64
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-itanium
+Depends: loop-aes-modules-2.6.18-2-itanium
 Description: loop-AES encryption modules for Linux 2.6 on Itanium
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for Itanium machines.
 
-Package: loop-aes-modules-2.6.18-1-mckinley
+Package: loop-aes-modules-2.6.18-2-mckinley
 Architecture: ia64
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-mckinley, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-mckinley
-Conflicts: loop-aes-2.6.18-1-mckinley
+Depends: linux-image-2.6.18-2-mckinley, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-mckinley
+Conflicts: loop-aes-2.6.18-2-mckinley
 Description: loop-AES encryption modules for Linux 2.6.18 on Itanium II
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on Itanium II machines.
@@ -1135,19 +1096,19 @@
 Architecture: ia64
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-mckinley
+Depends: loop-aes-modules-2.6.18-2-mckinley
 Description: loop-AES encryption modules for Linux 2.6 on Itanium II
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for Itanium II machines.
 
-Package: loop-aes-modules-2.6.18-1-amiga
+Package: loop-aes-modules-2.6.18-2-amiga
 Architecture: m68k
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-amiga, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-amiga
-Conflicts: loop-aes-2.6.18-1-amiga
+Depends: linux-image-2.6.18-2-amiga, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-amiga
+Conflicts: loop-aes-2.6.18-2-amiga
 Description: loop-AES encryption modules for Linux 2.6.18 on Amiga
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on Amiga machines.
@@ -1172,19 +1133,19 @@
 Architecture: m68k
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-amiga
+Depends: loop-aes-modules-2.6.18-2-amiga
 Description: loop-AES encryption modules for Linux 2.6 on Amiga
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for Amiga machines.
 
-Package: loop-aes-modules-2.6.18-1-mac
+Package: loop-aes-modules-2.6.18-2-mac
 Architecture: m68k
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-mac, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-mac
-Conflicts: loop-aes-2.6.18-1-mac
+Depends: linux-image-2.6.18-2-mac, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-mac
+Conflicts: loop-aes-2.6.18-2-mac
 Description: loop-AES encryption modules for Linux 2.6.18 on Macintosh
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on Macintosh machines.
@@ -1209,19 +1170,19 @@
 Architecture: m68k
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-mac
+Depends: loop-aes-modules-2.6.18-2-mac
 Description: loop-AES encryption modules for Linux 2.6 on Macintosh
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for Macintosh machines.
 
-Package: loop-aes-modules-2.6.18-1-r4k-ip22
+Package: loop-aes-modules-2.6.18-2-r4k-ip22
 Architecture: mips
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-r4k-ip22, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-r4k-ip22
-Conflicts: loop-aes-2.6.18-1-r4k-ip22
+Depends: linux-image-2.6.18-2-r4k-ip22, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-r4k-ip22
+Conflicts: loop-aes-2.6.18-2-r4k-ip22
 Description: loop-AES encryption modules for Linux 2.6.18 on SGI IP22
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on SGI IP22 (Indy, Indigo2) machines.
@@ -1246,20 +1207,20 @@
 Architecture: mips
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-r4k-ip22
+Depends: loop-aes-modules-2.6.18-2-r4k-ip22
 Description: loop-AES encryption modules for Linux 2.6 on SGI IP22
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for SGI IP22 (Indy, Indigo2)
  machines.
 
-Package: loop-aes-modules-2.6.18-1-r5k-ip32
+Package: loop-aes-modules-2.6.18-2-r5k-ip32
 Architecture: mips
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-r5k-ip32, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-r5k-ip32
-Conflicts: loop-aes-2.6.18-1-r5k-ip32
+Depends: linux-image-2.6.18-2-r5k-ip32, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-r5k-ip32
+Conflicts: loop-aes-2.6.18-2-r5k-ip32
 Description: loop-AES encryption modules for Linux 2.6.18 on SGI IP32
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on SGI IP32 (O2) machines.
@@ -1284,19 +1245,19 @@
 Architecture: mips
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-r5k-ip32
+Depends: loop-aes-modules-2.6.18-2-r5k-ip32
 Description: loop-AES encryption modules for Linux 2.6 on SGI IP32
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for SGI IP32 (O2) machines.
 
-Package: loop-aes-modules-2.6.18-1-sb1-bcm91250a
+Package: loop-aes-modules-2.6.18-2-sb1-bcm91250a
 Architecture: mips mipsel
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-sb1-bcm91250a, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-sb1-bcm91250a
-Conflicts: loop-aes-2.6.18-1-sb1-bcm91250a
+Depends: linux-image-2.6.18-2-sb1-bcm91250a, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-sb1-bcm91250a
+Conflicts: loop-aes-2.6.18-2-sb1-bcm91250a
 Description: loop-AES encryption modules for Linux 2.6.18 on BCM91250A
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on Broadcom BCM91250A (aka SWARM) machines.
@@ -1321,20 +1282,20 @@
 Architecture: mips mipsel
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-sb1-bcm91250a
+Depends: loop-aes-modules-2.6.18-2-sb1-bcm91250a
 Description: loop-AES encryption modules for Linux 2.6 on BCM91250A
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for Broadcom BCM91250A (aka SWARM)
  machines.
 
-Package: loop-aes-modules-2.6.18-1-sb1a-bcm91480b
+Package: loop-aes-modules-2.6.18-2-sb1a-bcm91480b
 Architecture: mips mipsel
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-sb1a-bcm91480b, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-sb1a-bcm91480b
-Conflicts: loop-aes-2.6.18-1-sb1a-bcm91480b
+Depends: linux-image-2.6.18-2-sb1a-bcm91480b, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-sb1a-bcm91480b
+Conflicts: loop-aes-2.6.18-2-sb1a-bcm91480b
 Description: loop-AES encryption modules for Linux 2.6.18 on BCM91480B
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on Broadcom BCM91480B (aka BigSur) machines.
@@ -1359,20 +1320,20 @@
 Architecture: mips mipsel
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-sb1a-bcm91480b
+Depends: loop-aes-modules-2.6.18-2-sb1a-bcm91480b
 Description: loop-AES encryption modules for Linux 2.6 on BCM91480B
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for Broadcom BCM91480B (aka BigSur)
  machines.
 
-Package: loop-aes-modules-2.6.18-1-r5k-cobalt
+Package: loop-aes-modules-2.6.18-2-r5k-cobalt
 Architecture: mipsel
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-r5k-cobalt, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-r5k-cobalt
-Conflicts: loop-aes-2.6.18-1-r5k-cobalt
+Depends: linux-image-2.6.18-2-r5k-cobalt, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-r5k-cobalt
+Conflicts: loop-aes-2.6.18-2-r5k-cobalt
 Description: loop-AES encryption modules for Linux 2.6.18 on Cobalt
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on Cobalt (Qube, RaQ, Qube2, RaQ2) machines.
@@ -1397,20 +1358,20 @@
 Architecture: mipsel
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-r5k-cobalt
+Depends: loop-aes-modules-2.6.18-2-r5k-cobalt
 Description: loop-AES encryption modules for Linux 2.6 on Cobalt
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for Cobalt (Qube, RaQ, Qube2, RaQ2)
  machines.
 
-Package: loop-aes-modules-2.6.18-1-r3k-kn02
+Package: loop-aes-modules-2.6.18-2-r3k-kn02
 Architecture: mipsel
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-r3k-kn02, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-r3k-kn02
-Conflicts: loop-aes-2.6.18-1-r3k-kn02
+Depends: linux-image-2.6.18-2-r3k-kn02, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-r3k-kn02
+Conflicts: loop-aes-2.6.18-2-r3k-kn02
 Description: loop-AES encryption modules for Linux 2.6.18 on R3000 based DECstation
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on R3000 based DECstations with KN02 mainboard, such as
@@ -1437,21 +1398,21 @@
 Architecture: mipsel
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-r3k-kn02
+Depends: loop-aes-modules-2.6.18-2-r3k-kn02
 Description: loop-AES encryption modules for Linux 2.6 on R3000 based DECstation
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for R3000 based DECstations with
  KN02 mainboard, such as the DECstation 5000/1xx series with xx=20,25,33
  and the DECstation 5000/240 machines.
 
-Package: loop-aes-modules-2.6.18-1-r4k-kn04
+Package: loop-aes-modules-2.6.18-2-r4k-kn04
 Architecture: mipsel
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-r4k-kn04, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-r4k-kn04
-Conflicts: loop-aes-2.6.18-1-r4k-kn04
+Depends: linux-image-2.6.18-2-r4k-kn04, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-r4k-kn04
+Conflicts: loop-aes-2.6.18-2-r4k-kn04
 Description: loop-AES encryption modules for Linux 2.6.18 on R4x00 based DECstation
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on R4x00 based DECstations with KN04 mainboard, such as
@@ -1478,21 +1439,21 @@
 Architecture: mipsel
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-r4k-kn04
+Depends: loop-aes-modules-2.6.18-2-r4k-kn04
 Description: loop-AES encryption modules for Linux 2.6 on R4x00 based DECstation
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for R4x00 based DECstations with
  KN04 mainboard, such as the DECstation 5000/150, the Personal DECstation
  5000/50 and the DECstation 5000/260 machines.
 
-Package: loop-aes-modules-2.6.18-1-powerpc
+Package: loop-aes-modules-2.6.18-2-powerpc
 Architecture: powerpc
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-powerpc, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-powerpc
-Conflicts: loop-aes-2.6.18-1-powerpc
+Depends: linux-image-2.6.18-2-powerpc, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-powerpc
+Conflicts: loop-aes-2.6.18-2-powerpc
 Description: loop-AES encryption modules for Linux 2.6.18 on uniprocessor 32-bit PowerPC
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on uniprocessor 32-bit PowerPC machines.
@@ -1517,20 +1478,20 @@
 Architecture: powerpc
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-powerpc
+Depends: loop-aes-modules-2.6.18-2-powerpc
 Description: loop-AES encryption modules for Linux 2.6 on uniprocessor 32-bit PowerPC
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for uniprocessor 32-bit PowerPC
  machines.
 
-Package: loop-aes-modules-2.6.18-1-powerpc-smp
+Package: loop-aes-modules-2.6.18-2-powerpc-smp
 Architecture: powerpc
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-powerpc-smp, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-powerpc-smp
-Conflicts: loop-aes-2.6.18-1-powerpc-smp
+Depends: linux-image-2.6.18-2-powerpc-smp, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-powerpc-smp
+Conflicts: loop-aes-2.6.18-2-powerpc-smp
 Description: loop-AES encryption modules for Linux 2.6.18 on multiprocessor 32-bit PowerPC
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on multiprocessor 32-bit PowerPC machines.
@@ -1555,20 +1516,20 @@
 Architecture: powerpc
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-powerpc-smp
+Depends: loop-aes-modules-2.6.18-2-powerpc-smp
 Description: loop-AES encryption modules for Linux 2.6 on multiprocessor 32-bit PowerPC
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for multiprocessor 32-bit PowerPC
  machines.
 
-Package: loop-aes-modules-2.6.18-1-powerpc-miboot
+Package: loop-aes-modules-2.6.18-2-powerpc-miboot
 Architecture: powerpc
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-powerpc-miboot, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-powerpc-miboot
-Conflicts: loop-aes-2.6.18-1-powerpc-miboot
+Depends: linux-image-2.6.18-2-powerpc-miboot, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-powerpc-miboot
+Conflicts: loop-aes-2.6.18-2-powerpc-miboot
 Description: loop-AES encryption modules for Linux 2.6.18 on 32-bit PowerPC for miboot floppy
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on 32-bit PowerPC for miboot floppy machines.
@@ -1593,20 +1554,20 @@
 Architecture: powerpc
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-powerpc-miboot
+Depends: loop-aes-modules-2.6.18-2-powerpc-miboot
 Description: loop-AES encryption modules for Linux 2.6 on 32-bit PowerPC for miboot floppy
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for 32-bit PowerPC for miboot floppy
  machines.
 
-Package: loop-aes-modules-2.6.18-1-powerpc64
+Package: loop-aes-modules-2.6.18-2-powerpc64
 Architecture: powerpc
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-powerpc64, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-powerpc64
-Conflicts: loop-aes-2.6.18-1-powerpc64
+Depends: linux-image-2.6.18-2-powerpc64, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-powerpc64
+Conflicts: loop-aes-2.6.18-2-powerpc64
 Description: loop-AES encryption modules for Linux 2.6.18 on 64-bit PowerPC
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on 64-bit PowerPC machines.
@@ -1631,19 +1592,19 @@
 Architecture: powerpc
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-powerpc64
+Depends: loop-aes-modules-2.6.18-2-powerpc64
 Description: loop-AES encryption modules for Linux 2.6 on 64-bit PowerPC
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for 64-bit PowerPC machines.
 
-Package: loop-aes-modules-2.6.18-1-prep
+Package: loop-aes-modules-2.6.18-2-prep
 Architecture: powerpc
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-prep, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-prep
-Conflicts: loop-aes-2.6.18-1-prep
+Depends: linux-image-2.6.18-2-prep, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-prep
+Conflicts: loop-aes-2.6.18-2-prep
 Description: loop-AES encryption modules for Linux 2.6.18 on PReP PowerPC
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on PReP PowerPC machines.
@@ -1668,19 +1629,19 @@
 Architecture: powerpc
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-prep
+Depends: loop-aes-modules-2.6.18-2-prep
 Description: loop-AES encryption modules for Linux 2.6 on PReP PowerPC
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for PReP PowerPC machines.
 
-Package: loop-aes-modules-2.6.18-1-vserver-powerpc
+Package: loop-aes-modules-2.6.18-2-vserver-powerpc
 Architecture: powerpc
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-vserver-powerpc, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-vserver-powerpc
-Conflicts: loop-aes-2.6.18-1-vserver-powerpc
+Depends: linux-image-2.6.18-2-vserver-powerpc, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-vserver-powerpc
+Conflicts: loop-aes-2.6.18-2-vserver-powerpc
 Description: loop-AES encryption modules for Linux 2.6.18 on uniprocessor 32-bit PowerPC
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on uniprocessor 32-bit PowerPC machines.
@@ -1705,20 +1666,20 @@
 Architecture: powerpc
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-vserver-powerpc
+Depends: loop-aes-modules-2.6.18-2-vserver-powerpc
 Description: loop-AES encryption modules for Linux 2.6 on uniprocessor 32-bit PowerPC
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for uniprocessor 32-bit PowerPC
  machines.
 
-Package: loop-aes-modules-2.6.18-1-vserver-powerpc64
+Package: loop-aes-modules-2.6.18-2-vserver-powerpc64
 Architecture: powerpc
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-vserver-powerpc64, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-vserver-powerpc64
-Conflicts: loop-aes-2.6.18-1-vserver-powerpc64
+Depends: linux-image-2.6.18-2-vserver-powerpc64, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-vserver-powerpc64
+Conflicts: loop-aes-2.6.18-2-vserver-powerpc64
 Description: loop-AES encryption modules for Linux 2.6.18 on 64-bit PowerPC
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on 64-bit PowerPC machines.
@@ -1743,19 +1704,19 @@
 Architecture: powerpc
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-vserver-powerpc64
+Depends: loop-aes-modules-2.6.18-2-vserver-powerpc64
 Description: loop-AES encryption modules for Linux 2.6 on 64-bit PowerPC
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for 64-bit PowerPC machines.
 
-Package: loop-aes-modules-2.6.18-1-s390
+Package: loop-aes-modules-2.6.18-2-s390
 Architecture: s390
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-s390, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-s390
-Conflicts: loop-aes-2.6.18-1-s390
+Depends: linux-image-2.6.18-2-s390, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-s390
+Conflicts: loop-aes-2.6.18-2-s390
 Description: loop-AES encryption modules for Linux 2.6.18 on IBM S/390
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on IBM S/390 machines.
@@ -1780,19 +1741,19 @@
 Architecture: s390
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-s390
+Depends: loop-aes-modules-2.6.18-2-s390
 Description: loop-AES encryption modules for Linux 2.6 on IBM S/390
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for IBM S/390 machines.
 
-Package: loop-aes-modules-2.6.18-1-s390x
+Package: loop-aes-modules-2.6.18-2-s390x
 Architecture: s390
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-s390x, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-s390x
-Conflicts: loop-aes-2.6.18-1-s390x
+Depends: linux-image-2.6.18-2-s390x, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-s390x
+Conflicts: loop-aes-2.6.18-2-s390x
 Description: loop-AES encryption modules for Linux 2.6.18 on IBM zSeries
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on IBM zSeries machines.
@@ -1817,19 +1778,19 @@
 Architecture: s390
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-s390x
+Depends: loop-aes-modules-2.6.18-2-s390x
 Description: loop-AES encryption modules for Linux 2.6 on IBM zSeries
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for IBM zSeries machines.
 
-Package: loop-aes-modules-2.6.18-1-vserver-s390x
+Package: loop-aes-modules-2.6.18-2-vserver-s390x
 Architecture: s390
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-vserver-s390x, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-vserver-s390x
-Conflicts: loop-aes-2.6.18-1-vserver-s390x
+Depends: linux-image-2.6.18-2-vserver-s390x, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-vserver-s390x
+Conflicts: loop-aes-2.6.18-2-vserver-s390x
 Description: loop-AES encryption modules for Linux 2.6.18 on IBM zSeries
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on IBM zSeries machines.
@@ -1854,19 +1815,19 @@
 Architecture: s390
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-vserver-s390x
+Depends: loop-aes-modules-2.6.18-2-vserver-s390x
 Description: loop-AES encryption modules for Linux 2.6 on IBM zSeries
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for IBM zSeries machines.
 
-Package: loop-aes-modules-2.6.18-1-sparc32
+Package: loop-aes-modules-2.6.18-2-sparc32
 Architecture: sparc
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-sparc32, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-sparc32
-Conflicts: loop-aes-2.6.18-1-sparc32
+Depends: linux-image-2.6.18-2-sparc32, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-sparc32
+Conflicts: loop-aes-2.6.18-2-sparc32
 Description: loop-AES encryption modules for Linux 2.6.18 on uniprocessor sparc32 (sun4m)
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on uniprocessor sparc32 (sun4m) machines.
@@ -1891,20 +1852,20 @@
 Architecture: sparc
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-sparc32
+Depends: loop-aes-modules-2.6.18-2-sparc32
 Description: loop-AES encryption modules for Linux 2.6 on uniprocessor sparc32 (sun4m)
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for uniprocessor sparc32 (sun4m)
  machines.
 
-Package: loop-aes-modules-2.6.18-1-sparc64
+Package: loop-aes-modules-2.6.18-2-sparc64
 Architecture: sparc
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-sparc64, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-sparc64
-Conflicts: loop-aes-2.6.18-1-sparc64
+Depends: linux-image-2.6.18-2-sparc64, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-sparc64
+Conflicts: loop-aes-2.6.18-2-sparc64
 Description: loop-AES encryption modules for Linux 2.6.18 on uniprocessor 64-bit UltraSPARC
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on uniprocessor 64-bit UltraSPARC machines.
@@ -1929,20 +1890,20 @@
 Architecture: sparc
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-sparc64
+Depends: loop-aes-modules-2.6.18-2-sparc64
 Description: loop-AES encryption modules for Linux 2.6 on uniprocessor 64-bit UltraSPARC
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for uniprocessor 64-bit UltraSPARC
  machines.
 
-Package: loop-aes-modules-2.6.18-1-sparc64-smp
+Package: loop-aes-modules-2.6.18-2-sparc64-smp
 Architecture: sparc
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-sparc64-smp, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-sparc64-smp
-Conflicts: loop-aes-2.6.18-1-sparc64-smp
+Depends: linux-image-2.6.18-2-sparc64-smp, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-sparc64-smp
+Conflicts: loop-aes-2.6.18-2-sparc64-smp
 Description: loop-AES encryption modules for Linux 2.6.18 on multiprocessor 64-bit UltraSPARC
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on multiprocessor 64-bit UltraSPARC machines.
@@ -1967,20 +1928,20 @@
 Architecture: sparc
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-sparc64-smp
+Depends: loop-aes-modules-2.6.18-2-sparc64-smp
 Description: loop-AES encryption modules for Linux 2.6 on multiprocessor 64-bit UltraSPARC
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for multiprocessor 64-bit UltraSPARC
  machines.
 
-Package: loop-aes-modules-2.6.18-1-vserver-sparc64
+Package: loop-aes-modules-2.6.18-2-vserver-sparc64
 Architecture: sparc
 Section: admin
 Priority: optional
-Depends: linux-image-2.6.18-1-vserver-sparc64, loop-aes-utils (>= 2.12p-1)
-Recommends: loop-aes-testsuite
-Replaces: loop-aes-2.6.18-1-vserver-sparc64
-Conflicts: loop-aes-2.6.18-1-vserver-sparc64
+Depends: linux-image-2.6.18-2-vserver-sparc64, loop-aes-utils (>= 2.12p-1)
+Recommends: loop-aes-testsuite
+Replaces: loop-aes-2.6.18-2-vserver-sparc64
+Conflicts: loop-aes-2.6.18-2-vserver-sparc64
 Description: loop-AES encryption modules for Linux 2.6.18 on uniprocessor 64-bit UltraSPARC
  This package contains the loop-AES loadable Linux kernel modules compiled
  for kernel 2.6.18 on uniprocessor 64-bit UltraSPARC machines.
@@ -2005,7 +1966,7 @@
 Architecture: sparc
 Section: admin
 Priority: optional
-Depends: loop-aes-modules-2.6.18-1-vserver-sparc64
+Depends: loop-aes-modules-2.6.18-2-vserver-sparc64
 Description: loop-AES encryption modules for Linux 2.6 on uniprocessor 64-bit UltraSPARC
  This package will always depend on the loop-AES module package built for
  the latest 2.6 kernel image available for uniprocessor 64-bit UltraSPARC

Modified: trunk/loop-aes/debian/control.md5sum
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes/debian/control.md5sum?rev=1315&op=diff
==============================================================================
--- trunk/loop-aes/debian/control.md5sum (original)
+++ trunk/loop-aes/debian/control.md5sum Wed Nov  8 19:43:02 2006
@@ -1,4 +1,4 @@
-320c3d2cc0b18e9bd9ec55e8a8388fef  debian/changelog
+4fe12c84e2014d4399d3c0c9def870f3  debian/changelog
 2b60b0c02f6e7d6e9116303ff7e79706  debian/templates/control.main.in
 068fedd1b9536b9e47522e0b1c286887  debian/templates/control.modules.in
 ec40f8ac3bfe07a060bc16b680b09007  debian/templates/control.source.in

Modified: trunk/loop-aes/debian/rules
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes/debian/rules?rev=1315&op=diff
==============================================================================
--- trunk/loop-aes/debian/rules (original)
+++ trunk/loop-aes/debian/rules Wed Nov  8 19:43:02 2006
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-KERNELVERSION := 2.6.18-1
+KERNELVERSION := 2.6.18-2
 
 include /usr/src/linux-support-$(KERNELVERSION)/modules/rules.include
 

Modified: trunk/loop-aes/debian/rules.gen
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes/debian/rules.gen?rev=1315&op=diff
==============================================================================
--- trunk/loop-aes/debian/rules.gen (original)
+++ trunk/loop-aes/debian/rules.gen Wed Nov  8 19:43:02 2006
@@ -1,6 +1,6 @@
 .NOTPARALLEL:
 binary-indep:
-	$(MAKE) -f debian/rules.real binary-indep ABINAME='-1' MAJOR='2.6' VERSION='2.6.18' UPSTREAMVERSION='2.6.18'
+	$(MAKE) -f debian/rules.real binary-indep ABINAME='-2' MAJOR='2.6' VERSION='2.6.18' UPSTREAMVERSION='2.6.18'
 binary-arch:: binary-arch-alpha
 binary-arch-alpha:: binary-arch-alpha-real
 build:: build-alpha
@@ -34,11 +34,11 @@
 source-alpha-none:: source-alpha-none-alpha-generic
 source-alpha-none-alpha-generic:: source-alpha-none-alpha-generic-real
 binary-arch-alpha-none-alpha-generic-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha-generic' KERNEL_ARCH='alpha' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-alpha-generic' ARCH='alpha'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha-generic' KERNEL_ARCH='alpha' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-alpha-generic' ARCH='alpha'
 build-alpha-none-alpha-generic-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha-generic' KERNEL_ARCH='alpha' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-alpha-generic' ARCH='alpha'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha-generic' KERNEL_ARCH='alpha' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-alpha-generic' ARCH='alpha'
 setup-alpha-none-alpha-generic-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha-generic' KERNEL_ARCH='alpha' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-alpha-generic' ARCH='alpha'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha-generic' KERNEL_ARCH='alpha' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-alpha-generic' ARCH='alpha'
 binary-arch-alpha-none:: binary-arch-alpha-none-alpha-smp
 binary-arch-alpha-none-alpha-smp:: binary-arch-alpha-none-alpha-smp-real
 build-alpha-none:: build-alpha-none-alpha-smp
@@ -48,11 +48,11 @@
 source-alpha-none:: source-alpha-none-alpha-smp
 source-alpha-none-alpha-smp:: source-alpha-none-alpha-smp-real
 binary-arch-alpha-none-alpha-smp-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha-smp' KERNEL_ARCH='alpha' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-alpha-smp' ARCH='alpha'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha-smp' KERNEL_ARCH='alpha' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-alpha-smp' ARCH='alpha'
 build-alpha-none-alpha-smp-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha-smp' KERNEL_ARCH='alpha' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-alpha-smp' ARCH='alpha'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha-smp' KERNEL_ARCH='alpha' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-alpha-smp' ARCH='alpha'
 setup-alpha-none-alpha-smp-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha-smp' KERNEL_ARCH='alpha' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-alpha-smp' ARCH='alpha'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha-smp' KERNEL_ARCH='alpha' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-alpha-smp' ARCH='alpha'
 binary-arch-alpha-none:: binary-arch-alpha-none-alpha-legacy
 binary-arch-alpha-none-alpha-legacy:: binary-arch-alpha-none-alpha-legacy-real
 build-alpha-none:: build-alpha-none-alpha-legacy
@@ -62,11 +62,11 @@
 source-alpha-none:: source-alpha-none-alpha-legacy
 source-alpha-none-alpha-legacy:: source-alpha-none-alpha-legacy-real
 binary-arch-alpha-none-alpha-legacy-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha-legacy' KERNEL_ARCH='alpha' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-alpha-legacy' ARCH='alpha'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha-legacy' KERNEL_ARCH='alpha' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-alpha-legacy' ARCH='alpha'
 build-alpha-none-alpha-legacy-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha-legacy' KERNEL_ARCH='alpha' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-alpha-legacy' ARCH='alpha'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha-legacy' KERNEL_ARCH='alpha' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-alpha-legacy' ARCH='alpha'
 setup-alpha-none-alpha-legacy-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha-legacy' KERNEL_ARCH='alpha' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-alpha-legacy' ARCH='alpha'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha-legacy' KERNEL_ARCH='alpha' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-alpha-legacy' ARCH='alpha'
 binary-arch-alpha:: binary-arch-alpha-vserver
 binary-arch-alpha-vserver:: binary-arch-alpha-vserver-real
 build-alpha:: build-alpha-vserver
@@ -88,11 +88,11 @@
 source-alpha-vserver:: source-alpha-vserver-alpha
 source-alpha-vserver-alpha:: source-alpha-vserver-alpha-real
 binary-arch-alpha-vserver-alpha-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha' KERNEL_ARCH='alpha' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-alpha' ARCH='alpha'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha' KERNEL_ARCH='alpha' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-alpha' ARCH='alpha'
 build-alpha-vserver-alpha-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha' KERNEL_ARCH='alpha' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-alpha' ARCH='alpha'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha' KERNEL_ARCH='alpha' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-alpha' ARCH='alpha'
 setup-alpha-vserver-alpha-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha' KERNEL_ARCH='alpha' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-alpha' ARCH='alpha'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='alpha' KERNEL_ARCH='alpha' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-alpha' ARCH='alpha'
 binary-arch:: binary-arch-amd64
 binary-arch-amd64:: binary-arch-amd64-real
 build:: build-amd64
@@ -126,11 +126,11 @@
 source-amd64-none:: source-amd64-none-amd64
 source-amd64-none-amd64:: source-amd64-none-amd64-real
 binary-arch-amd64-none-amd64-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-amd64' ARCH='amd64'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-amd64' ARCH='amd64'
 build-amd64-none-amd64-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-amd64' ARCH='amd64'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-amd64' ARCH='amd64'
 setup-amd64-none-amd64-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-amd64' ARCH='amd64'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-amd64' ARCH='amd64'
 binary-arch-amd64:: binary-arch-amd64-vserver
 binary-arch-amd64-vserver:: binary-arch-amd64-vserver-real
 build-amd64:: build-amd64-vserver
@@ -152,11 +152,11 @@
 source-amd64-vserver:: source-amd64-vserver-amd64
 source-amd64-vserver-amd64:: source-amd64-vserver-amd64-real
 binary-arch-amd64-vserver-amd64-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-amd64' ARCH='amd64'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-amd64' ARCH='amd64'
 build-amd64-vserver-amd64-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-amd64' ARCH='amd64'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-amd64' ARCH='amd64'
 setup-amd64-vserver-amd64-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-amd64' ARCH='amd64'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-amd64' ARCH='amd64'
 binary-arch-amd64:: binary-arch-amd64-xen
 binary-arch-amd64-xen:: binary-arch-amd64-xen-real
 build-amd64:: build-amd64-xen
@@ -178,11 +178,11 @@
 source-amd64-xen:: source-amd64-xen-amd64
 source-amd64-xen-amd64:: source-amd64-xen-amd64-real
 binary-arch-amd64-xen-amd64-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-1' SUBARCH='xen' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-amd64' ARCH='amd64'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-2' SUBARCH='xen' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-amd64' ARCH='amd64'
 build-amd64-xen-amd64-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-1' SUBARCH='xen' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-amd64' ARCH='amd64'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-2' SUBARCH='xen' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-amd64' ARCH='amd64'
 setup-amd64-xen-amd64-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-1' SUBARCH='xen' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-amd64' ARCH='amd64'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-2' SUBARCH='xen' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-amd64' ARCH='amd64'
 binary-arch-amd64:: binary-arch-amd64-xen-vserver
 binary-arch-amd64-xen-vserver:: binary-arch-amd64-xen-vserver-real
 build-amd64:: build-amd64-xen-vserver
@@ -204,11 +204,11 @@
 source-amd64-xen-vserver:: source-amd64-xen-vserver-amd64
 source-amd64-xen-vserver-amd64:: source-amd64-xen-vserver-amd64-real
 binary-arch-amd64-xen-vserver-amd64-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-1' SUBARCH='xen-vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-vserver-amd64' ARCH='amd64'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-2' SUBARCH='xen-vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-vserver-amd64' ARCH='amd64'
 build-amd64-xen-vserver-amd64-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-1' SUBARCH='xen-vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-vserver-amd64' ARCH='amd64'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-2' SUBARCH='xen-vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-vserver-amd64' ARCH='amd64'
 setup-amd64-xen-vserver-amd64-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-1' SUBARCH='xen-vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-vserver-amd64' ARCH='amd64'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amd64' KERNEL_ARCH='x86_64' ABINAME='-2' SUBARCH='xen-vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-vserver-amd64' ARCH='amd64'
 binary-arch:: binary-arch-arm
 binary-arch-arm:: binary-arch-arm-real
 build:: build-arm
@@ -242,11 +242,11 @@
 source-arm-none:: source-arm-none-footbridge
 source-arm-none-footbridge:: source-arm-none-footbridge-real
 binary-arch-arm-none-footbridge-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='footbridge' KERNEL_ARCH='arm' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-footbridge' ARCH='arm'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='footbridge' KERNEL_ARCH='arm' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-footbridge' ARCH='arm'
 build-arm-none-footbridge-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='footbridge' KERNEL_ARCH='arm' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-footbridge' ARCH='arm'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='footbridge' KERNEL_ARCH='arm' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-footbridge' ARCH='arm'
 setup-arm-none-footbridge-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='footbridge' KERNEL_ARCH='arm' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-footbridge' ARCH='arm'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='footbridge' KERNEL_ARCH='arm' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-footbridge' ARCH='arm'
 binary-arch-arm-none:: binary-arch-arm-none-iop32x
 binary-arch-arm-none-iop32x:: binary-arch-arm-none-iop32x-real
 build-arm-none:: build-arm-none-iop32x
@@ -256,11 +256,11 @@
 source-arm-none:: source-arm-none-iop32x
 source-arm-none-iop32x:: source-arm-none-iop32x-real
 binary-arch-arm-none-iop32x-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='iop32x' KERNEL_ARCH='arm' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-iop32x' ARCH='arm'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='iop32x' KERNEL_ARCH='arm' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-iop32x' ARCH='arm'
 build-arm-none-iop32x-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='iop32x' KERNEL_ARCH='arm' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-iop32x' ARCH='arm'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='iop32x' KERNEL_ARCH='arm' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-iop32x' ARCH='arm'
 setup-arm-none-iop32x-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='iop32x' KERNEL_ARCH='arm' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-iop32x' ARCH='arm'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='iop32x' KERNEL_ARCH='arm' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-iop32x' ARCH='arm'
 binary-arch-arm-none:: binary-arch-arm-none-ixp4xx
 binary-arch-arm-none-ixp4xx:: binary-arch-arm-none-ixp4xx-real
 build-arm-none:: build-arm-none-ixp4xx
@@ -270,11 +270,11 @@
 source-arm-none:: source-arm-none-ixp4xx
 source-arm-none-ixp4xx:: source-arm-none-ixp4xx-real
 binary-arch-arm-none-ixp4xx-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='ixp4xx' KERNEL_ARCH='arm' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-ixp4xx' ARCH='arm'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='ixp4xx' KERNEL_ARCH='arm' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-ixp4xx' ARCH='arm'
 build-arm-none-ixp4xx-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='ixp4xx' KERNEL_ARCH='arm' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-ixp4xx' ARCH='arm'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='ixp4xx' KERNEL_ARCH='arm' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-ixp4xx' ARCH='arm'
 setup-arm-none-ixp4xx-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='ixp4xx' KERNEL_ARCH='arm' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-ixp4xx' ARCH='arm'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='ixp4xx' KERNEL_ARCH='arm' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-ixp4xx' ARCH='arm'
 binary-arch-arm-none:: binary-arch-arm-none-rpc
 binary-arch-arm-none-rpc:: binary-arch-arm-none-rpc-real
 build-arm-none:: build-arm-none-rpc
@@ -284,11 +284,11 @@
 source-arm-none:: source-arm-none-rpc
 source-arm-none-rpc:: source-arm-none-rpc-real
 binary-arch-arm-none-rpc-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='rpc' KERNEL_ARCH='arm' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-rpc' ARCH='arm'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='rpc' KERNEL_ARCH='arm' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-rpc' ARCH='arm'
 build-arm-none-rpc-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='rpc' KERNEL_ARCH='arm' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-rpc' ARCH='arm'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='rpc' KERNEL_ARCH='arm' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-rpc' ARCH='arm'
 setup-arm-none-rpc-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='rpc' KERNEL_ARCH='arm' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-rpc' ARCH='arm'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='rpc' KERNEL_ARCH='arm' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-rpc' ARCH='arm'
 binary-arch-arm-none:: binary-arch-arm-none-s3c2410
 binary-arch-arm-none-s3c2410:: binary-arch-arm-none-s3c2410-real
 build-arm-none:: build-arm-none-s3c2410
@@ -298,49 +298,11 @@
 source-arm-none:: source-arm-none-s3c2410
 source-arm-none-s3c2410:: source-arm-none-s3c2410-real
 binary-arch-arm-none-s3c2410-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s3c2410' KERNEL_ARCH='arm' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-s3c2410' ARCH='arm'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s3c2410' KERNEL_ARCH='arm' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-s3c2410' ARCH='arm'
 build-arm-none-s3c2410-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s3c2410' KERNEL_ARCH='arm' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-s3c2410' ARCH='arm'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s3c2410' KERNEL_ARCH='arm' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-s3c2410' ARCH='arm'
 setup-arm-none-s3c2410-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s3c2410' KERNEL_ARCH='arm' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-s3c2410' ARCH='arm'
-binary-arch:: binary-arch-armeb
-binary-arch-armeb:: binary-arch-armeb-real
-build:: build-armeb
-build-armeb:: build-armeb-real
-setup:: setup-armeb
-setup-armeb:: setup-armeb-real
-source:: source-armeb
-source-armeb:: source-armeb-real
-binary-arch-armeb-real:
-build-armeb-real:
-setup-armeb-real:
-source-armeb-real:
-binary-arch-armeb:: binary-arch-armeb-none
-binary-arch-armeb-none:: binary-arch-armeb-none-real
-build-armeb:: build-armeb-none
-build-armeb-none:: build-armeb-none-real
-setup-armeb:: setup-armeb-none
-setup-armeb-none:: setup-armeb-none-real
-source-armeb:: source-armeb-none
-source-armeb-none:: source-armeb-none-real
-binary-arch-armeb-none-real:
-build-armeb-none-real:
-setup-armeb-none-real:
-source-armeb-none-real:
-binary-arch-armeb-none:: binary-arch-armeb-none-nslu2
-binary-arch-armeb-none-nslu2:: binary-arch-armeb-none-nslu2-real
-build-armeb-none:: build-armeb-none-nslu2
-build-armeb-none-nslu2:: build-armeb-none-nslu2-real
-setup-armeb-none:: setup-armeb-none-nslu2
-setup-armeb-none-nslu2:: setup-armeb-none-nslu2-real
-source-armeb-none:: source-armeb-none-nslu2
-source-armeb-none-nslu2:: source-armeb-none-nslu2-real
-binary-arch-armeb-none-nslu2-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='nslu2' KERNEL_ARCH='arm' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-nslu2' ARCH='armeb'
-build-armeb-none-nslu2-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='nslu2' KERNEL_ARCH='arm' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-nslu2' ARCH='armeb'
-setup-armeb-none-nslu2-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='nslu2' KERNEL_ARCH='arm' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-nslu2' ARCH='armeb'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s3c2410' KERNEL_ARCH='arm' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-s3c2410' ARCH='arm'
 binary-arch:: binary-arch-hppa
 binary-arch-hppa:: binary-arch-hppa-real
 build:: build-hppa
@@ -374,11 +336,11 @@
 source-hppa-none:: source-hppa-none-parisc
 source-hppa-none-parisc:: source-hppa-none-parisc-real
 binary-arch-hppa-none-parisc-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc' KERNEL_ARCH='parisc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc' ARCH='hppa'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc' KERNEL_ARCH='parisc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc' ARCH='hppa'
 build-hppa-none-parisc-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc' KERNEL_ARCH='parisc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc' ARCH='hppa'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc' KERNEL_ARCH='parisc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc' ARCH='hppa'
 setup-hppa-none-parisc-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc' KERNEL_ARCH='parisc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc' ARCH='hppa'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc' KERNEL_ARCH='parisc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc' ARCH='hppa'
 binary-arch-hppa-none:: binary-arch-hppa-none-parisc-smp
 binary-arch-hppa-none-parisc-smp:: binary-arch-hppa-none-parisc-smp-real
 build-hppa-none:: build-hppa-none-parisc-smp
@@ -388,11 +350,11 @@
 source-hppa-none:: source-hppa-none-parisc-smp
 source-hppa-none-parisc-smp:: source-hppa-none-parisc-smp-real
 binary-arch-hppa-none-parisc-smp-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc-smp' KERNEL_ARCH='parisc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc-smp' ARCH='hppa'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc-smp' KERNEL_ARCH='parisc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc-smp' ARCH='hppa'
 build-hppa-none-parisc-smp-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc-smp' KERNEL_ARCH='parisc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc-smp' ARCH='hppa'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc-smp' KERNEL_ARCH='parisc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc-smp' ARCH='hppa'
 setup-hppa-none-parisc-smp-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc-smp' KERNEL_ARCH='parisc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc-smp' ARCH='hppa'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc-smp' KERNEL_ARCH='parisc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc-smp' ARCH='hppa'
 binary-arch-hppa-none:: binary-arch-hppa-none-parisc64
 binary-arch-hppa-none-parisc64:: binary-arch-hppa-none-parisc64-real
 build-hppa-none:: build-hppa-none-parisc64
@@ -402,11 +364,11 @@
 source-hppa-none:: source-hppa-none-parisc64
 source-hppa-none-parisc64:: source-hppa-none-parisc64-real
 binary-arch-hppa-none-parisc64-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc64' KERNEL_ARCH='parisc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc64' ARCH='hppa'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc64' KERNEL_ARCH='parisc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc64' ARCH='hppa'
 build-hppa-none-parisc64-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc64' KERNEL_ARCH='parisc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc64' ARCH='hppa'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc64' KERNEL_ARCH='parisc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc64' ARCH='hppa'
 setup-hppa-none-parisc64-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc64' KERNEL_ARCH='parisc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc64' ARCH='hppa'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc64' KERNEL_ARCH='parisc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc64' ARCH='hppa'
 binary-arch-hppa-none:: binary-arch-hppa-none-parisc64-smp
 binary-arch-hppa-none-parisc64-smp:: binary-arch-hppa-none-parisc64-smp-real
 build-hppa-none:: build-hppa-none-parisc64-smp
@@ -416,11 +378,11 @@
 source-hppa-none:: source-hppa-none-parisc64-smp
 source-hppa-none-parisc64-smp:: source-hppa-none-parisc64-smp-real
 binary-arch-hppa-none-parisc64-smp-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc64-smp' KERNEL_ARCH='parisc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc64-smp' ARCH='hppa'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc64-smp' KERNEL_ARCH='parisc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc64-smp' ARCH='hppa'
 build-hppa-none-parisc64-smp-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc64-smp' KERNEL_ARCH='parisc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc64-smp' ARCH='hppa'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc64-smp' KERNEL_ARCH='parisc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc64-smp' ARCH='hppa'
 setup-hppa-none-parisc64-smp-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc64-smp' KERNEL_ARCH='parisc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc64-smp' ARCH='hppa'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='parisc64-smp' KERNEL_ARCH='parisc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-parisc64-smp' ARCH='hppa'
 binary-arch:: binary-arch-i386
 binary-arch-i386:: binary-arch-i386-real
 build:: build-i386
@@ -454,11 +416,11 @@
 source-i386-none:: source-i386-none-486
 source-i386-none-486:: source-i386-none-486-real
 binary-arch-i386-none-486-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='486' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-486' ARCH='i386'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='486' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-486' ARCH='i386'
 build-i386-none-486-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='486' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-486' ARCH='i386'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='486' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-486' ARCH='i386'
 setup-i386-none-486-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='486' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-486' ARCH='i386'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='486' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-486' ARCH='i386'
 binary-arch-i386-none:: binary-arch-i386-none-686
 binary-arch-i386-none-686:: binary-arch-i386-none-686-real
 build-i386-none:: build-i386-none-686
@@ -468,11 +430,11 @@
 source-i386-none:: source-i386-none-686
 source-i386-none-686:: source-i386-none-686-real
 binary-arch-i386-none-686-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-686' ARCH='i386'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-686' ARCH='i386'
 build-i386-none-686-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-686' ARCH='i386'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-686' ARCH='i386'
 setup-i386-none-686-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-686' ARCH='i386'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-686' ARCH='i386'
 binary-arch-i386-none:: binary-arch-i386-none-k7
 binary-arch-i386-none-k7:: binary-arch-i386-none-k7-real
 build-i386-none:: build-i386-none-k7
@@ -482,11 +444,11 @@
 source-i386-none:: source-i386-none-k7
 source-i386-none-k7:: source-i386-none-k7-real
 binary-arch-i386-none-k7-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='k7' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-k7' ARCH='i386'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='k7' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-k7' ARCH='i386'
 build-i386-none-k7-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='k7' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-k7' ARCH='i386'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='k7' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-k7' ARCH='i386'
 setup-i386-none-k7-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='k7' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-k7' ARCH='i386'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='k7' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-k7' ARCH='i386'
 binary-arch-i386-none:: binary-arch-i386-none-686-bigmem
 binary-arch-i386-none-686-bigmem:: binary-arch-i386-none-686-bigmem-real
 build-i386-none:: build-i386-none-686-bigmem
@@ -496,11 +458,11 @@
 source-i386-none:: source-i386-none-686-bigmem
 source-i386-none-686-bigmem:: source-i386-none-686-bigmem-real
 binary-arch-i386-none-686-bigmem-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686-bigmem' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-686-bigmem' ARCH='i386'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686-bigmem' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-686-bigmem' ARCH='i386'
 build-i386-none-686-bigmem-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686-bigmem' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-686-bigmem' ARCH='i386'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686-bigmem' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-686-bigmem' ARCH='i386'
 setup-i386-none-686-bigmem-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686-bigmem' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-686-bigmem' ARCH='i386'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686-bigmem' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-686-bigmem' ARCH='i386'
 binary-arch-i386:: binary-arch-i386-vserver
 binary-arch-i386-vserver:: binary-arch-i386-vserver-real
 build-i386:: build-i386-vserver
@@ -522,11 +484,11 @@
 source-i386-vserver:: source-i386-vserver-686
 source-i386-vserver-686:: source-i386-vserver-686-real
 binary-arch-i386-vserver-686-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-686' ARCH='i386'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-686' ARCH='i386'
 build-i386-vserver-686-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-686' ARCH='i386'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-686' ARCH='i386'
 setup-i386-vserver-686-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-686' ARCH='i386'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-686' ARCH='i386'
 binary-arch-i386-vserver:: binary-arch-i386-vserver-k7
 binary-arch-i386-vserver-k7:: binary-arch-i386-vserver-k7-real
 build-i386-vserver:: build-i386-vserver-k7
@@ -536,11 +498,11 @@
 source-i386-vserver:: source-i386-vserver-k7
 source-i386-vserver-k7:: source-i386-vserver-k7-real
 binary-arch-i386-vserver-k7-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='k7' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-k7' ARCH='i386'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='k7' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-k7' ARCH='i386'
 build-i386-vserver-k7-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='k7' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-k7' ARCH='i386'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='k7' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-k7' ARCH='i386'
 setup-i386-vserver-k7-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='k7' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-k7' ARCH='i386'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='k7' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-k7' ARCH='i386'
 binary-arch-i386:: binary-arch-i386-xen
 binary-arch-i386-xen:: binary-arch-i386-xen-real
 build-i386:: build-i386-xen
@@ -562,11 +524,11 @@
 source-i386-xen:: source-i386-xen-686
 source-i386-xen-686:: source-i386-xen-686-real
 binary-arch-i386-xen-686-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='xen' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-686' ARCH='i386'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='xen' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-686' ARCH='i386'
 build-i386-xen-686-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='xen' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-686' ARCH='i386'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='xen' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-686' ARCH='i386'
 setup-i386-xen-686-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='xen' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-686' ARCH='i386'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='xen' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-686' ARCH='i386'
 binary-arch-i386-xen:: binary-arch-i386-xen-k7
 binary-arch-i386-xen-k7:: binary-arch-i386-xen-k7-real
 build-i386-xen:: build-i386-xen-k7
@@ -576,11 +538,11 @@
 source-i386-xen:: source-i386-xen-k7
 source-i386-xen-k7:: source-i386-xen-k7-real
 binary-arch-i386-xen-k7-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='k7' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='xen' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-k7' ARCH='i386'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='k7' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='xen' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-k7' ARCH='i386'
 build-i386-xen-k7-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='k7' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='xen' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-k7' ARCH='i386'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='k7' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='xen' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-k7' ARCH='i386'
 setup-i386-xen-k7-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='k7' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='xen' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-k7' ARCH='i386'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='k7' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='xen' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-k7' ARCH='i386'
 binary-arch-i386:: binary-arch-i386-xen-vserver
 binary-arch-i386-xen-vserver:: binary-arch-i386-xen-vserver-real
 build-i386:: build-i386-xen-vserver
@@ -602,11 +564,11 @@
 source-i386-xen-vserver:: source-i386-xen-vserver-686
 source-i386-xen-vserver-686:: source-i386-xen-vserver-686-real
 binary-arch-i386-xen-vserver-686-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='xen-vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-vserver-686' ARCH='i386'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='xen-vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-vserver-686' ARCH='i386'
 build-i386-xen-vserver-686-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='xen-vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-vserver-686' ARCH='i386'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='xen-vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-vserver-686' ARCH='i386'
 setup-i386-xen-vserver-686-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-1' SUBARCH='xen-vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-vserver-686' ARCH='i386'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='686' KERNEL_ARCH='i386' ABINAME='-2' SUBARCH='xen-vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-xen-vserver-686' ARCH='i386'
 binary-arch:: binary-arch-ia64
 binary-arch-ia64:: binary-arch-ia64-real
 build:: build-ia64
@@ -640,11 +602,11 @@
 source-ia64-none:: source-ia64-none-itanium
 source-ia64-none-itanium:: source-ia64-none-itanium-real
 binary-arch-ia64-none-itanium-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='itanium' KERNEL_ARCH='ia64' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-itanium' ARCH='ia64'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='itanium' KERNEL_ARCH='ia64' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-itanium' ARCH='ia64'
 build-ia64-none-itanium-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='itanium' KERNEL_ARCH='ia64' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-itanium' ARCH='ia64'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='itanium' KERNEL_ARCH='ia64' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-itanium' ARCH='ia64'
 setup-ia64-none-itanium-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='itanium' KERNEL_ARCH='ia64' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-itanium' ARCH='ia64'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='itanium' KERNEL_ARCH='ia64' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-itanium' ARCH='ia64'
 binary-arch-ia64-none:: binary-arch-ia64-none-mckinley
 binary-arch-ia64-none-mckinley:: binary-arch-ia64-none-mckinley-real
 build-ia64-none:: build-ia64-none-mckinley
@@ -654,11 +616,11 @@
 source-ia64-none:: source-ia64-none-mckinley
 source-ia64-none-mckinley:: source-ia64-none-mckinley-real
 binary-arch-ia64-none-mckinley-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='mckinley' KERNEL_ARCH='ia64' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-mckinley' ARCH='ia64'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='mckinley' KERNEL_ARCH='ia64' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-mckinley' ARCH='ia64'
 build-ia64-none-mckinley-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='mckinley' KERNEL_ARCH='ia64' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-mckinley' ARCH='ia64'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='mckinley' KERNEL_ARCH='ia64' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-mckinley' ARCH='ia64'
 setup-ia64-none-mckinley-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='mckinley' KERNEL_ARCH='ia64' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-mckinley' ARCH='ia64'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='mckinley' KERNEL_ARCH='ia64' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-mckinley' ARCH='ia64'
 binary-arch:: binary-arch-m68k
 binary-arch-m68k:: binary-arch-m68k-real
 build:: build-m68k
@@ -692,11 +654,11 @@
 source-m68k-none:: source-m68k-none-amiga
 source-m68k-none-amiga:: source-m68k-none-amiga-real
 binary-arch-m68k-none-amiga-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amiga' KERNEL_ARCH='m68k' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-amiga' ARCH='m68k'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amiga' KERNEL_ARCH='m68k' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-amiga' ARCH='m68k'
 build-m68k-none-amiga-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amiga' KERNEL_ARCH='m68k' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-amiga' ARCH='m68k'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amiga' KERNEL_ARCH='m68k' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-amiga' ARCH='m68k'
 setup-m68k-none-amiga-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amiga' KERNEL_ARCH='m68k' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-amiga' ARCH='m68k'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='amiga' KERNEL_ARCH='m68k' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-amiga' ARCH='m68k'
 binary-arch-m68k-none:: binary-arch-m68k-none-mac
 binary-arch-m68k-none-mac:: binary-arch-m68k-none-mac-real
 build-m68k-none:: build-m68k-none-mac
@@ -706,11 +668,11 @@
 source-m68k-none:: source-m68k-none-mac
 source-m68k-none-mac:: source-m68k-none-mac-real
 binary-arch-m68k-none-mac-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='mac' KERNEL_ARCH='m68k' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-mac' ARCH='m68k'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='mac' KERNEL_ARCH='m68k' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-mac' ARCH='m68k'
 build-m68k-none-mac-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='mac' KERNEL_ARCH='m68k' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-mac' ARCH='m68k'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='mac' KERNEL_ARCH='m68k' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-mac' ARCH='m68k'
 setup-m68k-none-mac-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='mac' KERNEL_ARCH='m68k' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-mac' ARCH='m68k'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='mac' KERNEL_ARCH='m68k' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-mac' ARCH='m68k'
 binary-arch:: binary-arch-mips
 binary-arch-mips:: binary-arch-mips-real
 build:: build-mips
@@ -744,11 +706,11 @@
 source-mips-none:: source-mips-none-r4k-ip22
 source-mips-none-r4k-ip22:: source-mips-none-r4k-ip22-real
 binary-arch-mips-none-r4k-ip22-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r4k-ip22' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r4k-ip22' ARCH='mips'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r4k-ip22' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r4k-ip22' ARCH='mips'
 build-mips-none-r4k-ip22-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r4k-ip22' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r4k-ip22' ARCH='mips'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r4k-ip22' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r4k-ip22' ARCH='mips'
 setup-mips-none-r4k-ip22-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r4k-ip22' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r4k-ip22' ARCH='mips'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r4k-ip22' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r4k-ip22' ARCH='mips'
 binary-arch-mips-none:: binary-arch-mips-none-r5k-ip32
 binary-arch-mips-none-r5k-ip32:: binary-arch-mips-none-r5k-ip32-real
 build-mips-none:: build-mips-none-r5k-ip32
@@ -758,11 +720,11 @@
 source-mips-none:: source-mips-none-r5k-ip32
 source-mips-none-r5k-ip32:: source-mips-none-r5k-ip32-real
 binary-arch-mips-none-r5k-ip32-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r5k-ip32' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r5k-ip32' ARCH='mips'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r5k-ip32' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r5k-ip32' ARCH='mips'
 build-mips-none-r5k-ip32-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r5k-ip32' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r5k-ip32' ARCH='mips'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r5k-ip32' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r5k-ip32' ARCH='mips'
 setup-mips-none-r5k-ip32-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r5k-ip32' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r5k-ip32' ARCH='mips'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r5k-ip32' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r5k-ip32' ARCH='mips'
 binary-arch-mips-none:: binary-arch-mips-none-sb1-bcm91250a
 binary-arch-mips-none-sb1-bcm91250a:: binary-arch-mips-none-sb1-bcm91250a-real
 build-mips-none:: build-mips-none-sb1-bcm91250a
@@ -772,11 +734,11 @@
 source-mips-none:: source-mips-none-sb1-bcm91250a
 source-mips-none-sb1-bcm91250a:: source-mips-none-sb1-bcm91250a-real
 binary-arch-mips-none-sb1-bcm91250a-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1-bcm91250a' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1-bcm91250a' ARCH='mips'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1-bcm91250a' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1-bcm91250a' ARCH='mips'
 build-mips-none-sb1-bcm91250a-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1-bcm91250a' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1-bcm91250a' ARCH='mips'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1-bcm91250a' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1-bcm91250a' ARCH='mips'
 setup-mips-none-sb1-bcm91250a-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1-bcm91250a' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1-bcm91250a' ARCH='mips'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1-bcm91250a' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1-bcm91250a' ARCH='mips'
 binary-arch-mips-none:: binary-arch-mips-none-sb1a-bcm91480b
 binary-arch-mips-none-sb1a-bcm91480b:: binary-arch-mips-none-sb1a-bcm91480b-real
 build-mips-none:: build-mips-none-sb1a-bcm91480b
@@ -786,11 +748,11 @@
 source-mips-none:: source-mips-none-sb1a-bcm91480b
 source-mips-none-sb1a-bcm91480b:: source-mips-none-sb1a-bcm91480b-real
 binary-arch-mips-none-sb1a-bcm91480b-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1a-bcm91480b' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1a-bcm91480b' ARCH='mips'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1a-bcm91480b' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1a-bcm91480b' ARCH='mips'
 build-mips-none-sb1a-bcm91480b-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1a-bcm91480b' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1a-bcm91480b' ARCH='mips'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1a-bcm91480b' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1a-bcm91480b' ARCH='mips'
 setup-mips-none-sb1a-bcm91480b-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1a-bcm91480b' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1a-bcm91480b' ARCH='mips'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1a-bcm91480b' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1a-bcm91480b' ARCH='mips'
 binary-arch:: binary-arch-mipsel
 binary-arch-mipsel:: binary-arch-mipsel-real
 build:: build-mipsel
@@ -824,11 +786,11 @@
 source-mipsel-none:: source-mipsel-none-r5k-cobalt
 source-mipsel-none-r5k-cobalt:: source-mipsel-none-r5k-cobalt-real
 binary-arch-mipsel-none-r5k-cobalt-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r5k-cobalt' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r5k-cobalt' ARCH='mipsel'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r5k-cobalt' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r5k-cobalt' ARCH='mipsel'
 build-mipsel-none-r5k-cobalt-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r5k-cobalt' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r5k-cobalt' ARCH='mipsel'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r5k-cobalt' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r5k-cobalt' ARCH='mipsel'
 setup-mipsel-none-r5k-cobalt-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r5k-cobalt' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r5k-cobalt' ARCH='mipsel'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r5k-cobalt' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r5k-cobalt' ARCH='mipsel'
 binary-arch-mipsel-none:: binary-arch-mipsel-none-sb1-bcm91250a
 binary-arch-mipsel-none-sb1-bcm91250a:: binary-arch-mipsel-none-sb1-bcm91250a-real
 build-mipsel-none:: build-mipsel-none-sb1-bcm91250a
@@ -838,11 +800,11 @@
 source-mipsel-none:: source-mipsel-none-sb1-bcm91250a
 source-mipsel-none-sb1-bcm91250a:: source-mipsel-none-sb1-bcm91250a-real
 binary-arch-mipsel-none-sb1-bcm91250a-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1-bcm91250a' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1-bcm91250a' ARCH='mipsel'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1-bcm91250a' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1-bcm91250a' ARCH='mipsel'
 build-mipsel-none-sb1-bcm91250a-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1-bcm91250a' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1-bcm91250a' ARCH='mipsel'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1-bcm91250a' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1-bcm91250a' ARCH='mipsel'
 setup-mipsel-none-sb1-bcm91250a-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1-bcm91250a' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1-bcm91250a' ARCH='mipsel'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1-bcm91250a' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1-bcm91250a' ARCH='mipsel'
 binary-arch-mipsel-none:: binary-arch-mipsel-none-sb1a-bcm91480b
 binary-arch-mipsel-none-sb1a-bcm91480b:: binary-arch-mipsel-none-sb1a-bcm91480b-real
 build-mipsel-none:: build-mipsel-none-sb1a-bcm91480b
@@ -852,11 +814,11 @@
 source-mipsel-none:: source-mipsel-none-sb1a-bcm91480b
 source-mipsel-none-sb1a-bcm91480b:: source-mipsel-none-sb1a-bcm91480b-real
 binary-arch-mipsel-none-sb1a-bcm91480b-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1a-bcm91480b' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1a-bcm91480b' ARCH='mipsel'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1a-bcm91480b' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1a-bcm91480b' ARCH='mipsel'
 build-mipsel-none-sb1a-bcm91480b-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1a-bcm91480b' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1a-bcm91480b' ARCH='mipsel'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1a-bcm91480b' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1a-bcm91480b' ARCH='mipsel'
 setup-mipsel-none-sb1a-bcm91480b-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1a-bcm91480b' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1a-bcm91480b' ARCH='mipsel'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sb1a-bcm91480b' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sb1a-bcm91480b' ARCH='mipsel'
 binary-arch-mipsel-none:: binary-arch-mipsel-none-r3k-kn02
 binary-arch-mipsel-none-r3k-kn02:: binary-arch-mipsel-none-r3k-kn02-real
 build-mipsel-none:: build-mipsel-none-r3k-kn02
@@ -866,11 +828,11 @@
 source-mipsel-none:: source-mipsel-none-r3k-kn02
 source-mipsel-none-r3k-kn02:: source-mipsel-none-r3k-kn02-real
 binary-arch-mipsel-none-r3k-kn02-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r3k-kn02' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r3k-kn02' ARCH='mipsel'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r3k-kn02' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r3k-kn02' ARCH='mipsel'
 build-mipsel-none-r3k-kn02-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r3k-kn02' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r3k-kn02' ARCH='mipsel'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r3k-kn02' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r3k-kn02' ARCH='mipsel'
 setup-mipsel-none-r3k-kn02-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r3k-kn02' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r3k-kn02' ARCH='mipsel'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r3k-kn02' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r3k-kn02' ARCH='mipsel'
 binary-arch-mipsel-none:: binary-arch-mipsel-none-r4k-kn04
 binary-arch-mipsel-none-r4k-kn04:: binary-arch-mipsel-none-r4k-kn04-real
 build-mipsel-none:: build-mipsel-none-r4k-kn04
@@ -880,11 +842,11 @@
 source-mipsel-none:: source-mipsel-none-r4k-kn04
 source-mipsel-none-r4k-kn04:: source-mipsel-none-r4k-kn04-real
 binary-arch-mipsel-none-r4k-kn04-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r4k-kn04' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r4k-kn04' ARCH='mipsel'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r4k-kn04' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r4k-kn04' ARCH='mipsel'
 build-mipsel-none-r4k-kn04-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r4k-kn04' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r4k-kn04' ARCH='mipsel'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r4k-kn04' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r4k-kn04' ARCH='mipsel'
 setup-mipsel-none-r4k-kn04-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r4k-kn04' KERNEL_ARCH='mips' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r4k-kn04' ARCH='mipsel'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='r4k-kn04' KERNEL_ARCH='mips' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-r4k-kn04' ARCH='mipsel'
 binary-arch:: binary-arch-powerpc
 binary-arch-powerpc:: binary-arch-powerpc-real
 build:: build-powerpc
@@ -918,11 +880,11 @@
 source-powerpc-none:: source-powerpc-none-powerpc
 source-powerpc-none-powerpc:: source-powerpc-none-powerpc-real
 binary-arch-powerpc-none-powerpc-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc' KERNEL_ARCH='powerpc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc' ARCH='powerpc'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc' KERNEL_ARCH='powerpc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc' ARCH='powerpc'
 build-powerpc-none-powerpc-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc' KERNEL_ARCH='powerpc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc' ARCH='powerpc'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc' KERNEL_ARCH='powerpc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc' ARCH='powerpc'
 setup-powerpc-none-powerpc-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc' KERNEL_ARCH='powerpc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc' ARCH='powerpc'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc' KERNEL_ARCH='powerpc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc' ARCH='powerpc'
 binary-arch-powerpc-none:: binary-arch-powerpc-none-powerpc-smp
 binary-arch-powerpc-none-powerpc-smp:: binary-arch-powerpc-none-powerpc-smp-real
 build-powerpc-none:: build-powerpc-none-powerpc-smp
@@ -932,11 +894,11 @@
 source-powerpc-none:: source-powerpc-none-powerpc-smp
 source-powerpc-none-powerpc-smp:: source-powerpc-none-powerpc-smp-real
 binary-arch-powerpc-none-powerpc-smp-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc-smp' KERNEL_ARCH='powerpc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc-smp' ARCH='powerpc'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc-smp' KERNEL_ARCH='powerpc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc-smp' ARCH='powerpc'
 build-powerpc-none-powerpc-smp-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc-smp' KERNEL_ARCH='powerpc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc-smp' ARCH='powerpc'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc-smp' KERNEL_ARCH='powerpc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc-smp' ARCH='powerpc'
 setup-powerpc-none-powerpc-smp-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc-smp' KERNEL_ARCH='powerpc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc-smp' ARCH='powerpc'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc-smp' KERNEL_ARCH='powerpc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc-smp' ARCH='powerpc'
 binary-arch-powerpc-none:: binary-arch-powerpc-none-powerpc-miboot
 binary-arch-powerpc-none-powerpc-miboot:: binary-arch-powerpc-none-powerpc-miboot-real
 build-powerpc-none:: build-powerpc-none-powerpc-miboot
@@ -946,11 +908,11 @@
 source-powerpc-none:: source-powerpc-none-powerpc-miboot
 source-powerpc-none-powerpc-miboot:: source-powerpc-none-powerpc-miboot-real
 binary-arch-powerpc-none-powerpc-miboot-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc-miboot' KERNEL_ARCH='powerpc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc-miboot' ARCH='powerpc'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc-miboot' KERNEL_ARCH='powerpc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc-miboot' ARCH='powerpc'
 build-powerpc-none-powerpc-miboot-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc-miboot' KERNEL_ARCH='powerpc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc-miboot' ARCH='powerpc'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc-miboot' KERNEL_ARCH='powerpc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc-miboot' ARCH='powerpc'
 setup-powerpc-none-powerpc-miboot-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc-miboot' KERNEL_ARCH='powerpc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc-miboot' ARCH='powerpc'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc-miboot' KERNEL_ARCH='powerpc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc-miboot' ARCH='powerpc'
 binary-arch-powerpc-none:: binary-arch-powerpc-none-powerpc64
 binary-arch-powerpc-none-powerpc64:: binary-arch-powerpc-none-powerpc64-real
 build-powerpc-none:: build-powerpc-none-powerpc64
@@ -960,11 +922,11 @@
 source-powerpc-none:: source-powerpc-none-powerpc64
 source-powerpc-none-powerpc64:: source-powerpc-none-powerpc64-real
 binary-arch-powerpc-none-powerpc64-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc64' KERNEL_ARCH='powerpc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc64' ARCH='powerpc'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc64' KERNEL_ARCH='powerpc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc64' ARCH='powerpc'
 build-powerpc-none-powerpc64-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc64' KERNEL_ARCH='powerpc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc64' ARCH='powerpc'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc64' KERNEL_ARCH='powerpc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc64' ARCH='powerpc'
 setup-powerpc-none-powerpc64-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc64' KERNEL_ARCH='powerpc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc64' ARCH='powerpc'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc64' KERNEL_ARCH='powerpc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-powerpc64' ARCH='powerpc'
 binary-arch-powerpc-none:: binary-arch-powerpc-none-prep
 binary-arch-powerpc-none-prep:: binary-arch-powerpc-none-prep-real
 build-powerpc-none:: build-powerpc-none-prep
@@ -974,11 +936,11 @@
 source-powerpc-none:: source-powerpc-none-prep
 source-powerpc-none-prep:: source-powerpc-none-prep-real
 binary-arch-powerpc-none-prep-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='prep' KERNEL_ARCH='ppc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-prep' ARCH='powerpc'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='prep' KERNEL_ARCH='ppc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-prep' ARCH='powerpc'
 build-powerpc-none-prep-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='prep' KERNEL_ARCH='ppc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-prep' ARCH='powerpc'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='prep' KERNEL_ARCH='ppc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-prep' ARCH='powerpc'
 setup-powerpc-none-prep-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='prep' KERNEL_ARCH='ppc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-prep' ARCH='powerpc'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='prep' KERNEL_ARCH='ppc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-prep' ARCH='powerpc'
 binary-arch-powerpc:: binary-arch-powerpc-vserver
 binary-arch-powerpc-vserver:: binary-arch-powerpc-vserver-real
 build-powerpc:: build-powerpc-vserver
@@ -1000,11 +962,11 @@
 source-powerpc-vserver:: source-powerpc-vserver-powerpc
 source-powerpc-vserver-powerpc:: source-powerpc-vserver-powerpc-real
 binary-arch-powerpc-vserver-powerpc-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc' KERNEL_ARCH='powerpc' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-powerpc' ARCH='powerpc'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc' KERNEL_ARCH='powerpc' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-powerpc' ARCH='powerpc'
 build-powerpc-vserver-powerpc-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc' KERNEL_ARCH='powerpc' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-powerpc' ARCH='powerpc'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc' KERNEL_ARCH='powerpc' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-powerpc' ARCH='powerpc'
 setup-powerpc-vserver-powerpc-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc' KERNEL_ARCH='powerpc' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-powerpc' ARCH='powerpc'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc' KERNEL_ARCH='powerpc' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-powerpc' ARCH='powerpc'
 binary-arch-powerpc-vserver:: binary-arch-powerpc-vserver-powerpc64
 binary-arch-powerpc-vserver-powerpc64:: binary-arch-powerpc-vserver-powerpc64-real
 build-powerpc-vserver:: build-powerpc-vserver-powerpc64
@@ -1014,11 +976,11 @@
 source-powerpc-vserver:: source-powerpc-vserver-powerpc64
 source-powerpc-vserver-powerpc64:: source-powerpc-vserver-powerpc64-real
 binary-arch-powerpc-vserver-powerpc64-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc64' KERNEL_ARCH='powerpc' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-powerpc64' ARCH='powerpc'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc64' KERNEL_ARCH='powerpc' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-powerpc64' ARCH='powerpc'
 build-powerpc-vserver-powerpc64-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc64' KERNEL_ARCH='powerpc' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-powerpc64' ARCH='powerpc'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc64' KERNEL_ARCH='powerpc' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-powerpc64' ARCH='powerpc'
 setup-powerpc-vserver-powerpc64-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc64' KERNEL_ARCH='powerpc' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-powerpc64' ARCH='powerpc'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='powerpc64' KERNEL_ARCH='powerpc' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-powerpc64' ARCH='powerpc'
 binary-arch:: binary-arch-s390
 binary-arch-s390:: binary-arch-s390-real
 build:: build-s390
@@ -1052,11 +1014,11 @@
 source-s390-none:: source-s390-none-s390
 source-s390-none-s390:: source-s390-none-s390-real
 binary-arch-s390-none-s390-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s390' KERNEL_ARCH='s390' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-s390' ARCH='s390'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s390' KERNEL_ARCH='s390' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-s390' ARCH='s390'
 build-s390-none-s390-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s390' KERNEL_ARCH='s390' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-s390' ARCH='s390'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s390' KERNEL_ARCH='s390' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-s390' ARCH='s390'
 setup-s390-none-s390-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s390' KERNEL_ARCH='s390' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-s390' ARCH='s390'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s390' KERNEL_ARCH='s390' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-s390' ARCH='s390'
 binary-arch-s390-none:: binary-arch-s390-none-s390-tape
 binary-arch-s390-none-s390-tape:: binary-arch-s390-none-s390-tape-real
 build-s390-none:: build-s390-none-s390-tape
@@ -1078,11 +1040,11 @@
 source-s390-none:: source-s390-none-s390x
 source-s390-none-s390x:: source-s390-none-s390x-real
 binary-arch-s390-none-s390x-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s390x' KERNEL_ARCH='s390' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-s390x' ARCH='s390'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s390x' KERNEL_ARCH='s390' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-s390x' ARCH='s390'
 build-s390-none-s390x-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s390x' KERNEL_ARCH='s390' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-s390x' ARCH='s390'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s390x' KERNEL_ARCH='s390' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-s390x' ARCH='s390'
 setup-s390-none-s390x-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s390x' KERNEL_ARCH='s390' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-s390x' ARCH='s390'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s390x' KERNEL_ARCH='s390' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-s390x' ARCH='s390'
 binary-arch-s390:: binary-arch-s390-vserver
 binary-arch-s390-vserver:: binary-arch-s390-vserver-real
 build-s390:: build-s390-vserver
@@ -1104,11 +1066,11 @@
 source-s390-vserver:: source-s390-vserver-s390x
 source-s390-vserver-s390x:: source-s390-vserver-s390x-real
 binary-arch-s390-vserver-s390x-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s390x' KERNEL_ARCH='s390' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-s390x' ARCH='s390'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s390x' KERNEL_ARCH='s390' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-s390x' ARCH='s390'
 build-s390-vserver-s390x-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s390x' KERNEL_ARCH='s390' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-s390x' ARCH='s390'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s390x' KERNEL_ARCH='s390' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-s390x' ARCH='s390'
 setup-s390-vserver-s390x-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s390x' KERNEL_ARCH='s390' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-s390x' ARCH='s390'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='s390x' KERNEL_ARCH='s390' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-s390x' ARCH='s390'
 binary-arch:: binary-arch-sparc
 binary-arch-sparc:: binary-arch-sparc-real
 build:: build-sparc
@@ -1142,11 +1104,11 @@
 source-sparc-none:: source-sparc-none-sparc32
 source-sparc-none-sparc32:: source-sparc-none-sparc32-real
 binary-arch-sparc-none-sparc32-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc32' KERNEL_ARCH='sparc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sparc32' ARCH='sparc'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc32' KERNEL_ARCH='sparc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sparc32' ARCH='sparc'
 build-sparc-none-sparc32-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc32' KERNEL_ARCH='sparc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sparc32' ARCH='sparc'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc32' KERNEL_ARCH='sparc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sparc32' ARCH='sparc'
 setup-sparc-none-sparc32-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc32' KERNEL_ARCH='sparc' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sparc32' ARCH='sparc'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc32' KERNEL_ARCH='sparc' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sparc32' ARCH='sparc'
 binary-arch-sparc-none:: binary-arch-sparc-none-sparc64
 binary-arch-sparc-none-sparc64:: binary-arch-sparc-none-sparc64-real
 build-sparc-none:: build-sparc-none-sparc64
@@ -1156,11 +1118,11 @@
 source-sparc-none:: source-sparc-none-sparc64
 source-sparc-none-sparc64:: source-sparc-none-sparc64-real
 binary-arch-sparc-none-sparc64-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc64' KERNEL_ARCH='sparc64' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sparc64' ARCH='sparc'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc64' KERNEL_ARCH='sparc64' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sparc64' ARCH='sparc'
 build-sparc-none-sparc64-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc64' KERNEL_ARCH='sparc64' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sparc64' ARCH='sparc'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc64' KERNEL_ARCH='sparc64' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sparc64' ARCH='sparc'
 setup-sparc-none-sparc64-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc64' KERNEL_ARCH='sparc64' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sparc64' ARCH='sparc'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc64' KERNEL_ARCH='sparc64' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sparc64' ARCH='sparc'
 binary-arch-sparc-none:: binary-arch-sparc-none-sparc64-smp
 binary-arch-sparc-none-sparc64-smp:: binary-arch-sparc-none-sparc64-smp-real
 build-sparc-none:: build-sparc-none-sparc64-smp
@@ -1170,11 +1132,11 @@
 source-sparc-none:: source-sparc-none-sparc64-smp
 source-sparc-none-sparc64-smp:: source-sparc-none-sparc64-smp-real
 binary-arch-sparc-none-sparc64-smp-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc64-smp' KERNEL_ARCH='sparc64' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sparc64-smp' ARCH='sparc'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc64-smp' KERNEL_ARCH='sparc64' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sparc64-smp' ARCH='sparc'
 build-sparc-none-sparc64-smp-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc64-smp' KERNEL_ARCH='sparc64' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sparc64-smp' ARCH='sparc'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc64-smp' KERNEL_ARCH='sparc64' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sparc64-smp' ARCH='sparc'
 setup-sparc-none-sparc64-smp-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc64-smp' KERNEL_ARCH='sparc64' ABINAME='-1' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sparc64-smp' ARCH='sparc'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc64-smp' KERNEL_ARCH='sparc64' ABINAME='-2' SUBARCH='none' UPSTREAMVERSION='2.6.18' LOCALVERSION='-sparc64-smp' ARCH='sparc'
 binary-arch-sparc:: binary-arch-sparc-vserver
 binary-arch-sparc-vserver:: binary-arch-sparc-vserver-real
 build-sparc:: build-sparc-vserver
@@ -1196,8 +1158,8 @@
 source-sparc-vserver:: source-sparc-vserver-sparc64
 source-sparc-vserver-sparc64:: source-sparc-vserver-sparc64-real
 binary-arch-sparc-vserver-sparc64-real:
-	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc64' KERNEL_ARCH='sparc64' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-sparc64' ARCH='sparc'
+	$(MAKE) -f debian/rules.real binary-arch-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc64' KERNEL_ARCH='sparc64' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-sparc64' ARCH='sparc'
 build-sparc-vserver-sparc64-real:
-	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc64' KERNEL_ARCH='sparc64' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-sparc64' ARCH='sparc'
+	$(MAKE) -f debian/rules.real build MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc64' KERNEL_ARCH='sparc64' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-sparc64' ARCH='sparc'
 setup-sparc-vserver-sparc64-real:
-	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc64' KERNEL_ARCH='sparc64' ABINAME='-1' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-sparc64' ARCH='sparc'
+	$(MAKE) -f debian/rules.real setup-flavour MAJOR='2.6' VERSION='2.6.18' FLAVOUR='sparc64' KERNEL_ARCH='sparc64' ABINAME='-2' SUBARCH='vserver' UPSTREAMVERSION='2.6.18' LOCALVERSION='-vserver-sparc64' ARCH='sparc'




More information about the Pkg-loop-aes-commits mailing list