control: -1 tags +pending Hi, On Sat, Nov 26, 2022 at 06:54:29PM +0100, Guido Günther wrote: > Hi Andreas, > On Thu, Nov 24, 2022 at 05:30:16PM +0100, Andreas Beckmann wrote: > > Package: libpresage-doc > > Version: 0.9.1-2.4 > > Severity: serious > > User: debian...@lists.debian.org > > Usertags: piuparts > > > > Hi, > > > > during a test with piuparts I noticed your package fails to upgrade from > > 'testing'. > > It installed fine in 'testing', then the upgrade to 'sid' fails > > because it tries to overwrite other packages files without declaring a > > Breaks+Replaces relation. > > > > See policy 7.6 at > > https://www.debian.org/doc/debian-policy/ch-relationships.html#overwriting-files-and-replacing-packages-replaces > > > > >From the attached log (scroll to the bottom...): > > > > Selecting previously unselected package libpresage-dev:amd64. > > Preparing to unpack .../libpresage-dev_0.9.1-2.3_amd64.deb ... > > Unpacking libpresage-dev:amd64 (0.9.1-2.3) ... > > dpkg: error processing archive > > /var/cache/apt/archives/libpresage-dev_0.9.1-2.3_amd64.deb (--unpack): > > trying to overwrite > > '/usr/share/doc/libpresage-dev/getting_started.txt.gz', which is also in > > package libpresage-doc 0.9.1-2.4 > > Errors were encountered while processing: > > /var/cache/apt/archives/libpresage-dev_0.9.1-2.3_amd64.deb > > I'll prepare another NMU to fix that. > -- Guido
Uploaded to delayed/5 now with the attached diff. Cheers, -- Guido > > > > > > > cheers, > > > > Andreas
diff --git a/debian/changelog b/debian/changelog index 2ad7f76..d8ac4d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +presage (0.9.1-2.5) unstable; urgency=medium + + * Non-maintainer upload. + * d/control: Add missing Breaks/Replaces. + Thanks to Andreas Beckmann (Closes: #1024773) + * text2ngram: Ignore more characters when building models. + This prevents words ending with e.g. a non-breaking space. Patches were + cherry-picked from sailfish OSes presage fork which is more active than + the current upstream we track in Debian. + * d/control: Drop build-depends on autoreconf. + Not needed since debhelper 10 + * Add lintian override for abbreviation files. + These are not documentation but data used by the library + * d/control: Bump standards version. No changes needed. + * d/patches: Mark css patch as forwarded too. + Also applied to sfos' tree now + * d/rules: Enable bindnow hardening. + Switch to DPKG_EXPORT_BUILDFLAGS for that so we can drop the + configure dh_auto_configure override. + * d/control: Use https URLs + * d/gbp.conf: Update syntax + + -- Guido Günther <a...@sigxcpu.org> Sun, 27 Nov 2022 14:02:27 +0100 + presage (0.9.1-2.4) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/control b/debian/control index 71a6760..597c265 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,6 @@ Section: devel Priority: optional Maintainer: Matteo Vescovi <matteo.vesc...@yahoo.co.uk> Build-Depends: debhelper-compat (= 13), - autotools-dev, - dh-autoreconf, pkg-config, libsqlite3-dev, libtinyxml-dev (>= 2.5.3), @@ -13,10 +11,10 @@ Build-Depends: debhelper-compat (= 13), libcppunit-dev (>= 1.9.6) <!nocheck>, libgtk2.0-dev (>= 2.12), Build-Depends-Indep: doxygen, graphviz -Standards-Version: 3.9.7 -Homepage: http://presage.sourceforge.net/ -Vcs-Git: git://git.code.sf.net/p/presage/presage-debian -Vcs-Browser: http://sourceforge.net/p/presage/presage-debian/ci/master/tree/ +Standards-Version: 4.6.1 +Homepage: https://presage.sourceforge.net/ +Vcs-Git: https://git.code.sf.net/p/presage/presage-debian +Vcs-Browser: https://sourceforge.net/p/presage/presage-debian/ci/master/tree/ Package: presage Section: misc @@ -36,6 +34,8 @@ Section: doc Architecture: all Depends: libjs-jquery, ${misc:Depends} Recommends: presage +Breaks: libpresage-dev (<< 0.9.1-2.4) +Replaces: libpresage-dev (<< 0.9.1-2.4) Description: intelligent predictive text entry platform (documentation) Presage is an intelligent predictive text entry platform. . diff --git a/debian/gbp.conf b/debian/gbp.conf index b0f498f..2eb755c 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,3 +1,3 @@ -[git-buildpackage] +[buildpackage] # use a build area relative to the git repository export-dir=../build-area diff --git a/debian/libpresage-data.lintian-overrides b/debian/libpresage-data.lintian-overrides new file mode 100644 index 0000000..cf1b31d --- /dev/null +++ b/debian/libpresage-data.lintian-overrides @@ -0,0 +1,3 @@ +# Abbreviations files are not documentation +libpresage-data: package-contains-documentation-outside-usr-share-doc [usr/share/presage/abbreviations_en.txt] +libpresage-data: package-contains-documentation-outside-usr-share-doc [usr/share/presage/abbreviations_it.txt] diff --git a/debian/patches/series b/debian/patches/series index 320e88b..1947677 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,4 +2,6 @@ fix-bug-776720.patch fix-bug-811758-gcc6.patch c++17.patch format-security.patch -docs-Install-css-too.patch +sfos/docs-Install-css-too.patch +sfos/text2ngram-Add-and-to-separators.patch +sfos/text2ngram-Add-non-breaking-space-to-whitespace-chars.patch diff --git a/debian/patches/docs-Install-css-too.patch b/debian/patches/sfos/docs-Install-css-too.patch similarity index 83% rename from debian/patches/docs-Install-css-too.patch rename to debian/patches/sfos/docs-Install-css-too.patch index dd03c4e..2e4e2b3 100644 --- a/debian/patches/docs-Install-css-too.patch +++ b/debian/patches/sfos/docs-Install-css-too.patch @@ -2,13 +2,15 @@ From: =?utf-8?q?Guido_G=C3=BCnther?= <a...@sigxcpu.org> Date: Tue, 8 Nov 2022 12:29:22 +0100 Subject: docs: Install css too +Forwarded: https://github.com/sailfish-keyboard/presage/commit/b60c381d9f8bfa0815bd982b8c69cc3b72a0e52a + Otherwise they're mostly unreadable --- doc/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Makefile.am b/doc/Makefile.am -index bfb2f09..2a4e396 100644 +index bfb2f09..7ee84df 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -46,7 +46,7 @@ if HAVE_DOXYGEN diff --git a/debian/patches/sfos/text2ngram-Add-and-to-separators.patch b/debian/patches/sfos/text2ngram-Add-and-to-separators.patch new file mode 100644 index 0000000..13dad0d --- /dev/null +++ b/debian/patches/sfos/text2ngram-Add-and-to-separators.patch @@ -0,0 +1,22 @@ +From: =?utf-8?q?Guido_G=C3=BCnther?= <a...@sigxcpu.org> +Date: Wed, 9 Nov 2022 11:33:53 +0100 +Subject: =?utf-8?q?text2ngram=3A_Add_=C2=AB_and_=C2=BB_to_separators?= + +Forwarded: https://github.com/sailfish-keyboard/presage/commit/cf67f3b9018a04acd0d54114d29fcc68b1a3b506 +--- + src/tools/text2ngram.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tools/text2ngram.cpp b/src/tools/text2ngram.cpp +index 807aa83..2953ff4 100644 +--- a/src/tools/text2ngram.cpp ++++ b/src/tools/text2ngram.cpp +@@ -174,7 +174,7 @@ int main(int argc, char* argv[]) + std::ifstream infile(argv[i]); + ForwardTokenizer tokenizer(infile, + " \f\n\r\t\v", +- "`~!@#$%^&*()_-+=\\|]}[{'\";:/?.>,<"); ++ "`~!@#$%^&*()_-+=\\|]}[{'\";:/?.>,<«»"); + tokenizer.lowercaseMode(lowercase); + + // take care of first N-1 tokens diff --git a/debian/patches/sfos/text2ngram-Add-non-breaking-space-to-whitespace-chars.patch b/debian/patches/sfos/text2ngram-Add-non-breaking-space-to-whitespace-chars.patch new file mode 100644 index 0000000..6b020f9 --- /dev/null +++ b/debian/patches/sfos/text2ngram-Add-non-breaking-space-to-whitespace-chars.patch @@ -0,0 +1,22 @@ +From: =?utf-8?q?Guido_G=C3=BCnther?= <a...@sigxcpu.org> +Date: Wed, 9 Nov 2022 12:11:14 +0100 +Subject: text2ngram: Add non-breaking space to whitespace chars + +Forwarded: https://github.com/sailfish-keyboard/presage/commit/a79f52421846bf01b41a87d4515694fc26e0597b +--- + src/tools/text2ngram.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tools/text2ngram.cpp b/src/tools/text2ngram.cpp +index 2953ff4..ea38e11 100644 +--- a/src/tools/text2ngram.cpp ++++ b/src/tools/text2ngram.cpp +@@ -173,7 +173,7 @@ int main(int argc, char* argv[]) + // create tokenizer object and open input file stream + std::ifstream infile(argv[i]); + ForwardTokenizer tokenizer(infile, +- " \f\n\r\t\v", ++ " \f\n\r\t\v ", + "`~!@#$%^&*()_-+=\\|]}[{'\";:/?.>,<«»"); + tokenizer.lowercaseMode(lowercase); + diff --git a/debian/rules b/debian/rules index 4b89a06..57a2845 100755 --- a/debian/rules +++ b/debian/rules @@ -2,15 +2,13 @@ #export DH_VERBOSE=1 +DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + %: dh $@ --with autoreconf - -# Enable build hardening -# -override_dh_auto_configure: - dh_auto_configure -- $(shell dpkg-buildflags --export=configure) - # Ensure dbus python build is cleaned out # override_dh_auto_clean:
