From 404e8d1ea7c0bf99373aec2ce7f2534a442149b3 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Fri, 22 Oct 2010 20:00:31 +0200
Subject: [PATCH] Remove accidentally added files.

---
 framework/Core/package.xml          |   8 ---
 framework/Crypt/package.xml         | 136 ------------------------------------
 framework/Data/package.xml          |   7 --
 framework/File_Csv/package.xml      | 115 +-----------------------------
 framework/Prefs/package.xml         |  14 ----
 framework/Share/package.xml         |  10 ---
 framework/VFS_ISOWriter/package.xml |  15 ----
 7 files changed, 1 insertion(+), 304 deletions(-)

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index f36ab07a5..5b41ed2b7 100644
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -517,10 +517,6 @@ Application Framework.</description>
       <file name="AllTests.php" role="test" />
       <file name="Autoload.php" role="test" />
       <file name="phpunit.xml" role="test" />
-      <file name="url.diff" role="test" />
-      <file name="url.exp" role="test" />
-      <file name="url.log" role="test" />
-      <file name="url.out" role="test" />
       <file name="url.phpt" role="test" />
      </dir> <!-- /test/Horde/Core -->
     </dir> <!-- /test/Horde -->
@@ -859,10 +855,6 @@ Application Framework.</description>
    <install as="Horde/Core/AllTests.php" name="test/Horde/Core/AllTests.php" />
    <install as="Horde/Core/Autoload.php" name="test/Horde/Core/Autoload.php" />
    <install as="Horde/Core/phpunit.xml" name="test/Horde/Core/phpunit.xml" />
-   <install as="Horde/Core/url.diff" name="test/Horde/Core/url.diff" />
-   <install as="Horde/Core/url.exp" name="test/Horde/Core/url.exp" />
-   <install as="Horde/Core/url.log" name="test/Horde/Core/url.log" />
-   <install as="Horde/Core/url.out" name="test/Horde/Core/url.out" />
    <install as="Horde/Core/url.phpt" name="test/Horde/Core/url.phpt" />
    <install as="Horde/Core/Factory/KolabServerTest.php" name="test/Horde/Core/Factory/KolabServerTest.php" />
    <install as="Horde/Core/Factory/KolabSessionTest.php" name="test/Horde/Core/Factory/KolabSessionTest.php" />
diff --git a/framework/Crypt/package.xml b/framework/Crypt/package.xml
index cc2e4881d..7956955d5 100644
--- a/framework/Crypt/package.xml
+++ b/framework/Crypt/package.xml
@@ -317,92 +317,24 @@
        <file name="pgp_signed2.txt" role="test" />
        <file name="smime_subjectAltName.pem" role="test" />
       </dir> <!-- /test/Horde/Crypt/fixtures -->
-      <file name="bug_6601.diff" role="test" />
-      <file name="bug_6601.exp" role="test" />
-      <file name="bug_6601.log" role="test" />
-      <file name="bug_6601.out" role="test" />
       <file name="bug_6601.phpt" role="test" />
       <file name="pgp.inc" role="test" />
-      <file name="pgp_decrypt.diff" role="test" />
-      <file name="pgp_decrypt.exp" role="test" />
-      <file name="pgp_decrypt.log" role="test" />
-      <file name="pgp_decrypt.out" role="test" />
       <file name="pgp_decrypt.phpt" role="test" />
-      <file name="pgp_decrypt_symmetric.diff" role="test" />
-      <file name="pgp_decrypt_symmetric.exp" role="test" />
-      <file name="pgp_decrypt_symmetric.log" role="test" />
-      <file name="pgp_decrypt_symmetric.out" role="test" />
       <file name="pgp_decrypt_symmetric.phpt" role="test" />
-      <file name="pgp_encrypt.diff" role="test" />
-      <file name="pgp_encrypt.exp" role="test" />
-      <file name="pgp_encrypt.log" role="test" />
-      <file name="pgp_encrypt.out" role="test" />
       <file name="pgp_encrypt.phpt" role="test" />
-      <file name="pgp_encryptedSymmetrically.diff" role="test" />
-      <file name="pgp_encryptedSymmetrically.exp" role="test" />
-      <file name="pgp_encryptedSymmetrically.log" role="test" />
-      <file name="pgp_encryptedSymmetrically.out" role="test" />
       <file name="pgp_encryptedSymmetrically.phpt" role="test" />
-      <file name="pgp_encrypt_symmetric.diff" role="test" />
-      <file name="pgp_encrypt_symmetric.exp" role="test" />
-      <file name="pgp_encrypt_symmetric.log" role="test" />
-      <file name="pgp_encrypt_symmetric.out" role="test" />
       <file name="pgp_encrypt_symmetric.phpt" role="test" />
-      <file name="pgp_generateRevocation.diff" role="test" />
-      <file name="pgp_generateRevocation.exp" role="test" />
-      <file name="pgp_generateRevocation.log" role="test" />
-      <file name="pgp_generateRevocation.out" role="test" />
       <file name="pgp_generateRevocation.phpt" role="test" />
-      <file name="pgp_getSignersKeyID.diff" role="test" />
-      <file name="pgp_getSignersKeyID.exp" role="test" />
-      <file name="pgp_getSignersKeyID.log" role="test" />
-      <file name="pgp_getSignersKeyID.out" role="test" />
       <file name="pgp_getSignersKeyID.phpt" role="test" />
-      <file name="pgp_parsePGPData.diff" role="test" />
-      <file name="pgp_parsePGPData.exp" role="test" />
-      <file name="pgp_parsePGPData.log" role="test" />
-      <file name="pgp_parsePGPData.out" role="test" />
       <file name="pgp_parsePGPData.phpt" role="test" />
-      <file name="pgp_pgpPacketInformation.diff" role="test" />
-      <file name="pgp_pgpPacketInformation.exp" role="test" />
-      <file name="pgp_pgpPacketInformation.log" role="test" />
-      <file name="pgp_pgpPacketInformation.out" role="test" />
       <file name="pgp_pgpPacketInformation.phpt" role="test" />
-      <file name="pgp_pgpPacketSignature.diff" role="test" />
-      <file name="pgp_pgpPacketSignature.exp" role="test" />
-      <file name="pgp_pgpPacketSignature.log" role="test" />
-      <file name="pgp_pgpPacketSignature.out" role="test" />
       <file name="pgp_pgpPacketSignature.phpt" role="test" />
-      <file name="pgp_pgpPacketSignatureByUidIndex.diff" role="test" />
-      <file name="pgp_pgpPacketSignatureByUidIndex.exp" role="test" />
-      <file name="pgp_pgpPacketSignatureByUidIndex.log" role="test" />
-      <file name="pgp_pgpPacketSignatureByUidIndex.out" role="test" />
       <file name="pgp_pgpPacketSignatureByUidIndex.phpt" role="test" />
-      <file name="pgp_pgpPrettyKey.diff" role="test" />
-      <file name="pgp_pgpPrettyKey.exp" role="test" />
-      <file name="pgp_pgpPrettyKey.log" role="test" />
-      <file name="pgp_pgpPrettyKey.out" role="test" />
       <file name="pgp_pgpPrettyKey.phpt" role="test" />
-      <file name="pgp_publicKeyMIMEPart.diff" role="test" />
-      <file name="pgp_publicKeyMIMEPart.exp" role="test" />
-      <file name="pgp_publicKeyMIMEPart.log" role="test" />
-      <file name="pgp_publicKeyMIMEPart.out" role="test" />
       <file name="pgp_publicKeyMIMEPart.phpt" role="test" />
-      <file name="pgp_sign.diff" role="test" />
-      <file name="pgp_sign.exp" role="test" />
-      <file name="pgp_sign.log" role="test" />
-      <file name="pgp_sign.out" role="test" />
       <file name="pgp_sign.phpt" role="test" />
       <file name="pgp_skipif.inc" role="test" />
-      <file name="pgp_verify.diff" role="test" />
-      <file name="pgp_verify.exp" role="test" />
-      <file name="pgp_verify.log" role="test" />
-      <file name="pgp_verify.out" role="test" />
       <file name="pgp_verify.phpt" role="test" />
-      <file name="pgp_verifyPassphrase.diff" role="test" />
-      <file name="pgp_verifyPassphrase.exp" role="test" />
-      <file name="pgp_verifyPassphrase.log" role="test" />
-      <file name="pgp_verifyPassphrase.out" role="test" />
       <file name="pgp_verifyPassphrase.phpt" role="test" />
       <file name="smime.inc" role="test" />
       <file name="smime_skipif.inc" role="test" />
@@ -532,92 +464,24 @@
    <install as="locale/zh_CN/LC_MESSAGES/Horde_Crypt.po" name="locale/zh_CN/LC_MESSAGES/Horde_Crypt.po" />
    <install as="locale/zh_TW/LC_MESSAGES/Horde_Crypt.mo" name="locale/zh_TW/LC_MESSAGES/Horde_Crypt.mo" />
    <install as="locale/zh_TW/LC_MESSAGES/Horde_Crypt.po" name="locale/zh_TW/LC_MESSAGES/Horde_Crypt.po" />
-   <install as="Horde/Crypt/bug_6601.diff" name="test/Horde/Crypt/bug_6601.diff" />
-   <install as="Horde/Crypt/bug_6601.exp" name="test/Horde/Crypt/bug_6601.exp" />
-   <install as="Horde/Crypt/bug_6601.log" name="test/Horde/Crypt/bug_6601.log" />
-   <install as="Horde/Crypt/bug_6601.out" name="test/Horde/Crypt/bug_6601.out" />
    <install as="Horde/Crypt/bug_6601.phpt" name="test/Horde/Crypt/bug_6601.phpt" />
    <install as="Horde/Crypt/pgp.inc" name="test/Horde/Crypt/pgp.inc" />
-   <install as="Horde/Crypt/pgp_decrypt.diff" name="test/Horde/Crypt/pgp_decrypt.diff" />
-   <install as="Horde/Crypt/pgp_decrypt.exp" name="test/Horde/Crypt/pgp_decrypt.exp" />
-   <install as="Horde/Crypt/pgp_decrypt.log" name="test/Horde/Crypt/pgp_decrypt.log" />
-   <install as="Horde/Crypt/pgp_decrypt.out" name="test/Horde/Crypt/pgp_decrypt.out" />
    <install as="Horde/Crypt/pgp_decrypt.phpt" name="test/Horde/Crypt/pgp_decrypt.phpt" />
