Commit 6fb7fcb4 authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 2.15.2-2

r-base (2.15.2-2) unstable; urgency=low

  * debian/control: Switch Build-Depends: from libtiff4-dev to libtiff5-dev

  * debian/control: Set Standards-Version: to current version 

  * debian/rules: Generate md5sums for all files 	(Closes: #700381)
  * debian/r-base-core.postinst: Modied ucf file treatment to avoid
    triggering md5sum changes (with thanks to Andreas Beckman)
parent 9368c2f9
r-base (2.15.2-2) unstable; urgency=low
* debian/control: Switch Build-Depends: from libtiff4-dev to libtiff5-dev
* debian/control: Set Standards-Version: to current version
* debian/rules: Generate md5sums for all files (Closes: #700381)
* debian/r-base-core.postinst: Modied ucf file treatment to avoid
triggering md5sum changes (with thanks to Andreas Beckman)
-- Dirk Eddelbuettel <edd@debian.org> Sat, 23 Feb 2013 11:11:51 -0600
r-base (2.15.2-1) unstable; urgency=low
* New upstream release
......
......@@ -2,8 +2,8 @@ Source: r-base
Section: gnu-r
Priority: optional
Maintainer: Dirk Eddelbuettel <edd@debian.org>
Standards-Version: 3.9.3
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.5-dev, tk8.5-dev, bison, groff-base, libncurses5-dev, libreadline-dev, debhelper (>= 7.2.3), texi2html, texinfo (>= 4.1-2), libbz2-dev, liblzma-dev, libpcre3-dev, xdg-utils, zlib1g-dev, libpng-dev, libjpeg-dev, libx11-dev, libxt-dev, x11proto-core-dev, libpango1.0-dev, libcairo2-dev, libtiff4-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, texinfo, texi2html, default-jdk [!arm !hppa !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !mips], mpack
Standards-Version: 3.9.4
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.5-dev, tk8.5-dev, bison, groff-base, libncurses5-dev, libreadline-dev, debhelper (>= 7.2.3), texi2html, texinfo (>= 4.1-2), libbz2-dev, liblzma-dev, libpcre3-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, texinfo, texi2html, default-jdk [!arm !hppa !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !mips], mpack
Homepage: http://www.r-project.org/
Package: r-base
......
......@@ -11,32 +11,27 @@ set -e
case "$1" in
configure)
# edd 19 June 2004 deal with papersize
# edd 22 June 2004 make that conditional on paperconf
# edd 19 Jun 2004 deal with papersize
# edd 22 Jun 2004 make that conditional on paperconf
# edd 25 Oct 2006 rewritten for R 2.4.0 and R_PAPERSIZE_USER
# edd 21 Jun 2008 rewritten for R 2.7.1 and ucf input
# edd 23 Feb 2013 trying to avoid md5sum issues with help from Andy Beckman
tmpRenviron=$(mktemp)
cat /usr/lib/R/etc/Renviron.ucf > $tmpRenviron
if [ -x /usr/bin/paperconf ]; then
## get the value we want from Debian's paperconf utility
papersize=`paperconf`
## this is the file we need to set it in
#Renviron=/etc/R/Renviron
Renviron=/usr/lib/R/etc/Renviron.ucf
if [ -f $Renviron ]; then
## test if the file is unmodified `as shipped'
if grep -q -E "^R_PAPERSIZE_USER=\\$\{R_PAPERSIZE\}" $Renviron; then
echo "Setting R_PAPERSIZE_USER default to '$papersize'"
## 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" $Renviron
fi
fi
## 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
# 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
ucf /usr/lib/R/etc/Renviron.ucf /etc/R/Renviron
ucf $tmpRenviron /etc/R/Renviron
ucfr r-base-core /etc/R/Renviron
rm -f $tmpRenviron
#
if [ -x /usr/bin/update-menus ]; then
update-menus
......
......@@ -611,7 +611,7 @@ binary-indep: build-indep install-indep
dh_installdeb -i
#dh_perl -i
dh_gencontrol -i
dh_md5sums -i -X'usr/bin/R'
dh_md5sums -i
dh_builddeb -i
# Build architecture-dependent files here.
......@@ -653,8 +653,8 @@ binary-arch: build-arch install-arch
$(debbase)/$(recdpackage)/usr/share/lintian/overrides/$(recdpackage)
install -p -m 0644 debian/$(nmathpackage).lintian \
$(debbase)/$(nmathpackage)/usr/share/lintian/overrides/$(nmathpackage)
install -p -m 0644 debian/$(dbugpackage).lintian \
$(debbase)/$(dbugpackage)/usr/share/lintian/overrides/$(dbugpackage)
# install -p -m 0644 debian/$(dbugpackage).lintian \
# $(debbase)/$(dbugpackage)/usr/share/lintian/overrides/$(dbugpackage)
#dh_undocumented -a
dh_installchangelogs -a -k NEWS
# dh_strip -a
......@@ -678,12 +678,7 @@ binary-arch: build-arch install-arch
# cat debian/r-recommended.substvars
# echo "*** Done ***"
dh_gencontrol -a
dh_md5sums -a -X'usr/bin/R' -X'usr/bin/Rscript' \
-X'usr/lib/debug/usr/bin/Rscript' \
-X'usr/lib/R/bin/Rscript' \
-X'usr/lib/R/etc/Renviron.ucf' \
-XLibIndex -Xindex.txt \
-Xfunction.html -Xpackages.html
dh_md5sums -a
dh_builddeb -a
#binary: binary-indep binary-arch install-arch install-indep
......
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