From 2b1553caa6b3a0c290ba4e137292bc285b9ae3ed Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Tue, 21 Apr 2020 16:13:54 +0200 Subject: [PATCH] forgotten file in dist --- packaging/debian/buildppa.sh | 6 +++--- packaging/debian/debian/changelog | 2 +- src/Makefile.am | 3 +++ src/VERSION | 2 +- src/qtgui/recoll.pro.in | 4 +--- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packaging/debian/buildppa.sh b/packaging/debian/buildppa.sh index f478d7be..a2b19515 100644 --- a/packaging/debian/buildppa.sh +++ b/packaging/debian/buildppa.sh @@ -6,7 +6,7 @@ PPA_KEYID=D38B9201 -RCLVERS=1.26.5 +RCLVERS=1.27.0pre1 SCOPEVERS=1.20.2.4 GSSPVERS=1.0.0 PPAVERS=2 @@ -22,7 +22,7 @@ case $RCLVERS in 1.14*) PPANAME=recoll-ppa;; *) PPANAME=recoll15-ppa;; esac -#PPANAME=recollexp-ppa +PPANAME=recollexp-ppa echo "PPA: $PPANAME. Type CR if Ok, else ^C" read rep @@ -55,7 +55,7 @@ debdir=debian # 19.10 eoan 2020-07 # 20.04LTS focal 2025-04 series="xenial bionic disco eoan focal" -#series= +series=bionic if test "X$series" != X ; then check_recoll_orig diff --git a/packaging/debian/debian/changelog b/packaging/debian/debian/changelog index 68024b6b..3ed9efc3 100644 --- a/packaging/debian/debian/changelog +++ b/packaging/debian/debian/changelog @@ -1,4 +1,4 @@ -recoll (1.27.0pre1-1~ppaPPAVERS~SERIES1) SERIES; urgency=low +recoll (1.27.0pre2-1~ppaPPAVERS~SERIES1) SERIES; urgency=low * Support for language-sensitive analysis of Korean text * Other small improvements. diff --git a/src/Makefile.am b/src/Makefile.am index d30735ce..e08546ef 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -515,6 +515,9 @@ qtgui/widgets/listdialog.ui \ qtgui/widgets/qxtconfirmationmessage.cpp \ qtgui/widgets/qxtconfirmationmessage.h \ qtgui/widgets/qxtglobal.h \ +qtgui/winschedtool.cpp \ +qtgui/winschedtool.h \ +qtgui/winschedtool.ui \ qtgui/xmltosd.cpp \ qtgui/xmltosd.h \ \ diff --git a/src/VERSION b/src/VERSION index 0adcd177..ff2c550d 100644 --- a/src/VERSION +++ b/src/VERSION @@ -1 +1 @@ -1.27.0pre1 +1.27.0pre2 diff --git a/src/qtgui/recoll.pro.in b/src/qtgui/recoll.pro.in index 7ddc9f19..780c4dac 100644 --- a/src/qtgui/recoll.pro.in +++ b/src/qtgui/recoll.pro.in @@ -91,7 +91,6 @@ SOURCES += \ viewaction_w.cpp \ webcache.cpp \ widgets/qxtconfirmationmessage.cpp \ - winschedtool.cpp \ xmltosd.cpp FORMS = \ @@ -112,8 +111,7 @@ FORMS = \ viewaction.ui \ webcache.ui \ widgets/editdialog.ui \ - widgets/listdialog.ui \ - winschedtool.ui + widgets/listdialog.ui RESOURCES = recoll.qrc