-   <install as="Horde/Crypt/pgp_decrypt_symmetric.diff" name="test/Horde/Crypt/pgp_decrypt_symmetric.diff" />
-   <install as="Horde/Crypt/pgp_decrypt_symmetric.exp" name="test/Horde/Crypt/pgp_decrypt_symmetric.exp" />
-   <install as="Horde/Crypt/pgp_decrypt_symmetric.log" name="test/Horde/Crypt/pgp_decrypt_symmetric.log" />
-   <install as="Horde/Crypt/pgp_decrypt_symmetric.out" name="test/Horde/Crypt/pgp_decrypt_symmetric.out" />
    <install as="Horde/Crypt/pgp_decrypt_symmetric.phpt" name="test/Horde/Crypt/pgp_decrypt_symmetric.phpt" />
-   <install as="Horde/Crypt/pgp_encrypt.diff" name="test/Horde/Crypt/pgp_encrypt.diff" />
-   <install as="Horde/Crypt/pgp_encrypt.exp" name="test/Horde/Crypt/pgp_encrypt.exp" />
-   <install as="Horde/Crypt/pgp_encrypt.log" name="test/Horde/Crypt/pgp_encrypt.log" />
-   <install as="Horde/Crypt/pgp_encrypt.out" name="test/Horde/Crypt/pgp_encrypt.out" />
    <install as="Horde/Crypt/pgp_encrypt.phpt" name="test/Horde/Crypt/pgp_encrypt.phpt" />
-   <install as="Horde/Crypt/pgp_encryptedSymmetrically.diff" name="test/Horde/Crypt/pgp_encryptedSymmetrically.diff" />
-   <install as="Horde/Crypt/pgp_encryptedSymmetrically.exp" name="test/Horde/Crypt/pgp_encryptedSymmetrically.exp" />
-   <install as="Horde/Crypt/pgp_encryptedSymmetrically.log" name="test/Horde/Crypt/pgp_encryptedSymmetrically.log" />
-   <install as="Horde/Crypt/pgp_encryptedSymmetrically.out" name="test/Horde/Crypt/pgp_encryptedSymmetrically.out" />
    <install as="Horde/Crypt/pgp_encryptedSymmetrically.phpt" name="test/Horde/Crypt/pgp_encryptedSymmetrically.phpt" />
-   <install as="Horde/Crypt/pgp_encrypt_symmetric.diff" name="test/Horde/Crypt/pgp_encrypt_symmetric.diff" />
-   <install as="Horde/Crypt/pgp_encrypt_symmetric.exp" name="test/Horde/Crypt/pgp_encrypt_symmetric.exp" />
-   <install as="Horde/Crypt/pgp_encrypt_symmetric.log" name="test/Horde/Crypt/pgp_encrypt_symmetric.log" />
-   <install as="Horde/Crypt/pgp_encrypt_symmetric.out" name="test/Horde/Crypt/pgp_encrypt_symmetric.out" />
    <install as="Horde/Crypt/pgp_encrypt_symmetric.phpt" name="test/Horde/Crypt/pgp_encrypt_symmetric.phpt" />
-   <install as="Horde/Crypt/pgp_generateRevocation.diff" name="test/Horde/Crypt/pgp_generateRevocation.diff" />
-   <install as="Horde/Crypt/pgp_generateRevocation.exp" name="test/Horde/Crypt/pgp_generateRevocation.exp" />
-   <install as="Horde/Crypt/pgp_generateRevocation.log" name="test/Horde/Crypt/pgp_generateRevocation.log" />
-   <install as="Horde/Crypt/pgp_generateRevocation.out" name="test/Horde/Crypt/pgp_generateRevocation.out" />
    <install as="Horde/Crypt/pgp_generateRevocation.phpt" name="test/Horde/Crypt/pgp_generateRevocation.phpt" />
-   <install as="Horde/Crypt/pgp_getSignersKeyID.diff" name="test/Horde/Crypt/pgp_getSignersKeyID.diff" />
-   <install as="Horde/Crypt/pgp_getSignersKeyID.exp" name="test/Horde/Crypt/pgp_getSignersKeyID.exp" />
-   <install as="Horde/Crypt/pgp_getSignersKeyID.log" name="test/Horde/Crypt/pgp_getSignersKeyID.log" />
-   <install as="Horde/Crypt/pgp_getSignersKeyID.out" name="test/Horde/Crypt/pgp_getSignersKeyID.out" />
    <install as="Horde/Crypt/pgp_getSignersKeyID.phpt" name="test/Horde/Crypt/pgp_getSignersKeyID.phpt" />
-   <install as="Horde/Crypt/pgp_parsePGPData.diff" name="test/Horde/Crypt/pgp_parsePGPData.diff" />
-   <install as="Horde/Crypt/pgp_parsePGPData.exp" name="test/Horde/Crypt/pgp_parsePGPData.exp" />
-   <install as="Horde/Crypt/pgp_parsePGPData.log" name="test/Horde/Crypt/pgp_parsePGPData.log" />
-   <install as="Horde/Crypt/pgp_parsePGPData.out" name="test/Horde/Crypt/pgp_parsePGPData.out" />
    <install as="Horde/Crypt/pgp_parsePGPData.phpt" name="test/Horde/Crypt/pgp_parsePGPData.phpt" />
-   <install as="Horde/Crypt/pgp_pgpPacketInformation.diff" name="test/Horde/Crypt/pgp_pgpPacketInformation.diff" />
-   <install as="Horde/Crypt/pgp_pgpPacketInformation.exp" name="test/Horde/Crypt/pgp_pgpPacketInformation.exp" />
-   <install as="Horde/Crypt/pgp_pgpPacketInformation.log" name="test/Horde/Crypt/pgp_pgpPacketInformation.log" />
-   <install as="Horde/Crypt/pgp_pgpPacketInformation.out" name="test/Horde/Crypt/pgp_pgpPacketInformation.out" />
    <install as="Horde/Crypt/pgp_pgpPacketInformation.phpt" name="test/Horde/Crypt/pgp_pgpPacketInformation.phpt" />
-   <install as="Horde/Crypt/pgp_pgpPacketSignature.diff" name="test/Horde/Crypt/pgp_pgpPacketSignature.diff" />
-   <install as="Horde/Crypt/pgp_pgpPacketSignature.exp" name="test/Horde/Crypt/pgp_pgpPacketSignature.exp" />
-   <install as="Horde/Crypt/pgp_pgpPacketSignature.log" name="test/Horde/Crypt/pgp_pgpPacketSignature.log" />
-   <install as="Horde/Crypt/pgp_pgpPacketSignature.out" name="test/Horde/Crypt/pgp_pgpPacketSignature.out" />
    <install as="Horde/Crypt/pgp_pgpPacketSignature.phpt" name="test/Horde/Crypt/pgp_pgpPacketSignature.phpt" />
-   <install as="Horde/Crypt/pgp_pgpPacketSignatureByUidIndex.diff" name="test/Horde/Crypt/pgp_pgpPacketSignatureByUidIndex.diff" />
-   <install as="Horde/Crypt/pgp_pgpPacketSignatureByUidIndex.exp" name="test/Horde/Crypt/pgp_pgpPacketSignatureByUidIndex.exp" />
-   <install as="Horde/Crypt/pgp_pgpPacketSignatureByUidIndex.log" name="test/Horde/Crypt/pgp_pgpPacketSignatureByUidIndex.log" />
-   <install as="Horde/Crypt/pgp_pgpPacketSignatureByUidIndex.out" name="test/Horde/Crypt/pgp_pgpPacketSignatureByUidIndex.out" />
    <install as="Horde/Crypt/pgp_pgpPacketSignatureByUidIndex.phpt" name="test/Horde/Crypt/pgp_pgpPacketSignatureByUidIndex.phpt" />
-   <install as="Horde/Crypt/pgp_pgpPrettyKey.diff" name="test/Horde/Crypt/pgp_pgpPrettyKey.diff" />
-   <install as="Horde/Crypt/pgp_pgpPrettyKey.exp" name="test/Horde/Crypt/pgp_pgpPrettyKey.exp" />
-   <install as="Horde/Crypt/pgp_pgpPrettyKey.log" name="test/Horde/Crypt/pgp_pgpPrettyKey.log" />
-   <install as="Horde/Crypt/pgp_pgpPrettyKey.out" name="test/Horde/Crypt/pgp_pgpPrettyKey.out" />
    <install as="Horde/Crypt/pgp_pgpPrettyKey.phpt" name="test/Horde/Crypt/pgp_pgpPrettyKey.phpt" />
-   <install as="Horde/Crypt/pgp_publicKeyMIMEPart.diff" name="test/Horde/Crypt/pgp_publicKeyMIMEPart.diff" />
-   <install as="Horde/Crypt/pgp_publicKeyMIMEPart.exp" name="test/Horde/Crypt/pgp_publicKeyMIMEPart.exp" />
-   <install as="Horde/Crypt/pgp_publicKeyMIMEPart.log" name="test/Horde/Crypt/pgp_publicKeyMIMEPart.log" />
-   <install as="Horde/Crypt/pgp_publicKeyMIMEPart.out" name="test/Horde/Crypt/pgp_publicKeyMIMEPart.out" />
    <install as="Horde/Crypt/pgp_publicKeyMIMEPart.phpt" name="test/Horde/Crypt/pgp_publicKeyMIMEPart.phpt" />
-   <install as="Horde/Crypt/pgp_sign.diff" name="test/Horde/Crypt/pgp_sign.diff" />
-   <install as="Horde/Crypt/pgp_sign.exp" name="test/Horde/Crypt/pgp_sign.exp" />
-   <install as="Horde/Crypt/pgp_sign.log" name="test/Horde/Crypt/pgp_sign.log" />
-   <install as="Horde/Crypt/pgp_sign.out" name="test/Horde/Crypt/pgp_sign.out" />
    <install as="Horde/Crypt/pgp_sign.phpt" name="test/Horde/Crypt/pgp_sign.phpt" />
    <install as="Horde/Crypt/pgp_skipif.inc" name="test/Horde/Crypt/pgp_skipif.inc" />
-   <install as="Horde/Crypt/pgp_verify.diff" name="test/Horde/Crypt/pgp_verify.diff" />
-   <install as="Horde/Crypt/pgp_verify.exp" name="test/Horde/Crypt/pgp_verify.exp" />
-   <install as="Horde/Crypt/pgp_verify.log" name="test/Horde/Crypt/pgp_verify.log" />
-   <install as="Horde/Crypt/pgp_verify.out" name="test/Horde/Crypt/pgp_verify.out" />
    <install as="Horde/Crypt/pgp_verify.phpt" name="test/Horde/Crypt/pgp_verify.phpt" />
