Source: -rcran-hunspell
Version: 3.0.2+dfsg-2
Severity: wishlist
libhunspell-private-dev was just accepted (and uploaded to unstable).
Thus r-cran-hunspellshoud stop copying private headers over (which it
never should have done!) and use it.
Diff:
diff -Nru r-cran-hunspell-3.0.2+dfsg/debian/changelog
r-cran-hunspell-3.0.2+dfsg/debian/changelog
--- r-cran-hunspell-3.0.2+dfsg/debian/changelog 2023-01-10 14:31:02.000000000
+0100
+++ r-cran-hunspell-3.0.2+dfsg/debian/changelog 2023-06-18 17:06:24.000000000
+0200
@@ -1,3 +1,13 @@
+r-cran-hunspell (3.0.2+dfsg-2.1) UNRELEASED; urgency=medium
+
+ * Shop shipping and using copied hunspell private headers
+ - build-depend on libhunspell-private-dev
+ - don't copy htypes.hxx and csutis.hxx but ln -sf them
+ - use libhunspell-private-devs .shlibs to get a strict dependecy
+ on libhunspell
+
+ -- Andreas Tille <r...@debian.org> Sun, 18 Jun 2023 15:06:24 +0000
+
r-cran-hunspell (3.0.2+dfsg-2) experimental; urgency=medium
* Enable building twice in a row (thanks for the patch to Rene Engelhard)
diff -Nru r-cran-hunspell-3.0.2+dfsg/debian/control
r-cran-hunspell-3.0.2+dfsg/debian/control
--- r-cran-hunspell-3.0.2+dfsg/debian/control 2023-01-10 14:31:02.000000000
+0100
+++ r-cran-hunspell-3.0.2+dfsg/debian/control 2023-06-18 16:19:03.000000000
+0200
@@ -14,7 +14,7 @@
r-base-dev,
r-cran-rcpp,
r-cran-digest,
- libhunspell-dev (>= 1.7.2+really1.7.2)
+ libhunspell-private-dev
Testsuite: autopkgtest-pkg-r
Package: r-cran-hunspell
diff -Nru r-cran-hunspell-3.0.2+dfsg/debian/rules
r-cran-hunspell-3.0.2+dfsg/debian/rules
--- r-cran-hunspell-3.0.2+dfsg/debian/rules 2023-01-10 14:31:02.000000000
+0100
+++ r-cran-hunspell-3.0.2+dfsg/debian/rules 2023-06-18 17:06:24.000000000
+0200
@@ -8,12 +8,15 @@
rm -rf src/hunspell
override_dh_auto_build:
- # FIXME: For the moment hack missing header files in here
- # Once we are sure that package build file bug report against
- # libhunspell-dev to include those missing header files
- cp -a debian/hunspell src
+ mkdir src/hunspell
+ cd src/hunspell && \
+ ln -sf /usr/include/hunspell/csutil.hxx && \
+ ln -sf /usr/include/hunspell/htypes.hxx
dh_auto_build
override_dh_fixperms:
dh_fixperms
find debian \( -name "*.dic" -o -name "*.aff" \) -exec chmod -x \{\} \;
+
+override_dh_shlibdeps:
+ dh_shlibdeps -- -L/var/lib/dpkg/info/libhunspell-private-dev.shlibs
diff -Nru r-cran-hunspell-3.0.2+dfsg/debian/shlibs.local
r-cran-hunspell-3.0.2+dfsg/debian/shlibs.local
--- r-cran-hunspell-3.0.2+dfsg/debian/shlibs.local 2023-01-10
14:31:02.000000000 +0100
+++ r-cran-hunspell-3.0.2+dfsg/debian/shlibs.local 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-libhunspell-1.7 0 libhunspell-1.7-0 (>= 1.7.2+really1.7.2)
Due to the extra .shlibs this now also makes r-cran-hunspell get a
Depends: r-api-4.0, r-cran-rcpp (>= 0.12.12), r-cran-digest, libc6 (>= 2.14),
libgcc-s1 (>= 3.0), libhunspell-1.7-0 (>= 1.7.2+really1.7.2), libhunspell-1.7-0
(<< 1.7.2+really1.7.2.1~), libstdc++6 (>= 13.1), hunspell-en-gb, hunspell-en-us
as of now and future hunspell updates will need a bin-NMU of
r-cran-hunspell so be it..
Regards,
Rene
