Hi,

I've had a try enabling fckeditor in moinmoin 1.8. That was quite easy
actually. I've attached a temporary patch.

I haven't tested it that much yet, but it seems to work. Also, I haven't
tested unstable's fckeditor_1:2.6.4-1 either.
I have some concerns with the lack of control we have over the version
of the fckeditor package. What's your opinion about it?

Franklin

diff --git a/debian/README.Debian.in b/debian/README.Debian.in
index caa5e8c..d5ce46e 100644
--- a/debian/README.Debian.in
+++ b/debian/README.Debian.in
@@ -29,7 +29,8 @@ Example: A single wiki as CGI with Apache2
 	<VirtualHost *>
 		ServerName wiki.example.org
 		DocumentRoot /var/www/mywiki/
-		Alias /moin___STATICPATH__/ "/usr/share/moin/htdocs/"
+		Alias __STATICPATH__/applets/FCKeditor/ "/usr/share/fckeditor/"
+		Alias __STATICPATH__/ "/usr/share/moin/htdocs/"
 		ScriptAlias /MyWiki "/var/www/mywiki/moin.cgi"
 	</VirtualHost>
 
diff --git a/debian/control b/debian/control
index 4f7a484..5b07b30 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Homepage: http://moinmo.in/
 Package: python-moinmoin
 Architecture: all
 Section: python
-Depends: ${python:Depends}, ${misc:Depends}
+Depends: ${python:Depends}, ${misc:Depends}, fckeditor
 Provides: ${python:Provides}, moinmoin-common
 Replaces: python2.3-moinmoin (<< 1.5.3-1.1), python2.4-moinmoin (<< 1.5.3-1.1), moinmoin-common
 Conflicts: python2.3-moinmoin (<< 1.5.3-1.1), python2.4-moinmoin (<< 1.5.3-1.1), moinmoin-common
diff --git a/debian/rules b/debian/rules
index fcc973f..8171e7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ DEB_UPSTREAM_TARBALL_MD5 = b3ced56bbe09311a7c56049423214cdb
 
 pkg = python-moinmoin
 
-DEB_INSTALL_EXAMPLES_$(pkg) += wiki/htdocs/applets/FCKeditor wiki/htdocs/applets/moinFCK* wiki/htdocs/applets/moinfck*
+##DEB_INSTALL_EXAMPLES_$(pkg) += wiki/htdocs/applets/FCKeditor wiki/htdocs/applets/moinFCK* wiki/htdocs/applets/moinfck*
 libdir = /usr/share/python-support/$(cdbs_curpkg)
 pyversions = 2.3-
 DEB_PYTHON_PRIVATE_MODULES_DIRS_$(pkg_data) = /usr/share/moin/data/plugin /usr/share/moin/server
@@ -159,13 +159,12 @@ binary-fixup/$(pkg)::
 	rm -f debian/$(cdbs_curpkg)$(datadir)/htdocs/applets/TWikiDrawPlugin/twikidraw.jar
 	echo "This applet has not yet been packaged for Debian. for now it is available at http://debian.jones.dk/auryn/pool-all/official/moin/twikidraw/"; > debian/$(cdbs_curpkg)$(datadir)/htdocs/applets/TWikiDrawPlugin/README
 
-# Strip FCKeditor as we cannot take responsibility for it
-# (provided as example instead)
+# Strip FCKeditor, as it's provided by packages fckeditor
 binary-fixup/$(pkg)::
 	rm -rf debian/$(cdbs_curpkg)$(datadir)/htdocs/applets/FCKeditor/*
-	rm -rf debian/$(cdbs_curpkg)$(datadir)/htdocs/applets/moinFCKplugins
-	rm -f debian/$(cdbs_curpkg)$(datadir)/htdocs/applets/moinfck*
-	echo "This applet is provided only as example for Debian." > debian/$(cdbs_curpkg)$(datadir)/htdocs/applets/FCKeditor/README
+	##rm -rf debian/$(cdbs_curpkg)$(datadir)/htdocs/applets/moinFCKplugins
+	##rm -f debian/$(cdbs_curpkg)$(datadir)/htdocs/applets/moinfck*
+	echo "This applet is provided by Debian's fckeditor package." > debian/$(cdbs_curpkg)$(datadir)/htdocs/applets/FCKeditor/README
 	echo "More info at /usr/share/doc/$(cdbs_curpkg)/README.Debian(.gz)" >> debian/$(cdbs_curpkg)$(datadir)/htdocs/applets/FCKeditor/README
 
 ## Move documentation parts of FCKeditor below /usr/share/doc/.../FCKeditor/

Reply via email to