Hi again, Am Sat, Jul 01, 2023 at 05:50:08PM +0200 schrieb Andreas Tille: > > That's a pretty good point. Dirk, do you want me to adapt the > patch or will you do the search and replace? I'll adapt dh-r > accordingly to the proper string.
I've attached a patch implementing Grahams suggestion. Dh-r is adapted as well. It would be great if you could raise your opinion about this patch until Monday. Kind regards Andreas. -- http://fam-tille.de
diff --git a/debian/changelog b/debian/changelog index 2c23d966f..c9d4db356 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +r-base (4.3.1-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Add r-ge-version-16 + Closes: #1040038 + + -- Andreas Tille <ti...@debian.org> Sat, 01 Jul 2023 13:45:57 +0200 + r-base (4.3.1-1) unstable; urgency=medium * New upstream release diff --git a/debian/control b/debian/control index 37d0cd042..3d3b126a6 100644 --- a/debian/control +++ b/debian/control @@ -49,7 +49,7 @@ Package: r-base-core Architecture: any Depends: ${misc:Depends}, zip, unzip, libpaper-utils, xdg-utils, ${shlibs:Depends}, ucf (>= 3.0), ca-certificates Replaces: r-base (<= 1.4.1-1), r-recommended (<< 1.9.0), r-gnome (<= 2.3.1), r-cran-rcompgen (<= 0.1-17-1), r-base-latex (<= 2.9.2-4) -Provides: r-gnome, r-cran-rcompgen, r-base-latex, r-api-4.0 +Provides: r-gnome, r-cran-rcompgen, r-base-latex, r-api-4.0, r-ge-version-16 Conflicts: r-gnome, r-cran-rcompgen, r-base-latex Recommends: r-recommended, r-base-dev, r-doc-html Suggests: elpa-ess, r-doc-info | r-doc-pdf, r-mathlib, r-base-html diff --git a/debian/r-cran.mk b/debian/r-cran.mk index 7e54a19d7..eb8f5f880 100644 --- a/debian/r-cran.mk +++ b/debian/r-cran.mk @@ -65,6 +65,7 @@ endif # awk '/^Version/ {print $$2}') rversion := $(shell dpkg-query -W -f='$${Version}' r-base-dev) rapiversion := $(shell dpkg-query -W -f='$${Provides}' r-base-core | grep -o 'r-api[^, ]*') +rgraphicsapiversion := $(shell dpkg-query -W -f='$${Provides}' r-base-core | grep -o 'r-ge-version[^, ]*') ## we use these results for the to-be-installed-in directory debRlib := $(CURDIR)/debian/$(package)/$(debRdir) @@ -101,7 +102,7 @@ R_any_arch: dh_installdirs $(debRdir) ## ## support ${R:Depends} via debian/${package}.substvars - echo "R:Depends=r-base-core (>= ${rversion}), ${rapiversion}" >> debian/$(package).substvars + echo "R:Depends=r-base-core (>= ${rversion}), ${rapiversion}, ${rgraphicsapiversion}" >> debian/$(package).substvars ## ## call R to install the sources we're looking at ## use this inside xvfb-run if this wrapper is installed