Commit 3ce6586d authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 3.2.0-3

r-base (3.2.0-3) unstable; urgency=low

  * debian/control: The r-base-core package now 'Provides: r-api-3' which
    can be used to have r-cran-* depend on a particular API vintage.
    							(Closes: #704805)

  * debiab/r-cran.mk: Have the build-time API vintage encoded as a Depends
    (with thanks to Julian Gilbey, Charles Plessy, and others for the patch)

  * debian/control: Set Standards-Version: to current version 
parent 363237ac
r-base (3.2.0-3) unstable; urgency=low
* debian/control: The r-base-core package now 'Provides: r-api-3' which
can be used to have r-cran-* depend on a particular API vintage.
(Closes: #704805)
* debiab/r-cran.mk: Have the build-time API vintage encoded as a Depends
(with thanks to Julian Gilbey, Charles Plessy, and others for the patch)
* debian/control: Set Standards-Version: to current version
-- Dirk Eddelbuettel <edd@debian.org> Mon, 11 May 2015 06:08:12 -0500
r-base (3.2.0-2) unstable; urgency=low
* debian/r-cran.mk: Apply (modified) patch by Philipp Rinn to set
......
......@@ -2,7 +2,7 @@ Source: r-base
Section: gnu-r
Priority: optional
Maintainer: Dirk Eddelbuettel <edd@debian.org>
Standards-Version: 3.9.5
Standards-Version: 3.9.6
Build-Depends: gcc (>= 4:4.1.0), g++ (>= 4:4.1.0), gfortran (>= 4:4.1.0), libblas-dev, liblapack-dev (>= 3.1.1), tcl8.6-dev, tk8.6-dev, bison, groff-base, libncurses5-dev, libreadline-dev, debhelper (>= 7.2.3), texinfo (>= 4.1-2), libbz2-dev, liblzma-dev, libpcre3-dev, libcurl4-openssl-dev | libcurl4-dev, xdg-utils, zlib1g-dev, libpng-dev, libjpeg-dev, libx11-dev, libxt-dev, x11proto-core-dev, libpango1.0-dev, libcairo2-dev, libtiff5-dev, xvfb, xauth, xfonts-base, texlive-base, texlive-latex-base, texlive-generic-recommended, texlive-fonts-recommended, texlive-fonts-extra, texlive-extra-utils, texlive-latex-recommended, texlive-latex-extra, default-jdk [!arm !hppa !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], mpack, bash-completion
Homepage: http://www.r-project.org/
......@@ -47,7 +47,7 @@ Package: r-base-core
Architecture: any
Depends: ${misc:Depends}, ${perl:Depends}, zip, unzip, libpaper-utils, xdg-utils, ${shlibs:Depends}, ucf (>= 3.0)
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
Provides: r-gnome, r-cran-rcompgen, r-base-latex, r-api-3
Conflicts: r-gnome, r-cran-rcompgen, r-base-latex
Recommends: r-recommended, r-base-dev, r-doc-html
Suggests: ess, r-doc-info | r-doc-pdf, r-mathlib, r-base-html
......
......@@ -7,7 +7,7 @@
# packages. Note that you still need to provide the other files in debian/*,
# in particular control, changelog and copyright.
#
# Copyright 2003-2013 by Dirk Eddelbuettel <edd@debian.org>
# Copyright 2003 - 2015 by Dirk Eddelbuettel <edd@debian.org>
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/langcore.mk
......@@ -61,6 +61,7 @@ endif
# dpkg-parsechangelog -l- --count 1 | \
# 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[^, ]*')
## we use these results for the to-be-installed-in directory
debRlib := $(CURDIR)/debian/$(package)/$(debRdir)
......@@ -82,10 +83,11 @@ lintiandir := $(CURDIR)/debian/$(package)/usr/share/lintian/overrides
## Bug report #782764 with patch by Philipp Rinn building on what we had above
## if no builttimeStamp is supplied, set built-time (to be set in DESCRIPTION)
## to time of created source package based on stamp in changelog.
## See discussion in http://bugs.debian.org/774031
ifeq ($(builttimeStamp),)
builttime := $(shell dpkg-parsechangelog -l$(CURDIR)/debian/changelog | awk -F': ' '/Date/ {print $$2}')
builttimeStamp := "--built-timestamp=\"$(builttime)\""
## See discussion in http://bugs.debian.org/774031
ifeq ($(builttimeStamp),)
builttime := $(shell dpkg-parsechangelog -l$(CURDIR)/debian/changelog | awk -F': ' '/Date/ {print $$2}')
builttimeStamp := "--built-timestamp=\"$(builttime)\""
endif
common-install-indep:: R_any_arch
......@@ -96,7 +98,7 @@ R_any_arch:
dh_installdirs $(debRdir)
##
## support ${R:Depends} via debian/${package}.substvars
echo "R:Depends=r-base-core (>= ${rversion})" >> debian/$(package).substvars
echo "R:Depends=r-base-core (>= ${rversion}), ${rapiversion}" >> debian/$(package).substvars
##
## call R to install the sources we're looking at
## use this inside xvfb-run if this wrapper is installed
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment