[rkward-cvs] rkward/debian changelog,1.18,1.19 control,1.13,1.14 rules,1.12,1.13

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/debian
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29172/debian

Modified Files:
	changelog control rules 
Log Message:
Add configuration option for R package library tree location
Do not write to /tmp during build/install, but rather create a tmp-dir in the source tree (avoid sandbox violation)

Index: rules
===================================================================
RCS file: /cvsroot/rkward/rkward/debian/rules,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** rules	25 Apr 2006 10:42:27 -0000	1.12
--- rules	17 May 2006 12:36:14 -0000	1.13
***************
*** 24,29 ****
  config.status: configure
  	dh_testdir
  	# Add here commands to configure the package.
! 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-rpath --with-r-home=/usr/lib/R
  
  
--- 24,31 ----
  config.status: configure
  	dh_testdir
+ 	dh_installdirs usr/lib/R/site-library
+ 
  	# Add here commands to configure the package.
! 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-rpath --with-r-home=/usr/lib/R --with-r-libdir=/usr/lib/R/site-library
  
  
***************
*** 67,73 ****
  	rm -vf $(CURDIR)/debian/rkward/usr/share/apps/katepart/syntax/r.xml
  	
! 	# install the rkward R package to installation directory
! 	dh_installdirs usr/lib/R/site-library
! 	/usr/bin/R CMD INSTALL -l $(CURDIR)/debian/rkward/usr/lib/R/site-library rkward/rbackend/rpackages/rkward
  	rm -vf $(CURDIR)/debian/rkward/usr/lib/R/site-library/R.css $(CURDIR)/debian/rkward/usr/lib/R/site-library/rkward/COPYING
  
--- 69,73 ----
  	rm -vf $(CURDIR)/debian/rkward/usr/share/apps/katepart/syntax/r.xml
  	
! 	# fix up the rkward R package installation
  	rm -vf $(CURDIR)/debian/rkward/usr/lib/R/site-library/R.css $(CURDIR)/debian/rkward/usr/lib/R/site-library/rkward/COPYING
  

Index: control
===================================================================
RCS file: /cvsroot/rkward/rkward/debian/control,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** control	21 Apr 2006 15:11:59 -0000	1.13
--- control	17 May 2006 12:36:14 -0000	1.14
***************
*** 19,20 ****
--- 19,22 ----
   RKWard is still in development status. Right now it is most useful as an IDE
   to users with some experience in R, or willing to learn R.
+  .
+  Homepage: http://rkward.sourceforge.net

Index: changelog
===================================================================
RCS file: /cvsroot/rkward/rkward/debian/changelog,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** changelog	25 Apr 2006 10:42:26 -0000	1.18
--- changelog	17 May 2006 12:36:14 -0000	1.19
***************
*** 1,4 ****
--- 1,14 ----
+ rkward (0.3.7-1) unstable; urgency=low
+ 
+   * new upstream release
+   * upstream now supports installing to a specified R library tree, use that feature
+ 
+  -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Tue, 10 May 2006 18:45:00 +0200
+ 
  rkward (0.3.6-3) unstable; urgency=low
  
+   * first version to be uploaded to debian
+     closes: #333392
+   * Added Homepage to control file (changed by R.M.Rutschmann <rudi at debian.org>)
    * fix detection of r-base-core dependency when compiled with r-base-core >= 2.3.0
    * clean up rules somewhat