-   <install as="Horde/Crypt/pgp_verifyPassphrase.diff" name="test/Horde/Crypt/pgp_verifyPassphrase.diff" />
-   <install as="Horde/Crypt/pgp_verifyPassphrase.exp" name="test/Horde/Crypt/pgp_verifyPassphrase.exp" />
-   <install as="Horde/Crypt/pgp_verifyPassphrase.log" name="test/Horde/Crypt/pgp_verifyPassphrase.log" />
-   <install as="Horde/Crypt/pgp_verifyPassphrase.out" name="test/Horde/Crypt/pgp_verifyPassphrase.out" />
    <install as="Horde/Crypt/pgp_verifyPassphrase.phpt" name="test/Horde/Crypt/pgp_verifyPassphrase.phpt" />
    <install as="Horde/Crypt/smime.inc" name="test/Horde/Crypt/smime.inc" />
    <install as="Horde/Crypt/smime_skipif.inc" name="test/Horde/Crypt/smime_skipif.inc" />
diff --git a/framework/Data/package.xml b/framework/Data/package.xml
index 93b7100be..218bb5533 100644
--- a/framework/Data/package.xml
+++ b/framework/Data/package.xml
@@ -341,13 +341,6 @@
      </dir> <!-- /test/Horde/Data -->
     </dir> <!-- /test/Horde -->
    </dir> <!-- /test -->
-   <dir name="tests">
-    <file name="csv_importFile_01.diff" role="data" />
-    <file name="csv_importFile_01.exp" role="data" />
-    <file name="csv_importFile_01.log" role="data" />
-    <file name="csv_importFile_01.out" role="data" />
-    <file name="csv_importFile_01.php" role="php" />
-   </dir> <!-- /tests -->
   </dir> <!-- / -->
  </contents>
  <dependencies>
diff --git a/framework/File_Csv/package.xml b/framework/File_Csv/package.xml
index 622764097..b701b553e 100644
--- a/framework/File_Csv/package.xml
+++ b/framework/File_Csv/package.xml
@@ -305,82 +305,30 @@ is a fork of the File_CSV class of PEAR&apos;s File package.</description>
     <dir name="Horde">
      <dir name="Csv">
       <file name="001.csv" role="test" />
-      <file name="001.diff" role="test" />
-      <file name="001.exp" role="test" />
-      <file name="001.log" role="test" />
-      <file name="001.out" role="test" />
       <file name="001.phpt" role="test" />
       <file name="002.csv" role="test" />
-      <file name="002.diff" role="test" />
-      <file name="002.exp" role="test" />
-      <file name="002.log" role="test" />
-      <file name="002.out" role="test" />
       <file name="002.phpt" role="test" />
       <file name="003.csv" role="test" />
-      <file name="003.diff" role="test" />
-      <file name="003.exp" role="test" />
-      <file name="003.log" role="test" />
-      <file name="003.out" role="test" />
       <file name="003.phpt" role="test" />
       <file name="004.csv" role="test" />
-      <file name="004.diff" role="test" />
-      <file name="004.exp" role="test" />
-      <file name="004.log" role="test" />
-      <file name="004.out" role="test" />
       <file name="004.phpt" role="test" />
       <file name="005.csv" role="test" />
-      <file name="005.diff" role="test" />
-      <file name="005.exp" role="test" />
-      <file name="005.log" role="test" />
-      <file name="005.out" role="test" />
       <file name="005.phpt" role="test" />
       <file name="bug_3839.csv" role="test" />
-      <file name="bug_3839.diff" role="test" />
-      <file name="bug_3839.exp" role="test" />
-      <file name="bug_3839.log" role="test" />
-      <file name="bug_3839.out" role="test" />
       <file name="bug_3839.phpt" role="test" />
       <file name="bug_4025.csv" role="test" />
-      <file name="bug_4025.diff" role="test" />
-      <file name="bug_4025.exp" role="test" />
-      <file name="bug_4025.log" role="test" />
-      <file name="bug_4025.out" role="test" />
       <file name="bug_4025.phpt" role="test" />
       <file name="bug_6311.csv" role="test" />
-      <file name="bug_6311.diff" role="test" />
-      <file name="bug_6311.exp" role="test" />
-      <file name="bug_6311.log" role="test" />
-      <file name="bug_6311.out" role="test" />
       <file name="bug_6311.phpt" role="test" />
       <file name="bug_6370.csv" role="test" />
-      <file name="bug_6370.diff" role="test" />
-      <file name="bug_6370.exp" role="test" />
-      <file name="bug_6370.log" role="test" />
-      <file name="bug_6370.out" role="test" />
       <file name="bug_6370.phpt" role="test" />
       <file name="bug_6372.csv" role="test" />
-      <file name="bug_6372.diff" role="test" />
-      <file name="bug_6372.exp" role="test" />
-      <file name="bug_6372.log" role="test" />
-      <file name="bug_6372.out" role="test" />
       <file name="bug_6372.phpt" role="test" />
-      <file name="columns.diff" role="test" />
-      <file name="columns.exp" role="test" />
-      <file name="columns.log" role="test" />
-      <file name="columns.out" role="test" />
       <file name="columns.phpt" role="test" />
       <file name="columns1.csv" role="test" />
       <file name="columns2.csv" role="test" />
       <file name="common.php" role="test" />
