[rkward-cvs] SF.net SVN: rkward-code:[4610] trunk/rkward/debian

[tfry at users.sf.net]

Revision: 4610
          http://sourceforge.net/p/rkward/code/4610
Author:   tfry
Date:     2013-03-19 14:27:48 +0000 (Tue, 19 Mar 2013)
Log Message:
-----------
RKWard compiled with R < 3.0.0 won't work with R >= 3.0.0. The other way around may work down to R 2.13.0

Modified Paths:
--------------
    trunk/rkward/debian/changelog
    trunk/rkward/debian/rules

Modified: trunk/rkward/debian/changelog
===================================================================
--- trunk/rkward/debian/changelog	2013-03-18 19:01:10 UTC (rev 4609)
+++ trunk/rkward/debian/changelog	2013-03-19 14:27:48 UTC (rev 4610)
@@ -3,6 +3,7 @@
   * new upstream release
   * re-add Vcs-Browser field
   * fix year in changelog (previous upload had 2012 instead of 2013)
+  * add runtime dependency on r-base-core < 3.0.0 unless compiled with >= 3.0.0
 
  -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Tue, 15 Jan 2013 12:30:00 +0100
 

Modified: trunk/rkward/debian/rules
===================================================================
--- trunk/rkward/debian/rules	2013-03-18 19:01:10 UTC (rev 4609)
+++ trunk/rkward/debian/rules	2013-03-19 14:27:48 UTC (rev 4610)
@@ -122,9 +122,12 @@
 	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
-	@if [ "$(RMAJOR)" -eq "2" ] && [ "$(RMINOR)" -ge "14" ] ; then \
-		echo "rvers=r-base-core (>= 2.9.0)" >> $(CURDIR)/debian/rkward.substvars ; \
+	@if [ "$(RMAJOR)" -eq "3" ] && [ "$(RMINOR)" -ge "0" ] ; then \
+		echo "rvers=r-base-core (>= 2.13.0)" >> $(CURDIR)/debian/rkward.substvars ; \
 	else \
+		if [ "$(RMAJOR)" -eq "2" ] && [ "$(RMINOR)" -ge "14" ] ; then \
+		echo "rvers=r-base-core (>= 2.9.0), r-base-core (<< 3.0.0)" >> $(CURDIR)/debian/rkward.substvars ; \
+	else \
 		if [ "$(RMAJOR)" -eq "2" ] && [ "$(RMINOR)" -ge "9" ] ; then \
 		echo "rvers=r-base-core (<< 2.14.0), r-base-core (>= 2.9.0)" >> $(CURDIR)/debian/rkward.substvars ; \
 	else \
@@ -133,7 +136,7 @@
 	else \
 		if [ "$(RMAJOR)" -eq "2" ] && [ "$(RMINOR)" -ge "7" ] ; then \
 		echo "rvers=r-base-core (<< 2.8.0), r-base-core (>= 2.7.0)" >> $(CURDIR)/debian/rkward.substvars ; \
-	fi ; fi ; fi ; fi
+	fi; fi ; fi ; fi ; fi
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb