From 5a7fe6b4a7bc31285a0ef39cf396218a36fa2f9b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 5 Jan 2014 01:17:38 +0100
Subject: [PATCH 1/2] Fix: Change to make debian package ok despite removal of
 ckeditor package.

---
 htdocs/admin/modules.php                   | 3 ++-
 htdocs/core/modules/modFckeditor.class.php | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 7411c315304..72147693bd3 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -154,7 +154,8 @@ foreach ($modulesdir as $dir)
     					$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod)));
     					if ($objMod->version == 'development'  && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 2))) $modulequalified=0;
     					if ($objMod->version == 'experimental' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 1))) $modulequalified=0;
-						//if ($mode == 'expdev' && ($objMod->version != 'experimental' && $objMod->version != 'development')) $modulequalified=0;
+						// We discard modules according to property disabled
+    					if (! empty($objMod->hidden)) $modulequalified=false;
 
     					// Define array $categ with categ with at least one qualified module
     					if ($modulequalified)
diff --git a/htdocs/core/modules/modFckeditor.class.php b/htdocs/core/modules/modFckeditor.class.php
index 10bd7414722..917d15a852c 100644
--- a/htdocs/core/modules/modFckeditor.class.php
+++ b/htdocs/core/modules/modFckeditor.class.php
@@ -62,6 +62,8 @@ class modFckeditor extends DolibarrModules
 		$this->config_page_url = array("fckeditor.php");
 
 		// Dependances
+		global $dolibarr_js_CKEDITOR;
+		$this->hidden = ($dolibarr_js_CKEDITOR == 'disabled'?1:0);	// A condition to disable module (used for native debian packages)
 		$this->depends = array();
 		$this->requiredby = array();
 

From 555a49d66ef8176e2053c5c5c0080a79857a5376 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 5 Jan 2014 01:20:27 +0100
Subject: [PATCH 2/2] Update doc

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 654a5287bfe..eb58f849be4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ English Dolibarr ChangeLog
 
 ***** ChangeLog for 3.3.5 compared to 3.3.4 *****
 
+- Fix: Change to make debian package ok despite removal of ckeditor.
 - Fix: jcrop file to match debian rules
 - Fix: Add missing country UK.
 - Fix: Minor fix into package.