-      <file name="linebreak.diff" role="test" />
-      <file name="linebreak.exp" role="test" />
-      <file name="linebreak.log" role="test" />
-      <file name="linebreak.out" role="test" />
       <file name="linebreak.phpt" role="test" />
-      <file name="multiline.diff" role="test" />
-      <file name="multiline.exp" role="test" />
-      <file name="multiline.log" role="test" />
-      <file name="multiline.out" role="test" />
       <file name="multiline.phpt" role="test" />
       <file name="multiline1.csv" role="test" />
       <file name="notrailing_crlf.csv" role="test" />
@@ -390,10 +338,6 @@ is a fork of the File_CSV class of PEAR&apos;s File package.</description>
       <file name="quote3.csv" role="test" />
       <file name="quote4.csv" role="test" />
       <file name="quote5.csv" role="test" />
-      <file name="quotes.diff" role="test" />
-      <file name="quotes.exp" role="test" />
-      <file name="quotes.log" role="test" />
-      <file name="quotes.out" role="test" />
       <file name="quotes.phpt" role="test" />
       <file name="simple_cr.csv" role="test" />
       <file name="simple_crlf.csv" role="test" />
@@ -517,83 +461,30 @@ is a fork of the File_CSV class of PEAR&apos;s File package.</description>
    <install as="locale/zh_TW/LC_MESSAGES/Horde_File_Csv.mo" name="locale/zh_TW/LC_MESSAGES/Horde_File_Csv.mo" />
    <install as="locale/zh_TW/LC_MESSAGES/Horde_File_Csv.po" name="locale/zh_TW/LC_MESSAGES/Horde_File_Csv.po" />
    <install as="Horde/Csv/001.csv" name="test/Horde/Csv/001.csv" />
-   <install as="Horde/Csv/001.diff" name="test/Horde/Csv/001.diff" />
-   <install as="Horde/Csv/001.exp" name="test/Horde/Csv/001.exp" />
-   <install as="Horde/Csv/001.log" name="test/Horde/Csv/001.log" />
-   <install as="Horde/Csv/001.out" name="test/Horde/Csv/001.out" />
    <install as="Horde/Csv/001.phpt" name="test/Horde/Csv/001.phpt" />
    <install as="Horde/Csv/002.csv" name="test/Horde/Csv/002.csv" />
-   <install as="Horde/Csv/002.diff" name="test/Horde/Csv/002.diff" />
-   <install as="Horde/Csv/002.exp" name="test/Horde/Csv/002.exp" />
-   <install as="Horde/Csv/002.log" name="test/Horde/Csv/002.log" />
-   <install as="Horde/Csv/002.out" name="test/Horde/Csv/002.out" />
    <install as="Horde/Csv/002.phpt" name="test/Horde/Csv/002.phpt" />
    <install as="Horde/Csv/003.csv" name="test/Horde/Csv/003.csv" />
-   <install as="Horde/Csv/003.diff" name="test/Horde/Csv/003.diff" />
-   <install as="Horde/Csv/003.exp" name="test/Horde/Csv/003.exp" />
-   <install as="Horde/Csv/003.log" name="test/Horde/Csv/003.log" />
-   <install as="Horde/Csv/003.out" name="test/Horde/Csv/003.out" />
    <install as="Horde/Csv/003.phpt" name="test/Horde/Csv/003.phpt" />
    <install as="Horde/Csv/004.csv" name="test/Horde/Csv/004.csv" />
-   <install as="Horde/Csv/004.diff" name="test/Horde/Csv/004.diff" />
-   <install as="Horde/Csv/004.exp" name="test/Horde/Csv/004.exp" />
-   <install as="Horde/Csv/004.log" name="test/Horde/Csv/004.log" />
-   <install as="Horde/Csv/004.out" name="test/Horde/Csv/004.out" />
    <install as="Horde/Csv/004.phpt" name="test/Horde/Csv/004.phpt" />
    <install as="Horde/Csv/005.csv" name="test/Horde/Csv/005.csv" />
-   <install as="Horde/Csv/005.diff" name="test/Horde/Csv/005.diff" />
-   <install as="Horde/Csv/005.exp" name="test/Horde/Csv/005.exp" />
-   <install as="Horde/Csv/005.log" name="test/Horde/Csv/005.log" />
-   <install as="Horde/Csv/005.out" name="test/Horde/Csv/005.out" />
    <install as="Horde/Csv/005.phpt" name="test/Horde/Csv/005.phpt" />
    <install as="Horde/Csv/bug_3839.csv" name="test/Horde/Csv/bug_3839.csv" />
-   <install as="Horde/Csv/bug_3839.diff" name="test/Horde/Csv/bug_3839.diff" />
-   <install as="Horde/Csv/bug_3839.exp" name="test/Horde/Csv/bug_3839.exp" />
-   <install as="Horde/Csv/bug_3839.log" name="test/Horde/Csv/bug_3839.log" />
-   <install as="Horde/Csv/bug_3839.out" name="test/Horde/Csv/bug_3839.out" />
    <install as="Horde/Csv/bug_3839.phpt" name="test/Horde/Csv/bug_3839.phpt" />
    <install as="Horde/Csv/bug_4025.csv" name="test/Horde/Csv/bug_4025.csv" />
