From 14440e42d8640071d6c6955cfd7d6a9eaf63d77f Mon Sep 17 00:00:00 2001
From: Chuck Hagenbuch <chuck@horde.org>
Date: Thu, 9 Jul 2009 20:16:02 -0400
Subject: [PATCH] fix file paths; remove extra Horde/ directory

---
 framework/Core/lib/{Horde => }/Horde.php           |  0
 framework/Core/lib/Horde/{Horde => }/Config.php    |  0
 .../Core/lib/Horde/{Horde => }/ErrorHandler.php    |  0
 framework/Core/lib/Horde/{Horde => }/Exception.php |  0
 framework/Core/lib/Horde/{Horde => }/Help.php      |  0
 framework/Core/lib/Horde/{Horde => }/Menu.php      |  0
 framework/Core/lib/Horde/{Horde => }/Registry.php  |  0
 .../Core/lib/Horde/{Horde => }/Registry/Caller.php |  0
 framework/Core/lib/Horde/{Horde => }/Release.php   |  0
 .../Core/lib/Horde/{Horde => }/Release/Whups.php   |  0
 .../Core/lib/Horde/{Horde => }/Script/Files.php    |  0
 framework/Core/package.xml                         | 46 +++++++++++-----------
 .../Core/test/Horde/{Framework => Core}/url.phpt   |  0
 13 files changed, 22 insertions(+), 24 deletions(-)
 rename framework/Core/lib/{Horde => }/Horde.php (100%)
 rename framework/Core/lib/Horde/{Horde => }/Config.php (100%)
 rename framework/Core/lib/Horde/{Horde => }/ErrorHandler.php (100%)
 rename framework/Core/lib/Horde/{Horde => }/Exception.php (100%)
 rename framework/Core/lib/Horde/{Horde => }/Help.php (100%)
 rename framework/Core/lib/Horde/{Horde => }/Menu.php (100%)
 rename framework/Core/lib/Horde/{Horde => }/Registry.php (100%)
 rename framework/Core/lib/Horde/{Horde => }/Registry/Caller.php (100%)
 rename framework/Core/lib/Horde/{Horde => }/Release.php (100%)
 rename framework/Core/lib/Horde/{Horde => }/Release/Whups.php (100%)
 rename framework/Core/lib/Horde/{Horde => }/Script/Files.php (100%)
 rename framework/Core/test/Horde/{Framework => Core}/url.phpt (100%)

diff --git a/framework/Core/lib/Horde/Horde.php b/framework/Core/lib/Horde.php
similarity index 100%
rename from framework/Core/lib/Horde/Horde.php
rename to framework/Core/lib/Horde.php
diff --git a/framework/Core/lib/Horde/Horde/Config.php b/framework/Core/lib/Horde/Config.php
similarity index 100%
rename from framework/Core/lib/Horde/Horde/Config.php
rename to framework/Core/lib/Horde/Config.php
diff --git a/framework/Core/lib/Horde/Horde/ErrorHandler.php b/framework/Core/lib/Horde/ErrorHandler.php
similarity index 100%
rename from framework/Core/lib/Horde/Horde/ErrorHandler.php
rename to framework/Core/lib/Horde/ErrorHandler.php
diff --git a/framework/Core/lib/Horde/Horde/Exception.php b/framework/Core/lib/Horde/Exception.php
similarity index 100%
rename from framework/Core/lib/Horde/Horde/Exception.php
rename to framework/Core/lib/Horde/Exception.php
diff --git a/framework/Core/lib/Horde/Horde/Help.php b/framework/Core/lib/Horde/Help.php
similarity index 100%
rename from framework/Core/lib/Horde/Horde/Help.php
rename to framework/Core/lib/Horde/Help.php
diff --git a/framework/Core/lib/Horde/Horde/Menu.php b/framework/Core/lib/Horde/Menu.php
similarity index 100%
rename from framework/Core/lib/Horde/Horde/Menu.php
rename to framework/Core/lib/Horde/Menu.php
diff --git a/framework/Core/lib/Horde/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
similarity index 100%
rename from framework/Core/lib/Horde/Horde/Registry.php
rename to framework/Core/lib/Horde/Registry.php
diff --git a/framework/Core/lib/Horde/Horde/Registry/Caller.php b/framework/Core/lib/Horde/Registry/Caller.php
similarity index 100%
rename from framework/Core/lib/Horde/Horde/Registry/Caller.php
rename to framework/Core/lib/Horde/Registry/Caller.php
diff --git a/framework/Core/lib/Horde/Horde/Release.php b/framework/Core/lib/Horde/Release.php
similarity index 100%
rename from framework/Core/lib/Horde/Horde/Release.php
rename to framework/Core/lib/Horde/Release.php
diff --git a/framework/Core/lib/Horde/Horde/Release/Whups.php b/framework/Core/lib/Horde/Release/Whups.php
similarity index 100%
rename from framework/Core/lib/Horde/Horde/Release/Whups.php
rename to framework/Core/lib/Horde/Release/Whups.php
diff --git a/framework/Core/lib/Horde/Horde/Script/Files.php b/framework/Core/lib/Horde/Script/Files.php
similarity index 100%
rename from framework/Core/lib/Horde/Horde/Script/Files.php
rename to framework/Core/lib/Horde/Script/Files.php
diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 050a4f3b2..7f82604e4 100644
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -46,22 +46,20 @@ Application Framework.
   <dir name="/">
    <dir name="lib">
     <dir name="Horde">
