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

[Thomas Friedrichsmeier]

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

Modified Files:
	control rules 
Log Message:
Futher fixes to .deb

Index: rules
===================================================================
RCS file: /cvsroot/rkward/rkward/debian/rules,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** rules	21 Apr 2006 14:46:47 -0000	1.10
--- rules	21 Apr 2006 15:11:59 -0000	1.11
***************
*** 105,109 ****
  #	dh_installcron
  #	dh_installinfo
! 	dh_installman debian/rkward.1
  	dh_link
  	dh_strip
--- 105,109 ----
  #	dh_installcron
  #	dh_installinfo
! 	dh_installman debian/rkward.1 debian/rkward.bin.1
  	dh_link
  	dh_strip
***************
*** 117,121 ****
  	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
--- 117,126 ----
  	dh_shlibdeps
  	# unfortunately, the r-base-core dependency can not be found by dh_shlibdeps, so we need to get at the version manually
! 	RVERS=`dpkg-query -W -f='$${Version}' r-base-core`
! 	@if [[ "$(RVERS)" > "2.2.1.svn37823" ]] ; then \
! 		echo "rvers=r-base-core (>= 2.2.1.svn37824)" >> $(CURDIR)/debian/rkward.substvars ; \
! 	else \
! 		echo "rvers=r-base-core (<= 2.2.1-6), r-base-core (>= 2.1.0)" >> $(CURDIR)/debian/rkward.substvars ; \
! 	fi
  	dh_gencontrol
  	dh_md5sums

Index: control
===================================================================
RCS file: /cvsroot/rkward/rkward/debian/control,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** control	21 Apr 2006 14:46:47 -0000	1.12
--- control	21 Apr 2006 15:11:59 -0000	1.13
***************
*** 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
--- 8,12 ----
  Package: rkward
  Architecture: any
! Depends: php4-cli, ${rvers}, ${shlibs:Depends}
  Recommends: r-base-html
  Description: a KDE frontend to the R statistics language