diff --git a/src/VERSION b/src/VERSION index a4cc5571..4ea8ad87 100644 --- a/src/VERSION +++ b/src/VERSION @@ -1 +1 @@ -1.14.2 +1.14.3 diff --git a/src/makesrcdist.sh b/src/makesrcdist.sh index 83bdea19..1664ae40 100644 --- a/src/makesrcdist.sh +++ b/src/makesrcdist.sh @@ -38,22 +38,25 @@ if test ! -d qtgui;then echo "Should be executed in the master recoll directory" exit 1 fi - +targetdir=${targetdir-/tmp} +dotag=${dotag-yes} version=`cat VERSION` versionforcvs=`echo $version | sed -e 's/\./_/g'` TAG="RECOLL_$versionforcvs" -echo Creating version $versionforcvs +if test "$dotag" = "yes" ; then + echo Creating AND TAGGING version $versionforcvs +else + echo Creating version $versionforcvs, no tagging +fi sleep 2 tagexists $TAG && fatal "Tag $TAG already exists" editedfiles=`$VCCMD status . | egrep -v '^\?'` -if test ! -z "$editedfiles"; then - fatal "Edited files exist: " $editedfiles +if test "$dotag" = "yes" -a ! -z "$editedfiles"; then + fatal "Edited files exist: " $editedfiles fi -targetdir=${targetdir-/tmp} -dotag=${dotag-yes} case $version in *.*.*) releasename=recoll-$version;; @@ -130,7 +133,7 @@ echo "$targetdir/$out created" # Check manifest against current reference tar tzf $targetdir/$out | sort | cut -d / -f 2- | \ - diff mk/manifest.txt - || fatal "Please fix file list" + diff mk/manifest.txt - || fatal "Please fix file list mk/manifest.txt" # We tag .. as there is the 'packaging/' directory in there [ $dotag = "yes" ] && tagtop $TAG diff --git a/src/mk/manifest.txt b/src/mk/manifest.txt index 4606d71f..b0ab7147 100644 --- a/src/mk/manifest.txt +++ b/src/mk/manifest.txt @@ -52,6 +52,7 @@ common/uproplist.h configure configure.ac desktop/ +desktop/hotrecoll.py desktop/recoll-searchgui.desktop desktop/recoll.png desktop/recoll.xcf @@ -91,25 +92,14 @@ doc/user/rcl.install.html doc/user/rcl.introduction.html doc/user/rcl.introduction.recoll.html doc/user/rcl.introduction.search.html -doc/user/rcl.kicker-applet.html doc/user/rcl.program.api.html doc/user/rcl.program.fields.html doc/user/rcl.program.html -doc/user/rcl.search.complex.html -doc/user/rcl.search.custom.html -doc/user/rcl.search.history.html +doc/user/rcl.search.commandline.html +doc/user/rcl.search.desktop.html doc/user/rcl.search.html doc/user/rcl.search.lang.html -doc/user/rcl.search.multidb.html -doc/user/rcl.search.preview.html -doc/user/rcl.search.reslist.html -doc/user/rcl.search.sort.html -doc/user/rcl.search.termexplorer.html -doc/user/rcl.search.tips.html -doc/user/rcl.search.wildcards.html -doc/user/rcl.searchkcl.html doc/user/rcl.searchkio.html -doc/user/rcl.searchkio.searchabledocs.html doc/user/usermanual-italian.html doc/user/usermanual.html doc/user/usermanual.html-text @@ -131,6 +121,7 @@ filters/rclgaim filters/rclics filters/rclid3 filters/rclimg +filters/rclinfo filters/rclkwd filters/rcllyx filters/rclman @@ -144,6 +135,7 @@ filters/rclpurple filters/rclpython filters/rclrtf filters/rclscribus +filters/rclshowinfo filters/rclsiduxman filters/rclsoff filters/rclsvg @@ -282,6 +274,8 @@ qtgui/i18n/recoll_fr.qm qtgui/i18n/recoll_fr.ts qtgui/i18n/recoll_it.qm qtgui/i18n/recoll_it.ts +qtgui/i18n/recoll_lt.qm +qtgui/i18n/recoll_lt.ts qtgui/i18n/recoll_ru.qm qtgui/i18n/recoll_ru.ts qtgui/i18n/recoll_tr.qm diff --git a/src/recollinstall.in b/src/recollinstall.in index 5ec11484..33da0459 100755 --- a/src/recollinstall.in +++ b/src/recollinstall.in @@ -103,6 +103,8 @@ ${STRIP} ${bindir}/recollindex ${INSTALL} -m 0755 filters/rcl* ${datadir}/recoll/filters/ || exit 1 ${INSTALL} -m 0755 desktop/xdg-utils-1.0.1/scripts/xdg-open \ ${datadir}/recoll/filters/ || exit 1 +${INSTALL} -m 0755 desktop/hotrecoll.py \ + ${datadir}/recoll/filters/ || exit 1 ${INSTALL} -m 0444 \ sampleconf/mimeconf \ diff --git a/website/CHANGES.html b/website/CHANGES.html index 09baad1d..30d7a813 100644 --- a/website/CHANGES.html +++ b/website/CHANGES.html @@ -31,6 +31,29 @@

Recoll journal of user-visible changes

+

1.14.3

+ +

1.14.2

Note: most of the changes are in release 1.14.0. Release 1.14.1 fixed 2 bugs. Release 1.14.2 fixes the help browser which was broken diff --git a/website/download.html b/website/download.html index f23ac42e..1c29530b 100644 --- a/website/download.html +++ b/website/download.html @@ -48,36 +48,19 @@

-

General information and release notes

- -

Installing over an older version: version 1.13/14 indexes are - mostly compatible with 1.11, but some new, relatively minor, - features (ie: duplicates collapsing) depend on a full index - rebuild. The 1.14 date search feature does not need an - index rebuild, the data was already in the index. - -
If installing over 1.10 or older, you need a full - rebuild. The best way to do this is to just delete the old - .recoll/xapiandb directory, - especially if the index was created by an older version. - (ie: rm -rf ~/.recoll/xapiandb/). On very - old indexes, recollindex -z may sometimes end - with a backend doesn't implement metadata error, - which is wasteful because you then need to delete xapiandb and - run the indexing again.

+

General information

The download page for Recoll 1.13 is still available.

-

Instructions: + +

Recoll Installation / building manual.

-

Most binary packages on this page need a Qt 4 runtime - environment (Qt 3.x is specified for a few). To make things easier, - on systems where Xapian is not available from the standard package - repositories, the Recoll package will have a static link to Xapian - so that you do not need to build/install it separately.

+

Current release notes.

-

Optional packages used by document filters: +

The indexing filters for some document types may need + external packages not installed on your system by default, and + not installed automatically with Recoll: take a look at the list and decide what you need to install.

@@ -91,7 +74,7 @@ report them.

-

What do the release numbers mean?

+

What do the release numbers mean?

The Recoll releases are numbered X.Y.Z. The X would only change for really major modifications like a big @@ -118,11 +101,11 @@

Source

-

Current release distribution: 1.14.2:

+

Current release distribution: 1.14.3:

-

recoll-1.14.2.tar.gz.

+

recoll-1.14.3.tar.gz.

Prerequisites for building from source: