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 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
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) ,
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 000..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
