[rkward-cvs] rkward/debian changelog, 1.20, 1.21 control, 1.15, 1.16 files, 1.4, 1.5 rules, 1.13, 1.14

[Thomas Friedrichsmeier]

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

Modified Files:
	changelog control files rules 
Log Message:
Update debian dir

Index: files
===================================================================
RCS file: /cvsroot/rkward/rkward/debian/files,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** files	9 Nov 2005 20:21:37 -0000	1.4
--- files	17 Sep 2006 14:54:03 -0000	1.5
***************
*** 1 ****
! rkward_0.3.5_i386.deb math optional
--- 1 ----
! rkward_0.3.7-1_i386.deb math optional

Index: changelog
===================================================================
RCS file: /cvsroot/rkward/rkward/debian/changelog,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** changelog	19 Jun 2006 10:35:04 -0000	1.20
--- changelog	17 Sep 2006 14:54:03 -0000	1.21
***************
*** 2,8 ****
  
    * 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-4) unstable; urgency=low
--- 2,7 ----
  
    * new upstream release
  
!  -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Sun, 17 Sep 2006 16:40:00 +0200
  
  rkward (0.3.6-4) unstable; urgency=low

Index: rules
===================================================================
RCS file: /cvsroot/rkward/rkward/debian/rules,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** rules	17 May 2006 12:36:14 -0000	1.13
--- rules	17 Sep 2006 14:54:03 -0000	1.14
***************
*** 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
  
  
--- 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
  
  
***************
*** 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
  
--- 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
  

Index: control
===================================================================
RCS file: /cvsroot/rkward/rkward/debian/control,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** control	19 Jun 2006 10:35:04 -0000	1.15
--- control	17 Sep 2006 14:54:03 -0000	1.16
***************
*** 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
--- 19,20 ----