propagate from branch 'net.randombit.botan' (head 95eb8083f5884531e5ca0667388f8a6fb6d05c41)

            to branch 'net.randombit.botan.c++0x' (head 56e105e678540c8bcafa4d0198c19a9489fbf8d1)

5 files changed, 16 insertions, 17 deletions

diff --git a/src/codec/base64/info.txt b/src/codec/base64/info.txt
index 591581afb..d4ed80976 100644
--- a/src/codec/base64/info.txt
+++ b/src/codec/base64/info.txt
@@ -4,12 +4,12 @@ define BASE64_CODEC
 
 load_on auto
 
-<requires>
-filters
-</requires>
-
 <add>
 base64.cpp
 b64_char.cpp
 base64.h
 </add>
+
+<requires>
+filters
+</requires>
diff --git a/src/codec/bzip2/info.txt b/src/codec/bzip2/info.txt
index 51e1feed1..1be84e405 100644
--- a/src/codec/bzip2/info.txt
+++ b/src/codec/bzip2/info.txt
@@ -7,10 +7,6 @@ modset compression
 
 load_on request
 
-<requires>
-filters
-</requires>
-
 <add>
 bzip2.h
 bzip2.cpp
@@ -19,3 +15,7 @@ bzip2.cpp
 <libs>
 all -> bz2
 </libs>
+
+<requires>
+filters
+</requires>
diff --git a/src/codec/hex/info.txt b/src/codec/hex/info.txt
index 71b33a6ad..512a5de8b 100644
--- a/src/codec/hex/info.txt
+++ b/src/codec/hex/info.txt
@@ -4,12 +4,12 @@ define HEX_CODEC
 
 load_on auto
 
-<requires>
-filters
-</requires>
-
 <add>
 hex.cpp
 hex_char.cpp
 hex.h
 </add>
+
+<requires>
+filters
+</requires>
diff --git a/src/codec/openpgp/info.txt b/src/codec/openpgp/info.txt
index d43c72843..6b30850d0 100644
--- a/src/codec/openpgp/info.txt
+++ b/src/codec/openpgp/info.txt
@@ -11,6 +11,5 @@ openpgp.h
 
 <requires>
 crc24
-base64
 filters
 </requires>
diff --git a/src/codec/zlib/info.txt b/src/codec/zlib/info.txt
index 49e9658a9..9b1c35d84 100644
--- a/src/codec/zlib/info.txt
+++ b/src/codec/zlib/info.txt
@@ -7,10 +7,6 @@ define COMPRESSOR_ZLIB
 load_on request
 modset compression
 
-<requires>
-filters
-</requires>
-
 <add>
 zlib.h
 zlib.cpp
@@ -21,3 +17,7 @@ zlib.cpp
 <libs>
 all -> z
 </libs>
+
+<requires>
+filters
+</requires>