Commit f471d744 authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 3.2.3-6

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

  * Rebuilding to now use openjdk-8-jdk (rather than openjdk-7-jdk) as
    keep in sync with the change at the default-jdk package

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

  * debian/icon-class-patch/R.desktop: Add trailing ';' in Categories
    (with thanks to Pino Toscano)			(Closes: #812475)
parent 1ddef88c
r-base (3.2.3-6) unstable; urgency=low
* Rebuilding to now use openjdk-8-jdk (rather than openjdk-7-jdk) as
keep in sync with the change at the default-jdk package
-- Dirk Eddelbuettel <edd@debian.org> Thu, 18 Feb 2016 07:00:11 -0600
r-base (3.2.3-5) unstable; urgency=low
* debian/icon-class-patch/R.desktop: Add trailing ';' in Categories
(with thanks to Pino Toscano) (Closes: #812475)
-- Dirk Eddelbuettel <edd@debian.org> Sun, 24 Jan 2016 21:04:36 -0600
r-base (3.2.3-4) unstable; urgency=low
* debian/r-base-core.postinst: Don't run mktexlsr
......
......@@ -7,4 +7,4 @@ Exec=R
Icon=rlogo_icon
Terminal=true
StartupNotify=false
Categories=Graphics;Science;Math
Categories=Graphics;Science;Math;
......@@ -352,21 +352,23 @@ make-indep-stamp:
## edd 25 Jan 2004 make docs and make html are made in make-arch
## edd 05 Feb 2004 finally, this works in pre-1.9.0 with Kurt's
## R_CMD_BUILD_HELP_OPTS
$(MAKE) docs
$(MAKE) -k docs
(cd doc/manual && $(MAKE) html)
# $(MAKE) html
# $(MAKE) help
$(MAKE) info
(cd doc/manual && \
$(MAKE) refman.pdf R-admin.pdf R-data.pdf R-exts.pdf \
R-FAQ.pdf R-intro.pdf R-ints.pdf R-lang.pdf)
$(MAKE) pdf
$(MAKE) vignettes
$(MAKE) -k pdf
$(MAKE) -k vignettes
touch make-indep-stamp
make: make-stamp
make-stamp: make-arch make-indep
check: make-arch check-stamp
#check: make-arch check-stamp
check: make-stamp check-stamp
check-stamp:
@echo "*** check ***"
#ifneq ($(arch),arm)
......
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