From 3082ce2b8380f82c2aa0fb1297c3e9ff66330b3f Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Fri, 5 Apr 2019 15:05:44 +0200 Subject: [PATCH] debian packaging refresh/merge with current Debians --- packaging/debian/debian/README.Debian | 5 ++ packaging/debian/debian/control | 51 ++++++++++--------- packaging/debian/debian/copyright | 6 +-- .../debian/debian/recoll.lintian-overrides | 2 - .../debian/debian/recollcmd.lintian-overrides | 1 + packaging/debian/debian/rules | 27 +++++----- .../debian/debian/upstream/signing-key.asc | 41 +++++++++++++++ packaging/debian/debian/watch | 5 +- 8 files changed, 94 insertions(+), 44 deletions(-) delete mode 100644 packaging/debian/debian/recoll.lintian-overrides create mode 100644 packaging/debian/debian/recollcmd.lintian-overrides create mode 100644 packaging/debian/debian/upstream/signing-key.asc diff --git a/packaging/debian/debian/README.Debian b/packaging/debian/debian/README.Debian index 3866c0a6..4f107ed8 100644 --- a/packaging/debian/debian/README.Debian +++ b/packaging/debian/debian/README.Debian @@ -1,6 +1,11 @@ README for Debian ----------------- + Starting with 1.27.3-2, recoll is split into 3 packages. recoll is metapackage + now and depends on GUI program, recollgui and commandline programs recollcmd. + + -- Kartik Mistry Sat, 13 Jan 2018 21:52:00 +0530 + Installing over an older version: 1.18 introduces significant index formats changes to support optional character case and diacritics sensitivity, and it will be advisable to reset the index in most cases. This will be best done by diff --git a/packaging/debian/debian/control b/packaging/debian/debian/control index c329de7b..4f88929d 100644 --- a/packaging/debian/debian/control +++ b/packaging/debian/debian/control @@ -2,12 +2,13 @@ Source: recoll Section: x11 Priority: optional Maintainer: Jean-Francois Dockes -Build-Depends: autotools-dev, - bison, +Build-Depends: bison, debhelper (>= 9), dh-python, dpkg-dev (>= 1.16.1~), + libaspell-dev, libchm-dev, + libqt5webkit5-dev, libx11-dev, libxapian-dev (>= 1.2.0), libxslt1-dev, @@ -16,61 +17,59 @@ Build-Depends: autotools-dev, python-setuptools, python3-all-dev, python3-setuptools, - qt5-default, - qt5-qmake, - libqt5webkit5-dev, qtbase5-dev X-Python3-Version: >= 3.4 -Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/recoll.git -Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/recoll.git -Homepage: http://www.lesbonscomptes.com/recoll -Standards-Version: 4.1.4 +Vcs-Git: https://salsa.debian.org/debian/recoll.git +Vcs-Browser: https://salsa.debian.org/debian/recoll +Homepage: https://www.lesbonscomptes.com/recoll +Standards-Version: 4.2.1 Package: recoll Architecture: all -Depends: recollgui, recollcmd, ${misc:Depends} -Description: Personal full text search package with a Qt GUI +Depends: recollcmd, recollgui, ${misc:Depends} +Description: Personal full text search package This package is a personal full text search package is based on a very strong backend (Xapian), for which it provides an easy to use and feature-rich interface. . Features: - * Qt-based GUI + * Qt-based GUI. * Supports the following document types (and their compressed versions) - Natively: text, html, OpenOffice files, excel, ppt, maildir and mailbox (Mozilla and IceDove mail) with attachments, pidgin log files - With external helpers: pdf (pdftotext), postscript (ghostscript), msword (antiword), rtf (unrtf). And others... * Powerful query facilities, with boolean searches, phrases, filter on file - types and directory tree + types and directory tree. * Support for multiple charsets, Internal processing and storage uses Unicode - UTF-8 + UTF-8. * Stemming performed at query time (can switch stemming language after - indexing) + indexing). * Easy installation. No database daemon, web server or exotic language - necessary + necessary. * The indexer can run either continuously or in batch. Package: recollcmd Architecture: any -Breaks: recoll (<< 1.23.9) -Replaces: recoll (<< 1.23.9) +Breaks: recoll (<< 1.23.7-2) +Replaces: recoll (<< 1.23.7-2) Depends: python, python3, ${misc:Depends}, ${shlibs:Depends} Recommends: antiword, aspell, groff, libimage-exiftool-perl, poppler-utils, - pstotext, + python-recoll, python3-lxml, + python3-recoll, python3-six, python3-mutagen, python3-rarfile, unrtf, unzip, xdg-utils -Suggests: python-recoll, - python3-recoll, +Suggests: ghostscript, + libinotifytools0, untex, wv Description: Command line programs for recoll @@ -78,8 +77,8 @@ Description: Command line programs for recoll Package: recollgui Architecture: any -Breaks: recoll (<< 1.23.9) -Replaces: recoll (<< 1.23.9) +Breaks: recoll (<< 1.23.7-2) +Replaces: recoll (<< 1.23.7-2) Depends: recollcmd (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: GUI program and elements for recoll Main recoll GUI for configuring, controlling and querying recoll indexes. @@ -87,7 +86,8 @@ Description: GUI program and elements for recoll Package: python-recoll Architecture: any Section: python -Depends: recollcmd (= ${binary:Version}), +Depends: python, + recollcmd (= ${binary:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} @@ -101,7 +101,8 @@ Description: Python extension for recoll Package: python3-recoll Architecture: any Section: python -Depends: recollcmd (= ${binary:Version}), +Depends: python3, + recollcmd (= ${binary:Version}), ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends} diff --git a/packaging/debian/debian/copyright b/packaging/debian/debian/copyright index 36f0d7b1..9d445892 100644 --- a/packaging/debian/debian/copyright +++ b/packaging/debian/debian/copyright @@ -1,7 +1,7 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: recoll Upstream-Contact: Jean-Francois Dockes -Source: http://www.lesbonscomptes.com/recoll/ +Source: https://www.lesbonscomptes.com/recoll/ Files: * Copyright: 2005-2014, Jean-Francois Dockes @@ -85,7 +85,7 @@ License: Unicode License: Unicode All rights reserved. Distributed under the Terms of Use in - http://www.unicode.org/copyright.html + https://www.unicode.org/copyright.html . Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") diff --git a/packaging/debian/debian/recoll.lintian-overrides b/packaging/debian/debian/recoll.lintian-overrides deleted file mode 100644 index bd226bce..00000000 --- a/packaging/debian/debian/recoll.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -recoll: postinst-has-useless-call-to-ldconfig -recoll: postrm-has-useless-call-to-ldconfig diff --git a/packaging/debian/debian/recollcmd.lintian-overrides b/packaging/debian/debian/recollcmd.lintian-overrides new file mode 100644 index 00000000..9d707a2d --- /dev/null +++ b/packaging/debian/debian/recollcmd.lintian-overrides @@ -0,0 +1 @@ +recollcmd: package-has-unnecessary-activation-of-ldconfig-trigger diff --git a/packaging/debian/debian/rules b/packaging/debian/debian/rules index 9385142b..bcea1333 100755 --- a/packaging/debian/debian/rules +++ b/packaging/debian/debian/rules @@ -1,20 +1,23 @@ #!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -#DH_VERBOSE = 1 -# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/* +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/default.mk +include /usr/share/dpkg/buildflags.mk -# see FEATURE AREAS in dpkg-buildflags(1) -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -# see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +build3vers := $(shell py3versions -sv) + +#build qt5 UI +export QT_SELECT := qt5 + +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NJOBS := -j $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +endif # main packaging script based on dh7 syntax %: diff --git a/packaging/debian/debian/upstream/signing-key.asc b/packaging/debian/debian/upstream/signing-key.asc new file mode 100644 index 00000000..e473719c --- /dev/null +++ b/packaging/debian/debian/upstream/signing-key.asc @@ -0,0 +1,41 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=2J/9 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/packaging/debian/debian/watch b/packaging/debian/debian/watch index 3975397c..a96026ec 100644 --- a/packaging/debian/debian/watch +++ b/packaging/debian/debian/watch @@ -1,3 +1,4 @@ -version=3 -http://www.lesbonscomptes.com/recoll/download.html \ +version=4 +opts=pgpmode=auto \ +https://www.lesbonscomptes.com/recoll/download.html \ (?:|.*/)recoll(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)