Commit aa0d69d5 authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 3.2.3-3

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

  * debian/control: Also add 'gcc-4.9 [mips]' to Depends: for r-base-core
    to ensure compiler is present on installed system (thanks, Sébastien)
 
  * debian/rules: Set 'R_GZIPCMD=gzip -n' to avoid a Lintian warning about
    gzip files with timestamps

  * debian/rules: No longer install menu file (and we have a desktop file)
parent 7ac0f474
r-base (3.2.3-3) unstable; urgency=low
* debian/control: Also add 'gcc-4.9 [mips]' to Depends: for r-base-core
to ensure compiler is present on installed system (thanks, Sébastien)
* debian/rules: Set 'R_GZIPCMD=gzip -n' to avoid a Lintian warning about
gzip files with timestamps
* debian/rules: No longer install menu file (and we have a desktop file)
-- Dirk Eddelbuettel <edd@debian.org> Tue, 12 Jan 2016 12:51:40 -0600
r-base (3.2.3-2) unstable; urgency=low
[ Sébastien Villemot ]
......
......@@ -45,7 +45,7 @@ Description: GNU R statistical computation and graphics system
Package: r-base-core
Architecture: any
Depends: ${misc:Depends}, ${perl:Depends}, zip, unzip, libpaper-utils, xdg-utils, ${shlibs:Depends}, ucf (>= 3.0), ca-certificates
Depends: ${misc:Depends}, ${perl:Depends}, zip, unzip, libpaper-utils, xdg-utils, ${shlibs:Depends}, ucf (>= 3.0), ca-certificates, gcc-4.9 [mips]
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-3
Conflicts: r-gnome, r-cran-rcompgen, r-base-latex
......
etc/R
etc/ld.so.conf.d
etc/bash_completion.d
usr/share/bash-completion/completions
usr/bin
usr/lib/R
usr/lib/R/site-library
......
......@@ -20,14 +20,14 @@ case "$1" in
tmpRenviron=$(mktemp)
chmod 0644 "$tmpRenviron"
cat /usr/lib/R/etc/Renviron.ucf > "$tmpRenviron"
if [ -x /usr/bin/paperconf ]; then
#if [ -x /usr/bin/paperconf ]; then
## get the value we want from Debian's paperconf utility
papersize=`paperconf`
## have perl subst. second expression with $papersize for first
## uses the x mod. and curlies to denote the usual s|1st|2nd|
perl -p -i -e "s{^R_PAPERSIZE_USER=\\$\{R_PAPERSIZE\}}
{R_PAPERSIZE_USER=\\$\{R_PAPERSIZE-'$papersize'\}}x" "$tmpRenviron"
fi
#fi
# edd 21 Jun 2008 whether or not Renviron was modified, ucf will handle it,
# so tell ucf that file Renviron.ucf is the source for
# conffile in /etc and register it
......@@ -35,9 +35,9 @@ case "$1" in
ucfr r-base-core /etc/R/Renviron
rm -f "$tmpRenviron"
#
if [ -x /usr/bin/update-menus ]; then
update-menus
fi
#if [ -x /usr/bin/update-menus ]; then
# update-menus
#fi
# edd 03 Apr 2003 cf Section 10.1.2 of Debian Policy
if [ ! -e /usr/local/lib/R ]; then
......@@ -53,9 +53,9 @@ case "$1" in
fi
fi
if [ -x /usr/bin/mktexlsr ]; then
#if [ -x /usr/bin/mktexlsr ]; then
mktexlsr /usr/share/texmf
fi
#fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
......
......@@ -245,6 +245,7 @@ configure-stamp:
dh_testdir
R_PAPERSIZE=letter \
R_BROWSER=xdg-open \
R_GZIPCMD="gzip -n" \
PAGER=/usr/bin/pager \
PERL=/usr/bin/perl \
JAVA_HOME=/usr/lib/jvm/default-java \
......@@ -303,6 +304,7 @@ make-arch-stamp:
${fortrancompiler} \
LDFLAGS="$(ldflags)" \
PKG_BUILT_STAMP="$(buildtimestamp)" \
R_GZIPCMD="gzip -n" \
R
# the top-level 'make stamp-recommended' target implies 'make docs'
......@@ -324,6 +326,7 @@ make-arch-stamp:
CC=${compiler} \
CXX=${cxxcompiler} \
${fortrancompiler} \
R_GZIPCMD="gzip -n" \
libRmath_la_LDFLAGS=-Wl,-soname,libRmath.so.$(somaj) \
shared static )
......@@ -333,7 +336,8 @@ make-arch-stamp:
# edd 15 Jan 2004 make install needs html docs
# edd 25 Jan 2004 not needed as we have 'make docs'
## make html
$(MAKE) docs R_CMD_BUILD_HELP_OPTS="--txt --example"
R_GZIPCMD="gzip -n" \
$(MAKE) docs R_CMD_BUILD_HELP_OPTS="--txt --example"
# edd 26 Mar 2013
$(MAKE) javaconf
......@@ -569,7 +573,10 @@ install-arch-stamp:
#install -m 0644 debian/R.bash_completion \
# debian/$(corepackage)/etc/bash_completion.d/R
# edd 24 Mar 2014 now installs via dh_bash-completion
dh_bash-completion
#dh_bash-completion
# edd 12 Jan 2016 new location
install -m 0644 debian/R.bash-completion \
debian/$(corepackage)/usr/share/bash-completion/completions/R
# edd 02 May 2007 add libR.conf for ld.so
# edd 13 Sep 2009 no more under Policy 3.8.3
......@@ -673,7 +680,7 @@ binary-arch: build-arch install-arch
#dh_installexamples -a
#dh_installexamples -p$(corepackage) src/nmath/standalone/test.c
dh_installexamples -p$(nmathpackage) src/nmath/standalone/test.c
dh_installmenu -a
#dh_installmenu -a
#dh_installemacsen -a
#dh_installpam -a
#dh_installmime -a
......
......@@ -27,7 +27,7 @@ all: Makefile DESCRIPTION
@$(MAKE) mksrc
@BYTE_COMPILE_PACKAGES_FALSE@ @$(MAKE) mklazy
@BYTE_COMPILE_PACKAGES_TRUE@ @$(MAKE) mklazycomp
@$(R_GZIPCMD) -9f $(top_builddir)/library/grDevices/afm/*.afm
@$(R_GZIPCMD) -9nf $(top_builddir)/library/grDevices/afm/*.afm
mkR: mkR1
......
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