From 7def227c19fbe93b014c6a27ea50d503063a0697 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Sat, 24 May 2014 14:32:08 +0200 Subject: [PATCH] shipping manifest cleanup --- src/doc/notes/minus-hyphen-dash.txt | 58 ----------------------------- src/makesrcdist.sh | 3 +- src/mk/manifest.txt | 10 +++-- src/recollinstall.in | 4 +- 4 files changed, 11 insertions(+), 64 deletions(-) delete mode 100644 src/doc/notes/minus-hyphen-dash.txt diff --git a/src/doc/notes/minus-hyphen-dash.txt b/src/doc/notes/minus-hyphen-dash.txt deleted file mode 100644 index 01970577..00000000 --- a/src/doc/notes/minus-hyphen-dash.txt +++ /dev/null @@ -1,58 +0,0 @@ -= 2014-04-30: Notes about the hyphen-minus character '-': - -Ascii hyphen-minus used to be glue, but stopped around version 1.18, then -was re-instated in 1.20. - -Having - as glue avoids generating phrase searches with bad performance. - -== Dashes - -There is a diversity of Unicode characters used mostly indistinctly (and -independant of their correct intent) as dash/minus/hyphen (hyphen, n-dash, -em-dash, etc.) in real-world texts. - -The Unicode dashes are properly treated as word-breaking by the splitter, -but it means that there will sometimes be a discrepancy between the -character in the search (usually an ascii hyphen-minus), and the character -in the text (which could be anything because of mis-use). - -It does happen (incorrectly) that a dash is used in a text instead of an -hyphen to join a compound word, resulting in no span constructed, and a -minus in the question, generating a span search, resulting in missed -match. - -A possible solution consisting in changing all dash signs into minus signs -at indexing time has been dismissed because this would introduce problems -with *correct* uses of dashes (which should be treated as space). This -would not be a major issue though because a matching search would probably -use white space in this case, and single terms are also generated for the -span. - -There are auxiliary arguments: - - - Treating all dash/hyphen/minus as whitespace (except at eol) makes for a - smaller index. - - Which is especially significant for raw indexes because of - multiplicative effects ("jean francois" "Jean francois" "jean Francois" - ...) - -== Hyphens - -Hyphens have several distinct uses which should yield different treatment: - - - Use with prefixes and suffixes: co-worker should probably be transformed - into or supplemented by coworker - - Use in compound words: American-football in "American-football player" - should certainly not be collapsed. - -If an hyphen-minus is present in the text in the first case, as will be -current in practise, there is no way we can get it right anyway, except by -using a language dictionary. - -So, given that even a real hyphen needs an ambiguous treatment, we don't -try and we just replace a Unicode hyphen (0x2010) with an ascii -hyphen-minus while indexing. This has the best chance of matching what a -user would type. - -The current (1.20) recoll is unable to match coworker and co-worker. The -best treatment for this would probably be synonym expansion at search time. diff --git a/src/makesrcdist.sh b/src/makesrcdist.sh index bf6a3340..2e2c2d15 100644 --- a/src/makesrcdist.sh +++ b/src/makesrcdist.sh @@ -110,8 +110,7 @@ fi ################################### Documentation ###### Html doc RECOLLDOC=${RECOLLDOC:=doc/user} -(cd $RECOLLDOC; sh xmlmake.sh) || exit 1 -rm -f $RECOLLDOC/usermanual-xml.html $RECOLLDOC/usermanual.xml +(cd $RECOLLDOC; make) || exit 1 ###### Text Doc chmod +w README INSTALL diff --git a/src/mk/manifest.txt b/src/mk/manifest.txt index 4970f86f..d405e25a 100644 --- a/src/mk/manifest.txt +++ b/src/mk/manifest.txt @@ -53,6 +53,7 @@ configure.ac desktop/ desktop/hotrecoll.py desktop/recoll-searchgui.desktop +desktop/recoll.appdata.xml desktop/recoll.png desktop/recoll.svg desktop/recoll.xcf @@ -78,7 +79,6 @@ doc/prog/top.txt doc/user/ doc/user/00README.txt doc/user/Makefile -doc/user/Makefile.fbsd doc/user/RCL.INDEXING.CONFIG.html doc/user/RCL.INDEXING.EXTATTR.html doc/user/RCL.INDEXING.EXTTAGS.html @@ -110,8 +110,7 @@ doc/user/docbook.css doc/user/index.html doc/user/usermanual-italian.html doc/user/usermanual.html -doc/user/usermanual.sgml -doc/user/xmlmake.sh +doc/user/usermanual.xml filters/ filters/injectcommon.sh filters/msodump.zip @@ -276,6 +275,7 @@ python/recoll/recoll/__init__.py python/recoll/recoll/rclconfig.py python/recoll/setup.py.in python/samples/ +python/samples/docdups.py python/samples/mutt-recoll.py python/samples/rcldlkp.py python/samples/rclmbox.py @@ -328,6 +328,8 @@ qtgui/i18n/recoll_it.qm qtgui/i18n/recoll_it.ts qtgui/i18n/recoll_lt.qm qtgui/i18n/recoll_lt.ts +qtgui/i18n/recoll_pl.qm +qtgui/i18n/recoll_pl.ts qtgui/i18n/recoll_ru.qm qtgui/i18n/recoll_ru.ts qtgui/i18n/recoll_tr.qm @@ -509,6 +511,8 @@ unac/unac.h unac/unac_version.h utils/ utils/Makefile +utils/appformime.cpp +utils/appformime.h utils/base64.cpp utils/base64.h utils/cancelcheck.h diff --git a/src/recollinstall.in b/src/recollinstall.in index fd0dd577..d062ebc6 100755 --- a/src/recollinstall.in +++ b/src/recollinstall.in @@ -86,7 +86,8 @@ done @NOQTMAKE@test -d ${datadir}/applications \ @NOQTMAKE@ || mkdir -p ${datadir}/applications || exit 1 - +@NOQTMAKE@test -d ${datadir}/appdata \ +@NOQTMAKE@ || mkdir -p ${datadir}/appdata || exit 1 # Use the xdg utilies to install the desktop file and icon? Couldn't find # out how to get this to work sanely. So keep the old way @@ -94,6 +95,7 @@ done #export PATH #xdg-desktop-menu install desktop/recoll-searchgui.desktop #xdg-icon-resource install --size 48 desktop/recoll.png +@NOQTMAKE@${INSTALL} -m 0444 desktop/recoll.appdata.xml ${datadir}/appdata @NOQTMAKE@${INSTALL} -m 0444 desktop/recoll-searchgui.desktop ${datadir}/applications @NOQTMAKE@${INSTALL} -m 0444 desktop/recoll.png ${datadir}/icons/hicolor/48x48/apps @NOQTMAKE@${INSTALL} -m 0444 desktop/recoll.png ${datadir}/pixmaps/