Hi,
On Sat, Jan 30, 2021 at 02:36:47PM +0100, Helmut Grohne wrote:
> Source: presage
> Version: 0.9.1-2.2
> Tags: patch
> User: [email protected]
> Usertags: rebootstrap
>
> presage participates in dependency loops relevant to architecture
> bootstrap. Rather than look into such a difficult problem, I looked into
> easily droppable dependencies and found some:
> * sqlite3 is unused. presage uses libsqlite3-dev, but not the sqlite3
> binary.
> * swig is practically unused. While it is detected by configure, the
> build of python bindings is skipped due to a missing Python.h.
> * libcppunit-dev is only used during tests and can be annotated
> <!nocheck>.
> Please consider applying the attached patch.
As the package didn't see any maintainer activity since 2016 I've
uploaded a NMU fixing this and some other issues to delayed/14.
Here's the changes:
```
* Non-maintainer upload.
* Use automatic debug packages
* Switch to dh 13
* Install Spanish database.
It's shipped upstream so let's have it.
* gprompter: Install svg. We install the bitmap variants so let's have the
svg too.
* presage: Install xpm and svg.
We install the png so let's have the other variants too.
* Add not-installed. Lists uninstalled (and unneeded) files
* d/copyright: Remove duplicate pattern
* Don't duplicate the same file in the dev package. It's in docs already
* Add a superficial autopkgtest
* Minimize build-depends (Closes: #981389)
* Link to jquery vi dh_links.
Instead of using a hand crafted, non-functional symlink in rules.
* docs: Install css too. Otherwise they're mostly unreadable
```
Matteo if I should cancel the NMU just let me know. The NMUdiff is attached.
Cheers,
-- Guido
diff --git a/debian/changelog b/debian/changelog
index ebd196d..2ad7f76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+presage (0.9.1-2.4) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Use automatic debug packages
+ * Switch to dh 13
+ * Install Spanish database.
+ It's shipped upstream so let's have it.
+ * gprompter: Install svg. We install the bitmap variants so let's have the
+ svg too.
+ * presage: Install xpm and svg.
+ We install the png so let's have the other variants too.
+ * Add not-installed. Lists uninstalled (and unneeded) files
+ * d/copyright: Remove duplicate pattern
+ * Don't duplicate the same file in the dev package. It's in docs already
+ * Add a superficial autopkgtest
+ * Minimize build-depends (Closes: #981389)
+ * Link to jquery vi dh_links.
+ Instead of using a hand crafted, non-functional symlink in rules.
+ * docs: Install css too. Otherwise they're mostly unreadable
+
+ -- Guido Günther <[email protected]> Tue, 08 Nov 2022 12:43:15 +0100
+
presage (0.9.1-2.3) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 0f087d9..71a6760 100644
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,15 @@ Source: presage
Section: devel
Priority: optional
Maintainer: Matteo Vescovi <[email protected]>
-Build-Depends: debhelper (>= 9~),
+Build-Depends: debhelper-compat (= 13),
autotools-dev,
dh-autoreconf,
pkg-config,
libsqlite3-dev,
- sqlite3,
libtinyxml-dev (>= 2.5.3),
libncurses5-dev | libncurses-dev,
help2man,
- libcppunit-dev (>= 1.9.6),
- swig (>= 2.0.4),
+ libcppunit-dev (>= 1.9.6) <!nocheck>,
libgtk2.0-dev (>= 2.12),
Build-Depends-Indep: doxygen, graphviz
Standards-Version: 3.9.7
@@ -33,20 +31,6 @@ Description: intelligent predictive text entry platform (tools and demos)
.
This package also contains simple demonstration programs and simulator.
-Package: presage-dbg
-Architecture: any
-Section: debug
-Depends: presage (= ${binary:Version}), ${misc:Depends}
-Description: intelligent predictive text entry platform (tools debugging symbols)
- Presage is an intelligent predictive text entry platform.
- .
- This package contains the debugging symbols for the presage tools
- required to generate custom statistical data used by the presage
- predictive text engine to generate predictions.
- .
- This package also contains debugging symbols for simple demonstration
- programs and simulator.
-
Package: libpresage-doc
Section: doc
Architecture: all
@@ -86,28 +70,6 @@ Description: intelligent predictive text entry platform (shared library)
.
This package contains the shared library.
-Package: libpresage1-dbg
-Architecture: any
-Multi-Arch: same
-Section: debug
-Depends: libpresage1v5 (= ${binary:Version}), ${misc:Depends}
-Description: intelligent predictive text entry platform (shared library debugging symbols)
- Presage is an intelligent predictive text entry platform.
- .
- A predictive text entry system attempts to improve the ease and speed
- of textual input by predicting words. Word prediction consists in
- computing which word tokens or word completions are most likely to be
- entered next. The system analyses the text already entered and
- combines the information thus extracted with other information sources
- to calculate the set of most probable tokens.
- .
- Presage exploits redundant information embedded in natural
- languages to generate word predictions. The modular architecture
- allows its language model to be extended and customized to utilize
- statistical, syntactic, and semantic information sources.
- .
- This package contains the debugging symbols for the shared library.
-
Package: libpresage-data
Section: libs
Architecture: all
@@ -146,12 +108,3 @@ Description: intelligent predictive GTK+ text editor
letter is typed. Predictions can be easily selected and inserted in
the document.
-Package: gprompter-dbg
-Architecture: any
-Section: debug
-Depends: gprompter (= ${binary:Version}), ${misc:Depends}
-Description: intelligent predictive GTK+ text editor (debugging symbols)
- gprompter is a cross-platform predictive text editor, based on
- presage, the intelligent predictive text entry platform.
- .
- This package contains the debugging symbols for gprompter.
diff --git a/debian/copyright b/debian/copyright
index 2795877..1e39587 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -129,10 +129,7 @@ License: Scintilla-and-Scite
Files: apps/gtk/gprompter/scintilla/lexers/LexSML.cxx
Copyright: Copyright 2009 by James Moffatt and Yuzhou Xin
-License: Scintilla-and-Scite
-
-Files: apps/gtk/gprompter/scintilla/lexers/LexSML.cxx
-Copyright: Modified from LexCaml.cxx by Robert Roessler <[email protected]> Copyright 2005
+ Modified from LexCaml.cxx by Robert Roessler <[email protected]> Copyright 2005
License: Scintilla-and-Scite
Files: apps/gtk/gprompter/scintilla/lexers/LexD.cxx
diff --git a/debian/gprompter.install b/debian/gprompter.install
index bcd5801..a623b29 100644
--- a/debian/gprompter.install
+++ b/debian/gprompter.install
@@ -2,4 +2,5 @@ usr/bin/gprompter
usr/share/man/man1/gprompter.1
usr/share/pixmaps/gprompter.xpm
usr/share/pixmaps/gprompter.png
+usr/share/icons/hicolor/scalable/apps/gprompter.svg
usr/share/applications/gprompter.desktop
diff --git a/debian/libpresage-data.install b/debian/libpresage-data.install
index 457e1ba..c8d67b6 100644
--- a/debian/libpresage-data.install
+++ b/debian/libpresage-data.install
@@ -2,5 +2,6 @@ etc/presage.xml
usr/share/presage/abbreviations_en.txt
usr/share/presage/abbreviations_it.txt
usr/share/presage/database_en.db
+usr/share/presage/database_es.db
usr/share/presage/database_it.db
usr/share/presage/presage.png
diff --git a/debian/libpresage-dev.docs b/debian/libpresage-dev.docs
deleted file mode 100644
index 5a80843..0000000
--- a/debian/libpresage-dev.docs
+++ /dev/null
@@ -1 +0,0 @@
-doc/getting_started.txt
diff --git a/debian/libpresage-doc.links b/debian/libpresage-doc.links
new file mode 100644
index 0000000..176ddd1
--- /dev/null
+++ b/debian/libpresage-doc.links
@@ -0,0 +1 @@
+usr/share/javascript/jquery/jquery.js usr/share/presage/html/jquery.js
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..962c966
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,5 @@
+usr/lib/*/libpresage.a
+usr/lib/*/libpresage.la
+usr/share/presage/getting_started.txt
+usr/share/presage/python_binding.txt
+
diff --git a/debian/patches/docs-Install-css-too.patch b/debian/patches/docs-Install-css-too.patch
new file mode 100644
index 0000000..dd03c4e
--- /dev/null
+++ b/debian/patches/docs-Install-css-too.patch
@@ -0,0 +1,22 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?= <[email protected]>
+Date: Tue, 8 Nov 2022 12:29:22 +0100
+Subject: docs: Install css too
+
+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
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -46,7 +46,7 @@ if HAVE_DOXYGEN
+ #pkgdata_DATA = html latex
+ install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/html
+- find html -type f \( -name "*.html" -o -name "*.png" \) \
++ find html -type f \( -name "*.html" -o -name "*.png" -o -name "*.css" \) \
+ -exec $(INSTALL_DATA) {} $(DESTDIR)$(pkgdatadir)/{} \;
+
+ all-local: doxygen.timestamp
diff --git a/debian/patches/series b/debian/patches/series
index f925cf8..320e88b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix-bug-776720.patch
fix-bug-811758-gcc6.patch
c++17.patch
format-security.patch
+docs-Install-css-too.patch
diff --git a/debian/presage.install b/debian/presage.install
index 672262b..5c0dead 100644
--- a/debian/presage.install
+++ b/debian/presage.install
@@ -6,3 +6,5 @@ usr/share/man/man1/text2ngram.1
usr/share/man/man1/presage_simulator.1
usr/share/man/man1/presage_demo.1
usr/share/man/man1/presage_demo_text.1
+usr/share/presage/presage.svg
+usr/share/presage/presage.xpm
diff --git a/debian/rules b/debian/rules
index a0f0de1..4b89a06 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,20 +17,3 @@ override_dh_auto_clean:
dh_auto_clean
rm -rf apps/dbus/build
-# Override needed to:
-# - fix embedded-javascript-library lintian warning
-#
-override_dh_auto_install:
- dh_auto_install
- set -e; if test -f debian/tmp/usr/share/presage/html/jquery.js; \
- then \
- rm -f debian/tmp/usr/share/presage/html/jquery.js; \
- ln -s /usr/share/javascript/jquery/jquery.js debian/tmp/usr/share/presage/html/jquery.js; \
- fi
-
-# Override needed to create debug packages
-#
-override_dh_strip:
- dh_strip -plibpresage1v5 --dbg-package=libpresage1-dbg
- dh_strip -ppresage --dbg-package=presage-dbg
- dh_strip -pgprompter --dbg-package=gprompter-dbg
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..9ae4517
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,4 @@
+Test-Command: presage_demo --help
+Restrictions: superficial
+Depends: presage
+