-     <dir name="Horde">
-      <file name="Config.php" role="php" />
-      <file name="ErrorHandler.php" role="php" />
-      <file name="Exception.php" role="php" />
-      <file name="Help.php" role="php" />
-      <file name="Menu.php" role="php" />
-      <file name="Registry.php" role="php" />
-      <dir name="Registry">
-       <file name="Caller.php" role="php" />
-      </dir> <!-- /lib/Horde/Horde/Registry -->
-      <dir name="Script">
-       <file name="Files.php" role="php" />
-      </dir> <!-- /lib/Horde/Horde/Script -->
-     </dir> <!-- /lib/Horde/Horde -->
-     <file name="Horde.php" role="php" />
+     <file name="Config.php" role="php" />
+     <file name="ErrorHandler.php" role="php" />
+     <file name="Exception.php" role="php" />
+     <file name="Help.php" role="php" />
+     <file name="Menu.php" role="php" />
+     <file name="Registry.php" role="php" />
+     <dir name="Registry">
+      <file name="Caller.php" role="php" />
+     </dir> <!-- /lib/Horde/Registry -->
+     <dir name="Script">
+      <file name="Files.php" role="php" />
+     </dir> <!-- /lib/Horde/Script -->
     </dir> <!-- /lib/Horde -->
+    <file name="Horde.php" role="php" />
    </dir> <!-- /lib -->
    <dir name="test">
     <dir name="Horde">
@@ -114,15 +112,15 @@ Application Framework.
  </dependencies>
  <phprelease>
   <filelist>
-   <install name="lib/Horde/Horde/Config.php" as="Horde/Config.php" />
-   <install name="lib/Horde/Horde/ErrorHandler.php" as="Horde/ErrorHandler.php" />
-   <install name="lib/Horde/Horde/Exception.php" as="Horde/Exception.php" />
-   <install name="lib/Horde/Horde/Help.php" as="Horde/Help.php" />
-   <install name="lib/Horde/Horde/Menu.php" as="Horde/Menu.php" />
-   <install name="lib/Horde/Horde/Registry.php" as="Horde/Registry.php" />
-   <install name="lib/Horde/Horde/Registry/Caller.php" as="Horde/Registry/Caller.php" />
-   <install name="lib/Horde/Horde/Script/Files.php" as="Horde/Script/Files.php" />
-   <install name="lib/Horde/Horde.php" as="Horde.php" />
+   <install name="lib/Horde/Config.php" as="Horde/Config.php" />
+   <install name="lib/Horde/ErrorHandler.php" as="Horde/ErrorHandler.php" />
+   <install name="lib/Horde/Exception.php" as="Horde/Exception.php" />
+   <install name="lib/Horde/Help.php" as="Horde/Help.php" />
+   <install name="lib/Horde/Menu.php" as="Horde/Menu.php" />
+   <install name="lib/Horde/Registry.php" as="Horde/Registry.php" />
+   <install name="lib/Horde/Registry/Caller.php" as="Horde/Registry/Caller.php" />
+   <install name="lib/Horde/Script/Files.php" as="Horde/Script/Files.php" />
+   <install name="lib/Horde.php" as="Horde.php" />
   </filelist>
  </phprelease>
  <changelog>
diff --git a/framework/Core/test/Horde/Framework/url.phpt b/framework/Core/test/Horde/Core/url.phpt
similarity index 100%
rename from framework/Core/test/Horde/Framework/url.phpt
rename to framework/Core/test/Horde/Core/url.phpt
-- 
2.11.0