[rkward-cvs] SF.net SVN: rkward:[3999] trunk/rkward

[tfry at users.sourceforge.net]

Revision: 3999
          http://rkward.svn.sourceforge.net/rkward/?rev=3999&view=rev
Author:   tfry
Date:     2011-10-25 13:06:29 +0000 (Tue, 25 Oct 2011)
Log Message:
-----------
Merge r3998 from release branch

Revision Links:
--------------
    http://rkward.svn.sourceforge.net/rkward/?rev=3998&view=rev

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

Property Changed:
----------------
    trunk/rkward/
    trunk/rkward/debian/


Property changes on: trunk/rkward
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2010_10_18_backend_restructuring_branch:3130-3196
/branches/release_branch_0.5.4:3098-3102,3127
/branches/release_branch_0.5.7:3913,3979-3980
   + /branches/2010_10_18_backend_restructuring_branch:3130-3196
/branches/release_branch_0.5.4:3098-3102,3127
/branches/release_branch_0.5.7:3913,3979-3980,3998


Property changes on: trunk/rkward/debian
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2010_10_18_backend_restructuring_branch/debian:3130-3196
/branches/release_branch_0.5.4:3098-3102
/branches/release_branch_0.5.4/debian:3098-3102
/branches/release_branch_0.5.7/debian:3913,3979-3980
   + /branches/2010_10_18_backend_restructuring_branch/debian:3130-3196
/branches/release_branch_0.5.4:3098-3102
/branches/release_branch_0.5.4/debian:3098-3102
/branches/release_branch_0.5.7/debian:3913,3979-3980,3998

Modified: trunk/rkward/debian/changelog
===================================================================
--- trunk/rkward/debian/changelog	2011-10-25 12:54:44 UTC (rev 3998)
+++ trunk/rkward/debian/changelog	2011-10-25 13:06:29 UTC (rev 3999)
@@ -2,8 +2,16 @@
 
   * new upstream release
 
- -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Mon, 24 Oct 2011 15:30:00 +0200
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Mon, 25 Oct 2011 15:30:00 +0200
 
+rkward (0.5.7-2) unstable; urgency=low
+
+  * new upload to force rebuild against R 2.14.0~x on i386
+    closes: #646047 (failure to load rkward package)
+  * add dependency on r-base-core < 2.14 if built against R < 2.14.0
+
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Tue, 25 Oct 2011 14:30:00 +0200
+
 rkward (0.5.7-1) unstable; urgency=low
 
   * new upstream release

Modified: trunk/rkward/debian/rules
===================================================================
--- trunk/rkward/debian/rules	2011-10-25 12:54:44 UTC (rev 3998)
+++ trunk/rkward/debian/rules	2011-10-25 13:06:29 UTC (rev 3999)
@@ -130,15 +130,18 @@
 	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 "9" ] ; then \
+	@if [ "$(RMAJOR)" -eq "2" ] && [ "$(RMINOR)" -ge "14" ] ; then \
 		echo "rvers=r-base-core (>= 2.9.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 \
 		if [ "$(RMAJOR)" -eq "2" ] && [ "$(RMINOR)" -ge "8" ] ; then \
 		echo "rvers=r-base-core (<< 2.9.0), r-base-core (>= 2.8.0)" >> $(CURDIR)/debian/rkward.substvars ; \
 	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
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.