-   <install as="Horde/Csv/bug_4025.diff" name="test/Horde/Csv/bug_4025.diff" />
-   <install as="Horde/Csv/bug_4025.exp" name="test/Horde/Csv/bug_4025.exp" />
-   <install as="Horde/Csv/bug_4025.log" name="test/Horde/Csv/bug_4025.log" />
-   <install as="Horde/Csv/bug_4025.out" name="test/Horde/Csv/bug_4025.out" />
    <install as="Horde/Csv/bug_4025.phpt" name="test/Horde/Csv/bug_4025.phpt" />
    <install as="Horde/Csv/bug_6311.csv" name="test/Horde/Csv/bug_6311.csv" />
-   <install as="Horde/Csv/bug_6311.diff" name="test/Horde/Csv/bug_6311.diff" />
-   <install as="Horde/Csv/bug_6311.exp" name="test/Horde/Csv/bug_6311.exp" />
-   <install as="Horde/Csv/bug_6311.log" name="test/Horde/Csv/bug_6311.log" />
-   <install as="Horde/Csv/bug_6311.out" name="test/Horde/Csv/bug_6311.out" />
    <install as="Horde/Csv/bug_6311.phpt" name="test/Horde/Csv/bug_6311.phpt" />
    <install as="Horde/Csv/bug_6370.csv" name="test/Horde/Csv/bug_6370.csv" />
-   <install as="Horde/Csv/bug_6370.diff" name="test/Horde/Csv/bug_6370.diff" />
-   <install as="Horde/Csv/bug_6370.exp" name="test/Horde/Csv/bug_6370.exp" />
-   <install as="Horde/Csv/bug_6370.log" name="test/Horde/Csv/bug_6370.log" />
-   <install as="Horde/Csv/bug_6370.out" name="test/Horde/Csv/bug_6370.out" />
    <install as="Horde/Csv/bug_6370.phpt" name="test/Horde/Csv/bug_6370.phpt" />
    <install as="Horde/Csv/bug_6372.csv" name="test/Horde/Csv/bug_6372.csv" />
-   <install as="Horde/Csv/bug_6372.diff" name="test/Horde/Csv/bug_6372.diff" />
-   <install as="Horde/Csv/bug_6372.exp" name="test/Horde/Csv/bug_6372.exp" />
-   <install as="Horde/Csv/bug_6372.log" name="test/Horde/Csv/bug_6372.log" />
-   <install as="Horde/Csv/bug_6372.out" name="test/Horde/Csv/bug_6372.out" />
    <install as="Horde/Csv/bug_6372.phpt" name="test/Horde/Csv/bug_6372.phpt" />
-   <install as="Horde/Csv/columns.diff" name="test/Horde/Csv/columns.diff" />
-   <install as="Horde/Csv/columns.exp" name="test/Horde/Csv/columns.exp" />
-   <install as="Horde/Csv/columns.log" name="test/Horde/Csv/columns.log" />
-   <install as="Horde/Csv/columns.out" name="test/Horde/Csv/columns.out" />
    <install as="Horde/Csv/columns.phpt" name="test/Horde/Csv/columns.phpt" />
    <install as="Horde/Csv/columns1.csv" name="test/Horde/Csv/columns1.csv" />
    <install as="Horde/Csv/columns2.csv" name="test/Horde/Csv/columns2.csv" />
    <install as="Horde/Csv/common.php" name="test/Horde/Csv/common.php" />
-   <install as="Horde/Csv/linebreak.diff" name="test/Horde/Csv/linebreak.diff" />
-   <install as="Horde/Csv/linebreak.exp" name="test/Horde/Csv/linebreak.exp" />
-   <install as="Horde/Csv/linebreak.log" name="test/Horde/Csv/linebreak.log" />
-   <install as="Horde/Csv/linebreak.out" name="test/Horde/Csv/linebreak.out" />
-   <install as="Horde/Csv/linebreak.phpt" name="test/Horde/Csv/linebreak.phpt" />
-   <install as="Horde/Csv/multiline.diff" name="test/Horde/Csv/multiline.diff" />
-   <install as="Horde/Csv/multiline.exp" name="test/Horde/Csv/multiline.exp" />
-   <install as="Horde/Csv/multiline.log" name="test/Horde/Csv/multiline.log" />
-   <install as="Horde/Csv/multiline.out" name="test/Horde/Csv/multiline.out" />
-   <install as="Horde/Csv/multiline.phpt" name="test/Horde/Csv/multiline.phpt" />
+   <install as="Horde/Csv/linebreak.phpt" name="test/Horde/Csv/linebreak.phpt" /   <install as="Horde/Csv/multiline.phpt" name="test/Horde/Csv/multiline.phpt" />
    <install as="Horde/Csv/multiline1.csv" name="test/Horde/Csv/multiline1.csv" />
    <install as="Horde/Csv/notrailing_crlf.csv" name="test/Horde/Csv/notrailing_crlf.csv" />
    <install as="Horde/Csv/notrailing_lf.csv" name="test/Horde/Csv/notrailing_lf.csv" />
@@ -602,10 +493,6 @@ is a fork of the File_CSV class of PEAR&apos;s File package.</description>
    <install as="Horde/Csv/quote3.csv" name="test/Horde/Csv/quote3.csv" />
    <install as="Horde/Csv/quote4.csv" name="test/Horde/Csv/quote4.csv" />
    <install as="Horde/Csv/quote5.csv" name="test/Horde/Csv/quote5.csv" />
