[rkward-cvs] rkward/debian changelog,1.14,1.15 rules,1.7,1.8

[Thomas Friedrichsmeier]

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

Modified Files:
	changelog rules 
Log Message:
ignore additional installs of R, when building .deb

Index: rules
===================================================================
RCS file: /cvsroot/rkward/rkward/debian/rules,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rules	14 Apr 2006 16:26:35 -0000	1.7
--- rules	20 Apr 2006 22:02:09 -0000	1.8
***************
*** 28,32 ****
  	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
  
  
--- 28,32 ----
  	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
  
  
***************
*** 76,80 ****
  	# install the rkward R package to installation directory
  	dh_installdirs usr/lib/R/site-library
! 	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
  
--- 76,80 ----
  	# 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
  

Index: changelog
===================================================================
RCS file: /cvsroot/rkward/rkward/debian/changelog,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** changelog	20 Apr 2006 12:34:17 -0000	1.14
--- changelog	20 Apr 2006 22:02:09 -0000	1.15
***************
*** 2,5 ****
--- 2,6 ----
  
    * new upstream release
+   * specify --with-r-home in ./configure, in case there is more than one version of R installed
  
   -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Sun, 23 Apr 2006 15:45:00 +0200