[pkg-horde] [SCM] Debian Horde Packages repository: horde3 package branch, debian-sid, updated. 925f45930416d6e62ca8fd622df3874bf98a973c

[Gregory Colpart]

The following commit has been merged in the debian-sid branch:
commit 83616c1d6ece19f3fe3713d6749f1a13d9d1406b
Author: Gregory Colpart <gcolpart at ioakim2.evolix.net>
Date:   Sun Sep 20 23:04:17 2009 +0200

    Correct patches manually. I must find a better solution to generate my patch :)

diff --git a/debian/patches/0006-Disable-all-Horde-components-by-default-to-avoid-bro.patch b/debian/patches/0006-Disable-all-Horde-components-by-default-to-avoid-bro.patch
index b3077f7..aa20f06 100644
--- a/debian/patches/0006-Disable-all-Horde-components-by-default-to-avoid-bro.patch
+++ b/debian/patches/0006-Disable-all-Horde-components-by-default-to-avoid-bro.patch
@@ -20,15 +20,15 @@ index 03ab90a..03bb6bf 100644
      'provides' => array('mail', 'contacts/favouriteRecipients')
  );
  
-@@ -83,7 +83,7 @@ $this->applications['ingo'] = array(
-     'fileroot' => dirname(__FILE__) . '/../ingo',
-     'webroot' => $this->applications['horde']['webroot'] . '/ingo',
-     'name' => _("Filters"),
--    'status' => 'active',
-+    'status' => 'inactive',
-     'provides' => array('mail/blacklistFrom', 'mail/showBlacklist', 'mail/whitelistFrom', 'mail/showWhitelist', 'mail/applyFilters', 'mail/canApplyFilters', 'mail/showFilters'),
-     'menu_parent' => 'imp'
- );
+#@@ -83,7 +83,7 @@ $this->applications['ingo'] = array(
+#     'fileroot' => dirname(__FILE__) . '/../ingo',
+#     'webroot' => $this->applications['horde']['webroot'] . '/ingo',
+#     'name' => _("Filters"),
+#-    'status' => 'active',
+#+    'status' => 'inactive',
+#     'provides' => array('mail/blacklistFrom', 'mail/showBlacklist', 'mail/whitelistFrom', 'mail/showWhitelist', 'mail/applyFilters', 'mail/canApplyFilters', 'mail/showFilters'),
+#     'menu_parent' => 'imp'
+# );
 @@ -92,7 +92,7 @@ $this->applications['sam'] = array(
      'fileroot' => dirname(__FILE__) . '/../sam',
      'webroot' => $this->applications['horde']['webroot'] . '/sam',
diff --git a/debian/patches/0007-manual-patches-disable-ingo-by-default.patch b/debian/patches/0007-manual-patches-disable-ingo-by-default.patch
new file mode 100644
index 0000000..111f859
--- /dev/null
+++ b/debian/patches/0007-manual-patches-disable-ingo-by-default.patch
@@ -0,0 +1,11 @@
+--- a/config/registry.php.dist
++++ b/config/registry.php.dist
+@@ -80,7 +83,7 @@ $this->applications['ingo'] = array(
+     'fileroot' => dirname(__FILE__) . '/../ingo',
+     'webroot' => $this->applications['horde']['webroot'] . '/ingo',
+     'name' => _("Filters"),
+-    'status' => 'active',
++    'status' => 'inactive',
+     'provides' => array('filter', 'mail/blacklistFrom', 'mail/showBlacklist', 'mail/whitelistFrom', 'mail/showWhitelist', 'mail/applyFilters', 'mail/canApplyFilters', 'mail/showFilters'),
+     'menu_parent' => 'imp'
+ );

-- 
Debian Horde Packages repository: horde3 package