-   <install as="Horde/Csv/quotes.diff" name="test/Horde/Csv/quotes.diff" />
-   <install as="Horde/Csv/quotes.exp" name="test/Horde/Csv/quotes.exp" />
-   <install as="Horde/Csv/quotes.log" name="test/Horde/Csv/quotes.log" />
-   <install as="Horde/Csv/quotes.out" name="test/Horde/Csv/quotes.out" />
    <install as="Horde/Csv/quotes.phpt" name="test/Horde/Csv/quotes.phpt" />
    <install as="Horde/Csv/simple_cr.csv" name="test/Horde/Csv/simple_cr.csv" />
    <install as="Horde/Csv/simple_crlf.csv" name="test/Horde/Csv/simple_crlf.csv" />
diff --git a/framework/Prefs/package.xml b/framework/Prefs/package.xml
index 2c3977a79..b3c451c5e 100644
--- a/framework/Prefs/package.xml
+++ b/framework/Prefs/package.xml
@@ -316,16 +316,6 @@
     </dir> <!-- /locale/zh_TW -->
     <file name="Horde_Prefs.pot" role="data" />
    </dir> <!-- /locale -->
-   <dir name="test">
-    <dir name="Horde">
-     <dir name="Prefs">
-      <file name="bug_2838.diff" role="test" />
-      <file name="bug_2838.exp" role="test" />
-      <file name="bug_2838.log" role="test" />
-      <file name="bug_2838.out" role="test" />
-     </dir> <!-- /test/Horde/Prefs -->
-    </dir> <!-- /test/Horde -->
-   </dir> <!-- /test -->
   </dir> <!-- / -->
  </contents>
  <dependencies>
@@ -463,10 +453,6 @@
    <install as="locale/zh_CN/LC_MESSAGES/Horde_Prefs.po" name="locale/zh_CN/LC_MESSAGES/Horde_Prefs.po" />
    <install as="locale/zh_TW/LC_MESSAGES/Horde_Prefs.mo" name="locale/zh_TW/LC_MESSAGES/Horde_Prefs.mo" />
    <install as="locale/zh_TW/LC_MESSAGES/Horde_Prefs.po" name="locale/zh_TW/LC_MESSAGES/Horde_Prefs.po" />
-   <install as="Horde/Prefs/bug_2838.diff" name="test/Horde/Prefs/bug_2838.diff" />
-   <install as="Horde/Prefs/bug_2838.exp" name="test/Horde/Prefs/bug_2838.exp" />
-   <install as="Horde/Prefs/bug_2838.log" name="test/Horde/Prefs/bug_2838.log" />
-   <install as="Horde/Prefs/bug_2838.out" name="test/Horde/Prefs/bug_2838.out" />
   </filelist>
  </phprelease>
  <changelog>
diff --git a/framework/Share/package.xml b/framework/Share/package.xml
index b23dec579..d75f17368 100644
--- a/framework/Share/package.xml
+++ b/framework/Share/package.xml
@@ -324,17 +324,7 @@ resources a user owns or has access to.</description>
       <file name="KolabScenarioTest.php" role="php" />
      </dir> <!-- /tests/Horde/Share -->
     </dir> <!-- /tests/Horde -->
-    <file name="kolab_createdefault.diff" role="data" />
-    <file name="kolab_createdefault.exp" role="data" />
-    <file name="kolab_createdefault.log" role="data" />
-    <file name="kolab_createdefault.out" role="data" />
-    <file name="kolab_createdefault.php" role="php" />
     <file name="kolab_createdefault.phpt" role="data" />
-    <file name="kolab_list.diff" role="data" />
-    <file name="kolab_list.exp" role="data" />
-    <file name="kolab_list.log" role="data" />
-    <file name="kolab_list.out" role="data" />
-    <file name="kolab_list.php" role="php" />
     <file name="kolab_list.phpt" role="data" />
     <file name="kolab_simple.phpt" role="data" />
    </dir> <!-- /tests -->
diff --git a/framework/VFS_ISOWriter/package.xml b/framework/VFS_ISOWriter/package.xml
index 3fbdb43ba..925470ce8 100644
--- a/framework/VFS_ISOWriter/package.xml
+++ b/framework/VFS_ISOWriter/package.xml
@@ -305,23 +305,8 @@ Converted to package.xml 2.0 for pear.horde.org
     <file name="Horde_VFS_ISOWriter.pot" role="data" />
    </dir> <!-- /locale -->
    <dir name="tests">
-    <file name="inputstrategy.diff" role="data" />
-    <file name="inputstrategy.exp" role="data" />
-    <file name="inputstrategy.log" role="data" />
-    <file name="inputstrategy.out" role="data" />
-    <file name="inputstrategy.php" role="php" />
     <file name="inputstrategy.phpt" role="test" />
-    <file name="isowriter.diff" role="data" />
-    <file name="isowriter.exp" role="data" />
-    <file name="isowriter.log" role="data" />
-    <file name="isowriter.out" role="data" />
-    <file name="isowriter.php" role="php" />
     <file name="isowriter.phpt" role="test" />
-    <file name="outputstrategy.diff" role="data" />
-    <file name="outputstrategy.exp" role="data" />
-    <file name="outputstrategy.log" role="data" />
-    <file name="outputstrategy.out" role="data" />
-    <file name="outputstrategy.php" role="php" />
     <file name="outputstrategy.phpt" role="test" />
    </dir> <!-- /tests -->
    <file name="ISOWriter.php" role="php" />
-- 
2.11.0