[rkward-cvs] rkward/debian control,1.11,1.12 rules,1.9,1.10

[Thomas Friedrichsmeier]

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

Modified Files:
	control rules 
Log Message:
Fix generation of manpage link, fix detection of R dependency

Index: rules
===================================================================
RCS file: /cvsroot/rkward/rkward/debian/rules,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** rules	21 Apr 2006 12:44:29 -0000	1.9
--- rules	21 Apr 2006 14:46:47 -0000	1.10
***************
*** 61,65 ****
  install: build
  	# Link manpage for rkward.bin to rkward
! 	ln -s rkward.1 rkward.bin.1
  
  	dh_testdir
--- 61,67 ----
  install: build
  	# Link manpage for rkward.bin to rkward
! 	@if test ! -e "$(CURDIR)/debian/rkward.bin.1" ; then \
! 		ln -s $(CURDIR)/debian/rkward.1 $(CURDIR)/debian/rkward.bin.1; \
! 	fi
  
  	dh_testdir
***************
*** 114,117 ****
--- 116,121 ----
  	dh_installdeb
  	dh_shlibdeps
+ 	# unfortunately, the r-base-core dependency can not be found by dh_shlibdeps, so we need to get at the version manually
+ 	echo "rvers="`dpkg-query -W -f='$${Version}' r-base-core` >> $(CURDIR)/debian/rkward.substvars
  	dh_gencontrol
  	dh_md5sums

Index: control
===================================================================
RCS file: /cvsroot/rkward/rkward/debian/control,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** control	21 Apr 2006 12:44:29 -0000	1.11
--- control	21 Apr 2006 14:46:47 -0000	1.12
***************
*** 8,12 ****
  Package: rkward
  Architecture: any
! Depends: php4-cli, ${shlibs:Depends}
  Recommends: r-base-html
  Description: a KDE frontend to the R statistics language
--- 8,12 ----
  Package: rkward
  Architecture: any
! Depends: php4-cli, r-base-core (= ${rvers}) ${shlibs:Depends}
  Recommends: r-base-html
  Description: a KDE frontend to the R statistics language