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

[tfry at users.sourceforge.net]

Revision: 1397
          http://svn.sourceforge.net/rkward/?rev=1397&view=rev
Author:   tfry
Date:     2007-02-15 10:41:37 -0800 (Thu, 15 Feb 2007)

Log Message:
-----------
Correct debian rules shell logic, and finalize changelog

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

Modified: trunk/rkward/debian/changelog
===================================================================
--- trunk/rkward/debian/changelog	2007-02-15 18:16:01 UTC (rev 1396)
+++ trunk/rkward/debian/changelog	2007-02-15 18:41:37 UTC (rev 1397)
@@ -3,7 +3,7 @@
   * new upstream release
   * update r-base-core dependencies
 
- -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  XXX, XX Feb 2007 XX:00:00 +0200
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Thu, 15 Feb 2007 19:30:00 +0200
 
 rkward (0.4.5-1) unstable; urgency=low
 

Modified: trunk/rkward/debian/rules
===================================================================
--- trunk/rkward/debian/rules	2007-02-15 18:16:01 UTC (rev 1396)
+++ trunk/rkward/debian/rules	2007-02-15 18:41:37 UTC (rev 1397)
@@ -105,13 +105,17 @@
 	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 [[ "$(RVERS)" > "2.4.9" ]] ; then \
-		echo "rvers=r-base-core (> 2.4.9)" >> $(CURDIR)/debian/rkward.substvars ; \
-	else if [[ "$(RVERS)" > "2.3.9" ]] ; then \
-		echo "rvers=r-base-core (<= 2.4.9), r-base-core (> 2.3.9)" >> $(CURDIR)/debian/rkward.substvars ; \
-	else if [[ "$(RVERS)" > "2.2.1.svn37823" ]] ; then \
-		echo "rvers=r-base-core (< 2.3.9), r-base-core (>= 2.3.0)" >> $(CURDIR)/debian/rkward.substvars ; \
+		echo "rvers=r-base-core (>= 2.4.9)" >> $(CURDIR)/debian/rkward.substvars ; \
 	else \
-		echo "rvers=r-base-core (<= 2.2.1-6), r-base-core (>= 2.1.0)" >> $(CURDIR)/debian/rkward.substvars ; \
+		if [[ "$(RVERS)" > "2.3.9" ]] ; then \
+			echo "rvers=r-base-core (<= 2.4.9), r-base-core (>= 2.3.9)" >> $(CURDIR)/debian/rkward.substvars ; \
+		else \
+			if [[ "$(RVERS)" > "2.2.1.svn37823" ]] ; then \
+				echo "rvers=r-base-core (<= 2.3.9), r-base-core (>= 2.3.0)" >> $(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 \
+		fi \
 	fi
 	dh_gencontrol
 	dh_md5sums


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