From a348a83b40a5653c565640fce45976a7c8d41cac Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Mon, 17 May 2010 14:05:03 +0200
Subject: [PATCH] Use singular "migration/". Install migration scripts using
 data role and full package path.

---
 .../1_rampage_base_tables.php                         |  0
 .../2_rampage_tag_tables.php                          |  0
 .../Horde/Alarm}/1_horde_alarms_table.php             |  0
 framework/Alarm/package.xml                           | 19 +++++++++++++------
 framework/Packaging/script/horde-pear-release.php     | 18 +++++++++++++-----
 horde/bin/db_migrate                                  |  2 +-
 6 files changed, 27 insertions(+), 12 deletions(-)
 rename content/{migrations => migration}/1_rampage_base_tables.php (100%)
 rename content/{migrations => migration}/2_rampage_tag_tables.php (100%)
 rename framework/Alarm/{migrations => migration/Horde/Alarm}/1_horde_alarms_table.php (100%)

diff --git a/content/migrations/1_rampage_base_tables.php b/content/migration/1_rampage_base_tables.php
similarity index 100%
rename from content/migrations/1_rampage_base_tables.php
rename to content/migration/1_rampage_base_tables.php
diff --git a/content/migrations/2_rampage_tag_tables.php b/content/migration/2_rampage_tag_tables.php
similarity index 100%
rename from content/migrations/2_rampage_tag_tables.php
rename to content/migration/2_rampage_tag_tables.php
diff --git a/framework/Alarm/migrations/1_horde_alarms_table.php b/framework/Alarm/migration/Horde/Alarm/1_horde_alarms_table.php
similarity index 100%
rename from framework/Alarm/migrations/1_horde_alarms_table.php
rename to framework/Alarm/migration/Horde/Alarm/1_horde_alarms_table.php
diff --git a/framework/Alarm/package.xml b/framework/Alarm/package.xml
index 24ddf73da..5daee1541 100644
--- a/framework/Alarm/package.xml
+++ b/framework/Alarm/package.xml
@@ -13,8 +13,8 @@
   <email>jan@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2010-05-07</date>
- <time>17:43:45</time>
+ <date>2010-05-17</date>
+ <time>13:58:59</time>
  <version>
   <release>0.2.0</release>
   <api>0.2.0</api>
@@ -33,6 +33,7 @@
     <dir name="Horde">
      <dir name="Alarm">
       <dir name="Handler">
+       <file name="Desktop.php" role="php" />
        <file name="Mail.php" role="php" />
        <file name="Notify.php" role="php" />
       </dir> <!-- /lib/Horde/Alarm/Handler -->
@@ -45,9 +46,13 @@
      <file name="Alarm.php" role="php" />
     </dir> <!-- /lib/Horde -->
    </dir> <!-- /lib -->
-   <dir name="migrations">
-    <file name="1_horde_alarms_table.php" role="php" />
-   </dir> <!-- /migrations -->
+   <dir name="migration">
+    <dir name="Horde">
+     <dir name="Alarm">
+      <file name="1_horde_alarms_table.php" role="data" />
+     </dir> <!-- /migration/Horde/Alarm -->
+    </dir> <!-- /migration/Horde -->
+   </dir> <!-- /migration -->
    <dir name="test">
     <dir name="Horde">
      <dir name="Alarm">
@@ -118,8 +123,10 @@
    <install as="Horde/Alarm/Null.php" name="lib/Horde/Alarm/Null.php" />
    <install as="Horde/Alarm/Object.php" name="lib/Horde/Alarm/Object.php" />
    <install as="Horde/Alarm/Sql.php" name="lib/Horde/Alarm/Sql.php" />
+   <install as="Horde/Alarm/Handler/Desktop.php" name="lib/Horde/Alarm/Handler/Desktop.php" />
    <install as="Horde/Alarm/Handler/Mail.php" name="lib/Horde/Alarm/Handler/Mail.php" />
    <install as="Horde/Alarm/Handler/Notify.php" name="lib/Horde/Alarm/Handler/Notify.php" />
+   <install as="Horde/Alarm/migration/1_horde_alarms_table.php" name="migration/Horde/Alarm/1_horde_alarms_table.php" />
    <install as="Horde/Alarm/AllTests.php" name="test/Horde/Alarm/AllTests.php" />
    <install as="Horde/Alarm/conf.php.dist" name="test/Horde/Alarm/conf.php.dist" />
    <install as="Horde/Alarm/HandlerTest.php" name="test/Horde/Alarm/HandlerTest.php" />
@@ -153,7 +160,7 @@
     <release>beta</release>
     <api>beta</api>
    </stability>
-   <date>2010-05-07</date>
+   <date>2010-05-17</date>
    <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
    <notes>
 * Initial Horde 4 package.
diff --git a/framework/Packaging/script/horde-pear-release.php b/framework/Packaging/script/horde-pear-release.php
index 02098b8c0..5187a6ef0 100755
--- a/framework/Packaging/script/horde-pear-release.php
+++ b/framework/Packaging/script/horde-pear-release.php
@@ -48,11 +48,12 @@ $package = PEAR_PackageFileManager2::importOptions(
         'include' => '*',
         'dir_roles' =>
         array(
-            'lib'     => 'php',
-            'doc'     => 'doc',
-            'example' => 'doc',
-            'script'  => 'script',
-            'test'    => 'test',
+            'lib'       => 'php',
+            'doc'       => 'doc',
+            'example'   => 'doc',
+            'script'    => 'script',
+            'test'      => 'test',
+            'migration' => 'data',
         ),
     )
 );
@@ -79,6 +80,13 @@ foreach ($files as $file) {
             $file['attribs']['name'], $components[1]
         );
         break;
+    case 'migration':
+        $components = explode('/', $components[1]);
+        array_splice($components, count($components) - 1, 0, 'migration');
+        $package->addInstallAs(
+            $file['attribs']['name'], implode('/', $components)
+        );
+        break;
     case 'script':
         $filename = basename($file['attribs']['name']);
         if (substr($filename, strlen($filename) - 4)) {
diff --git a/horde/bin/db_migrate b/horde/bin/db_migrate
index 1a3ff5346..8bb631b31 100755
--- a/horde/bin/db_migrate
+++ b/horde/bin/db_migrate
@@ -40,7 +40,7 @@ if (!empty($args[1])) {
 }
 
 // Run
-$dir = $GLOBALS['registry']->get('fileroot', $app) . '/migrations/';
+$dir = $GLOBALS['registry']->get('fileroot', $app) . '/migration/';
 $logger = new Horde_Log_Logger(new Horde_Log_Handler_Stream(STDOUT));
 $migrator = new Horde_Db_Migration_Migrator($db, $logger, array('migrationsPath' => $dir, 'schemaTableName' => $app . '_schema_info'));
 try {
-- 
2.11.0