Commit 05b86c71 authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 2.4.0-1

r-base (2.4.0-1) unstable; urgency=low

  * New upstream version released this morning
  
  * debian/rules: Link /usr/share/texmf/tex/latex/R to ../../../R/share/texmf, 
    instead of the older link into /usr/lib 		(Closes: #390751)

r-base (2.4.0~rc20060926-1) unstable; urgency=low

  * First release candidate of the upcoming R 2.4.0 planned for October 3

  * debian/rules: Install ldpaths in /etc/R and link back to $R_HOME/etc
  * debian/rules: Patch javareconf to use /etc/R instead of $R_HOME/etc

r-base (2.4.0~rc20060922-1) unstable; urgency=low

  * First beta release of the upcoming R 2.4.0 planned for October 3

r-base (2.4.0~rc20060919-1) unstable; urgency=low

  * First alpha release of the upcoming R 2.4.0 planned for October 3
  
  * debian/rules: Updated CFLAGS and FFLAGS to -O3, and set LDFLAGS 
    to -Wl,-O1 as suggested by upstream.
  * debian/rules: Additional LDFLAGS options '-Bdirect,--hash-style=both' 
    will be added once binutils support them.
  
  * debian/control: Use a '>=' instead of '=' in Depends: on r-base-core 
    for arch-independent package r-base, r-base-dev, r-recommend [lintian]
parents 2cffb5ef ea4d7e72

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -19,7 +19,7 @@ CC = @CC@
CFLAGS = @CFLAGS@
CPICFLAGS = @CPICFLAGS@
CPPFLAGS = @CPPFLAGS@
DEFS = @DEFS@
DEFS = @DEFS@ @R_DEFS@
DISTDIR_TAR_EXCLUDE = --exclude=.svn --exclude=CVS --exclude=Makefile --exclude="*.o" --exclude="*$(SHLIB_EXT)"
DVIPS = @DVIPS@
DYLIB_EXT = @DYLIB_EXT@
......@@ -43,7 +43,7 @@ INSTALL_DIR = ${INSTALL} -d
JAVA = @JAVA@
JAVA_HOME = @JAVA_HOME@
JAVA_LD_LIBRARY_PATH = @JAVA_LD_LIBRARY_PATH@
JAVA_LIBS = @JAVA_LIBS@
JAVA_LIBS = @JAVA_LIBS0@
JAVAC = @JAVAC@
LATEX = @LATEX@
LDFLAGS = @LDFLAGS@
......
......@@ -100,7 +100,7 @@ install: installdirs svnonly
svnonly:
@if test ! -f "$(srcdir)/doc/FAQ" || test -f non-tarball ; then \
(cd doc/manual && $(MAKE) front-matter) ; \
(cd doc/manual && $(MAKE) front-matter html-non-svn) ; \
touch non-tarball ; \
(cd $(srcdir); LC_ALL=C TZ=GMT svn info || echo "Revision: unknown") 2> /dev/null \
| sed -n -e '/^Revision/p' -e '/^Last Changed Date/'p \
......@@ -157,7 +157,10 @@ distclean: clean
for d in $${rsd}; do (cd $${d} && $(MAKE) $@); done)
-@rm -rf bin include lib library modules gnome
@if test -f non-tarball ; then \
rm -f $(NON_SVN_INSTFILES) non-tarball ; \
rm -f $(NON_SVN_INSTFILES) non-tarball doc/FAQ doc/RESOURCES doc/html/resources.html ; \
fi
@if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
rm -f $(NON_SVN_INSTFILES); \
fi
-@rm -f Makeconf Makefile Makefile.bak Makefrag.* \
config.cache config.log config.status libtool \
......@@ -238,29 +241,30 @@ install-R-framework:
@## the resulting libR will point dyld to the fat libR regardless of its origin
@(cd "$(R_FRAMEWORK_DIR)/Resources/lib" && \
install_name_tool -id "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" $(Rexeclibdir)/libR.dylib)
@(if test -e $(Rexeclibdir)/libRlapack.dylib; then \
find "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/" -name '*.so' -or -name '*.dylib' | \
xargs -n 1 install_name_tool -change \
`otool -L $(Rexeclibdir)/libRlapack.dylib |sed -n -e '2 s/.\(.*\) (compat.*/\1/p'` \
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libRlapack.dylib" ; \
install_name_tool -id "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libRlapack.dylib" \
$(Rexeclibdir)/libRlapack.dylib; \
fi)
@(for lib in Rlapack Rblas R; do \
if test -e "$(Rexeclibdir)/lib$${lib}.dylib"; then echo " lib$${lib}"; \
find "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/" -name '*.so' -or -name '*.dylib' | \
xargs -n 1 install_name_tool -change \
`otool -L $(Rexeclibdir)/lib$${lib}.dylib |sed -n -e '2 s/.\(.*\) (compat.*/\1/p'` \
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" ; \
find "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/" -name '*.so' -or -name '*.dylib' | \
xargs -n 1 install_name_tool -change lib$${lib}.dylib \
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" ; \
install_name_tool -id "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" \
"$(Rexeclibdir)/lib$${lib}.dylib"; \
if [ "$(Rexeclibdir)" != "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib" ]; then \
$(srcdir)/tools/updatefat "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" "$(Rexeclibdir)/lib$${lib}.dylib"; \
install_name_tool -id "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" \
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib"; \
fi; \
fi; \
done)
@(cp -R $(srcdir)/src/include $(R_FRAMEWORK_DIR)/Versions/Current/PrivateHeaders && \
cp src/include/config.h $(R_FRAMEWORK_DIR)/Versions/Current/PrivateHeaders/ && \
find $(R_FRAMEWORK_DIR)/Versions/Current/PrivateHeaders -name .svn | xargs rm -rf)
@(install_name_tool -change libR.dylib \
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" \
$(Rexecbindir2)/R)
@(find "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/" -name '*.so' -exec install_name_tool \
-change libR.dylib "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" \{\} \;)
@(if [ "$(Rexeclibdir)" != "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib" ]; then \
$(srcdir)/tools/updatefat "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" "$(Rexeclibdir)/libR.dylib"; \
if [ -e "$(Rexeclibdir)/libRlapack.dylib" ]; then \
$(srcdir)/tools/updatefat "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libRlapack.dylib" "$(Rexeclibdir)/libRlapack.dylib"; \
fi \
fi )
@(if [ -n "${R_ARCH}" ]; then \
if [ "${R_ARCH}" != /ppc -a "${R_ARCH}" != /i386 -a "${R_ARCH}" != /ppc64 ]; then \
echo "\
......@@ -269,7 +273,8 @@ install-R-framework:
for f in `ls "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Headers/${R_ARCH}/"*.h|xargs basename`; do \
echo "/* This is an automatically generated universal stub for architecture-dependent headers. */~#ifdef __i386__~#include <i386/$$f>~#else~#ifdef __ppc__~#include <ppc/$$f>~#else~#ifdef __ppc64__~#include <ppc64/$$f>~#else~#error Cannot determine the correct architecture. To force a certain configuration, include architecture-specific include path *before* general R headers path.~#endif~#endif~#endif" |sed -e 'y/~/\n/' > "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Headers/$$f"; \
done; \
fi \
fi; \
fi )
@( echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>~<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">~<plist version=\"1.0\">~<dict>~ <key>CFBundleIdentifier</key>~ <string>org.r-project.R-framework</string>~ <key>CFBundleInfoDictionaryVersion</key>~ <string>6.0</string>~ <key>CFBundleName</key>~ <string>R</string>~ <key>CFBundlePackageType</key>~ <string>FMWK</string>~ <key>CFBundleVersion</key>~ <string>$(VERSION)</string>~</dict>~</plist>" |sed -e 'y/~/\n/' > $(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/Info.plist)
TAGS:
This diff is collapsed.
Revision: 38247
Last Changed Date: 2006-06-01
Revision: 39566
Last Changed Date: 2006-10-03
......@@ -48,10 +48,15 @@
## Debugging and optimization options for the C compiler.
## Use this to specify CFLAGS for the version of the C compiler
## specified above.
## If unspecified, defaults to '-g -O2 -std=c99' for gcc,
## If unspecified, defaults to '-g -O2 -std=gnu99' for gcc,
## and '-g' in all other cases except icc (for which see R-admin.html).
## CFLAGS=
## Defines for C compilation.
## Use this to specify defines to be used in the compilation of R,
## e.g. -DUSE_TYPE_CHECKING_STRICT
## DEFS=
## The following additional CFLAGS to be used only in the main
## compilation and only in building shared libraries respectively.
## For example, on some systems one needs 'MAIN_CFLAGS=-pg' when
......
This diff is collapsed.
This diff is collapsed.
r-base (2.4.0-1) unstable; urgency=low
* New upstream version released this morning
* debian/rules: Link /usr/share/texmf/tex/latex/R to ../../../R/share/texmf,
instead of the older link into /usr/lib (Closes: #390751)
-- Dirk Eddelbuettel <edd@debian.org> Tue, 3 Oct 2006 07:07:02 -0500
r-base (2.4.0~rc20060926-1) unstable; urgency=low
* First release candidate of the upcoming R 2.4.0 planned for October 3
* debian/rules: Install ldpaths in /etc/R and link back to $R_HOME/etc
* debian/rules: Patch javareconf to use /etc/R instead of $R_HOME/etc
-- Dirk Eddelbuettel <edd@debian.org> Thu, 28 Sep 2006 20:15:03 -0500
r-base (2.4.0~rc20060922-1) unstable; urgency=low
* First beta release of the upcoming R 2.4.0 planned for October 3
-- Dirk Eddelbuettel <edd@debian.org> Sat, 23 Sep 2006 10:59:39 -0500
r-base (2.4.0~rc20060919-1) unstable; urgency=low
* First alpha release of the upcoming R 2.4.0 planned for October 3
* debian/rules: Updated CFLAGS and FFLAGS to -O3, and set LDFLAGS
to -Wl,-O1 as suggested by upstream.
* debian/rules: Additional LDFLAGS options '-Bdirect,--hash-style=both'
will be added once binutils support them.
* debian/control: Use a '>=' instead of '=' in Depends: on r-base-core
for arch-independent package r-base, r-base-dev, r-recommend [lintian]
-- Dirk Eddelbuettel <edd@debian.org> Tue, 19 Sep 2006 14:51:47 -0500
r-base (2.3.1-3) unstable; urgency=low
* debian/r-doc-html.preinst: Apply one-char fix suggested by
......
......@@ -8,7 +8,7 @@ Build-Depends: gcc (>= 4:4.0), gfortran (>= 4.0.2), refblas3-dev | atlas3-base-d
Package: r-base
Architecture: all
Depends: r-base-core (= ${Source-Version}), r-recommended (= ${Source-Version})
Depends: r-base-core (>= ${Source-Version}), r-recommended (= ${Source-Version})
Recommends: r-base-html, r-base-latex
Suggests: ess, r-doc-info | r-doc-pdf | r-doc-html
Description: GNU R statistical computing language and environment
......@@ -65,7 +65,7 @@ Description: GNU R core of statistical computing language and environment
Package: r-base-dev
Architecture: all
Section: devel
Depends: r-base-core (= ${Source-Version}), refblas3-dev | atlas3-base-dev | libblas-3.so, build-essential, gfortran (>= 4.0.2), gcc (>= 4:4.0), g++ (>= 4:4.0), libncurses5-dev, libreadline5-dev, libjpeg62-dev, libpcre3-dev, libpng12-dev, zlib1g-dev, libbz2-dev
Depends: r-base-core (>= ${Source-Version}), refblas3-dev | atlas3-base-dev | libblas-3.so, build-essential, gfortran (>= 4.0.2), gcc (>= 4:4.0), g++ (>= 4:4.0), libncurses5-dev, libreadline5-dev, libjpeg62-dev, libpcre3-dev, libpng12-dev, zlib1g-dev, libbz2-dev
Description: GNU R installation of auxiliary GNU R packages
R is `GNU S' - A language and environment for statistical computing
and graphics. R is similar to the award-winning S system, which was
......@@ -219,7 +219,7 @@ Description: GNU R info manuals statistical computing system
Package: r-recommended
Architecture: all
Depends: r-base-core (= ${Source-Version}), r-cran-boot (>= 1.2.19), r-cran-cluster (>= 1.9.6-2), r-cran-foreign (>= 0.7-2), r-cran-kernsmooth (>= 2.2.14), r-cran-lattice (>= 0.10.11), r-cran-mgcv (>= 1.1.5), r-cran-nlme (>= 3.1.52), r-cran-rpart (>= 3.1.20), r-cran-survival (>= 2.13.2-1), r-cran-vr (>= 7.2.8)
Depends: r-base-core (>= ${Source-Version}), r-cran-boot (>= 1.2.19), r-cran-cluster (>= 1.9.6-2), r-cran-foreign (>= 0.7-2), r-cran-kernsmooth (>= 2.2.14), r-cran-lattice (>= 0.10.11), r-cran-mgcv (>= 1.1.5), r-cran-nlme (>= 3.1.52), r-cran-rpart (>= 3.1.20), r-cran-survival (>= 2.13.2-1), r-cran-vr (>= 7.2.8)
Description: GNU R collection of recommended packages [metapackage]
R is `GNU S' - A language and environment for statistical computing
and graphics. R is similar to the award-winning S system, which was
......
--- javareconf.orig 2006-09-12 21:05:05.000000000 -0500
+++ javareconf 2006-09-28 16:37:37.000000000 -0500
@@ -128,9 +128,13 @@
if test "${dry_run}" = yes; then exit 0; fi
-echo "Updating Java configuration in ${R_HOME}"
+## edd 28 Sep 2006 Debian's R config is in /etc/R, so overrride where R_HOME was used
-files="${R_HOME}/etc${R_ARCH}/Makeconf ${R_HOME}/etc${R_ARCH}/ldpaths"
+#echo "Updating Java configuration in ${R_HOME}"
+echo "Updating Java configuration in /etc/R"
+
+#files="${R_HOME}/etc${R_ARCH}/Makeconf ${R_HOME}/etc${R_ARCH}/ldpaths"
+files="/etc/R/Makeconf /etc/R/ldpaths"
for file in $files; do
${SED} -e "s|JAVA =.\{0,\}|JAVA = $JAVA|" -e "s|JAVA_HOME =.\{0,\}|JAVA_HOME = ${JAVA_HOME}|" -e "s|: \${JAVA_HOME=.\{1,\}|: \${JAVA_HOME=${JAVA_HOME}}|" -e "s|: \${R_JAVA_LD_LIBRARY_PATH=.\{1,\}|: \${R_JAVA_LD_LIBRARY_PATH=${JAVA_LD_LIBRARY_PATH_SH}}|" -e "s|JAVA_LIBS =.\{0,\}|JAVA_LIBS = ${JAVA_LIBS}|g" -e "s|JAVA_LD_LIBRARY_PATH =.\{0,\}|JAVA_LD_LIBRARY_PATH = ${JAVA_LD_LIBRARY_PATH}|" "$file" > "${file}.new"
if test -f "${file}.new"; then
......@@ -73,7 +73,7 @@ lapack = --with-lapack=no
fortrancompiler = F77=gfortran
compiler = gcc
cxxcompiler = g++
optimflags = -O2 -pipe
optimflags = -O3 -pipe
# edd 04 Sep 2001 default compiler flags, lowered for m68k
#compilerflags = -O2
......@@ -121,6 +121,10 @@ cflags = -std=gnu99 $(optimflags)
cxxflags = $(optimflags)
fcflags = $(optimflags)
## edd 17 Sep 2006 suggested by Brian Ripley in email dated 15 Sep 2006
#ldflags = -Wl,-O1,-Bdirect,--hash-style=both
ldflags = -Wl,-O1
maketest:
@echo "Hi $(arch)"
@echo "$(findstring $(arch), i486 hppa arm)"
......@@ -215,6 +219,7 @@ make-arch-stamp:
CC=${compiler} \
CXX=${cxxcompiler} \
${fortrancompiler} \
LDFLAGS="$(ldflags)" \
R
# the top-level 'make stamp-recommended' target implies 'make docs'
......@@ -361,8 +366,9 @@ install-arch-stamp:
done)
# edd 25 Sep 2005 link TeX files into texmf
# edd 03 Oct 2006 use link into /usr/share/, not /usr/lib/
(cd $(debtmp)/usr/share/texmf/tex/latex && \
ln -s ../../../../lib/R/share/texmf R)
ln -s ../../../R/share/texmf R)
# that being done, now install in different sub-packages
......@@ -435,18 +441,25 @@ install-arch-stamp:
# edd 24 Apr 2004 patch Renviron for R_PAPERSIZE (bug #245525)
# edd 16 Jun 2004 nope, doesn't work
# edd 09 Apr 2005 also move the new file repositories to /etc/R
# edd 24 Sep 2006 idem for ldpaths
(cd $(debetc); \
cat $(debbase)/Renviron-R_LIBS.patch | patch --verbose; \
mv Makeconf Renviron repositories \
mv Makeconf Renviron repositories ldpaths \
../../../../etc/R/; \
ln -s /etc/R/Makeconf .; \
ln -s /etc/R/Renviron .; \
ln -s /etc/R/ldpaths .; \
ln -s /etc/R/repositories . )
# cat $(debbase)/Renviron-R_PAPERSIZE.patch | patch --verbose;
# deal with build.help.pl's --htmllists argument
(cd $(debtmp)/usr/share/R/share/perl; \
cat $(debbase)/build-help.pl.patch | patch --verbose )
# edd 28 Sep 2006 patch javareconf to modify in /etc/R
(cd $(debtmp)/usr/lib/R/bin; \
cat $(debbase)/javareconf.patch | patch --verbose )