Dear release team, Sorry to bother you again with dokuwiki. I have discovered a policy violation in my package, and opened the serious bug #592593: the package ships with a binary Flash file that cannot be built from source. I have prepared a correction for that (dokuwiki_remove-flash.patch attached), that simply removes the problematic file from the binary package, and documents that, with instruction for people that may want to install that file by themselves. But I also discovered another normal bug, #592653: an incorrect path given to a dpkg-statoverride in the postinst. That mistake disables a functionnality that a user may want (if he chooses it: it is the subject of a debconf question, and some people do choose it): the ability to install plugins through a web interface. The correction (dokuwiki_postinst_writeplugins.patch attached) modifies two lines in the postinst, replacing a wrong path by the corrected one. Due to the same kind of mistake, the important bug #592656: I had to change the location of a plugins directory, to respect the FHS, but using the same incorrect path, in a symlink creation, makes that transition fail, disabling any plugin. The correction (dokuwiki_postinst_plugins-transition.patch attached) modifies one line in the postinst, replacing the wrong path by the corrected one. These two mistakes are in fact due to a *double* transition: the first one was to respect the FHS, the second one was needed because DokuWiki did not support such a transition without some tricks, cf. the old important bug #588405. All that complicated by another transition that was badly handled (spurious moves of dpkg-managed files, outside of dpkg scope) before I took the package maintainance. Finally, I have just got an updated debconf template translation from the German team, bug #592651. Sorry for this complexity. To sum up, here is what I have, from the most to the least important: * #592593: serious, small addition to debian/rules and documentation; * #592656: important, corrects one path in debian/postinst; * #592653: normal, corrects one path used twice in debian/postinst; * #592651: wishlist [l10n], updates the German debconf translation. Which of these modification do you think are worth a freeze exception? I suppose there is no need to tell you that I would like to see all of them accepted. :-) Also, I think I should group the accepted modifications, am I right? Regards, and thank you for your work and your patience, -- Tanguy Ortolo
diff --git a/debian/NEWS b/debian/NEWS index e3cdfa4..2ac56b4 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,14 @@ +dokuwiki (0.0.20091225c-8) unstable; urgency=low + + The Flash-based multiple upload tool is no longer distributed in the Debian + package, as it cannot be built from source and violates the Debian Policy + (cf. bug #592593). + + This tool can be enabled by manually installing it, as documented in + /usr/share/doc/dokuwiki/README.Debian. + + -- Tanguy Ortolo <tanguy+debian@ortolo.eu> Wed, 11 Aug 2010 20:25:27 +0200 + dokuwiki (0.0.20091225c-4) unstable; urgency=low Starting from this version, additional questions are asked when configuring diff --git a/debian/README.Debian b/debian/README.Debian index e3d8c26..7da8b24 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -20,6 +20,19 @@ get removed from the normal directories and backed up to checked and possibly integrated back to the normal directories /var/lib/dokuwiki/plugins and /var/lib/dokuwiki/tpl. +Multiple uploader tool +---------------------- + +DokuWiki originally comes with a Flash-based tool that allows to upload several +files at a time to a wiki <http://www.dokuwiki.org/multiuploader>. However, +that tool violates the Debian Policy, as stated in the bug #592593. That is +why this tool is not shipped with the Debian package anymore. + +If you want to enable this multiple upload feature, you need to install the +Flash file yourself with the following command: + # wget -O /usr/share/dokuwiki/lib/exe/multipleUpload.swf http://github.com/splitbrain/dokuwiki/raw/release_stable_2009-12-25/lib/exe/multipleUpload.swf + + A few tips for Debian's DokuWiki (last update for dokuwiki 2005-02-18a) -------------------------------- diff --git a/debian/changelog b/debian/changelog index c90fdd9..aae1cca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +dokuwiki (0.0.20091225c-8) unstable; urgency=low + + * debian/rules: remove lib/exe/multipleUpload.swf from binary package, as it + cannot be built from source, violating the Policy. (Closes: #592593) + * debian/NEWS: document that removal and how to get + lib/exe/multipleUpload.swf from the upstream distribution. + + -- Tanguy Ortolo <tanguy+debian@ortolo.eu> Wed, 11 Aug 2010 20:23:49 +0200 + dokuwiki (0.0.20091225c-7) unstable; urgency=low * debian/po/fr.po: debconf template translation update diff --git a/debian/rules b/debian/rules index f87bf43..4691fc5 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,9 @@ override_dh_install: # Already installed to /var/lib/ rm -rf $(DESTDIR)/usr/share/dokuwiki/lib/tpl rm -rf $(DESTDIR)/usr/share/dokuwiki/lib/plugins + # Remove Flash source (useless) and bytecode (violates Policy) + rm -rf $(DESTDIR)/usr/share/dokuwiki/lib/_fla + rm -rf $(DESTDIR)/usr/share/dokuwiki/lib/exe/multipleUpload.swf override_dh_fixperms: dh_fixperms
--- debian/postinst.old 2010-08-11 21:23:04.942155020 +0200
+++ debian/postinst 2010-08-11 21:23:52.402147957 +0200
@@ -137,8 +137,8 @@
fi
db_get dokuwiki/system/writeplugins
if [ "$RET" = "true" ]; then
- if ! dpkg-statoverride --list /var/lib/dokuwiki/plugins >/dev/null 2>&1; then
- dpkg-statoverride --update --add root www-data 0775 /var/lib/dokuwiki/plugins
+ if ! dpkg-statoverride --list /var/lib/dokuwiki/lib/plugins >/dev/null 2>&1; then
+ dpkg-statoverride --update --add root www-data 0775 /var/lib/dokuwiki/lib/plugins
fi
fi
}
--- debian/postinst.old 2010-08-11 21:41:18.221497943 +0200
+++ debian/postinst 2010-08-11 21:43:12.478148710 +0200
@@ -421,7 +421,7 @@
echo "please check them and consider removing them." >/dev/stderr
mv /usr/share/dokuwiki/lib/plugins /usr/share/dokuwiki/lib/plugins.old
fi
- ln -s /var/lib/dokuwiki/plugins /usr/share/dokuwiki/lib/
+ ln -s /var/lib/dokuwiki/lib/plugins /usr/share/dokuwiki/lib/
echo "[done]" >/dev/stderr
fi
# Possible cases for /var/lib/dokuwiki/plugins:
Attachment:
signature.asc
Description: Digital signature