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

[tfry at users.sourceforge.net]

Revision: 3482
          http://rkward.svn.sourceforge.net/rkward/?rev=3482&view=rev
Author:   tfry
Date:     2011-03-20 12:55:33 +0000 (Sun, 20 Mar 2011)

Log Message:
-----------
Does not build with R 2.13.0alpha without this

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

Modified: trunk/rkward/debian/changelog
===================================================================
--- trunk/rkward/debian/changelog	2011-03-20 11:15:16 UTC (rev 3481)
+++ trunk/rkward/debian/changelog	2011-03-20 12:55:33 UTC (rev 3482)
@@ -2,8 +2,15 @@
 
   * new upstream release
 
- -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Tue, 15 Mar 2011 14:30:00 +0200
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Tue, 20 Mar 2011 15:30:00 +0200
 
+rkward (0.5.5-2) unstable; urgency=low
+
+  * Remove empty directory rkwardtests/inst
+    fixes FTBFS with (the current alpha of) R 2.13.0
+
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Tue, 20 Mar 2011 14:30:00 +0200
+
 rkward (0.5.5-1) unstable; urgency=low
 
   * new upstream release

Modified: trunk/rkward/debian/rules
===================================================================
--- trunk/rkward/debian/rules	2011-03-20 11:15:16 UTC (rev 3481)
+++ trunk/rkward/debian/rules	2011-03-20 12:55:33 UTC (rev 3482)
@@ -94,6 +94,11 @@
 	dh_clean -k
 	dh_installdirs
 
+	# Temporary:
+	# Remove empty "inst" dir which was included in the 0.5.5 upstream tarball by accident. It will throw an error with R 2.13.x.
+	rmdir $(CURDIR)/rkward/rbackend/rpackages/rkwardtests/inst/doc
+	rmdir $(CURDIR)/rkward/rbackend/rpackages/rkwardtests/inst
+
 	# Add here commands to install the package into debian/rkward.
 	cd $(CURDIR)/build && $(MAKE) install DESTDIR=$(CURDIR)/debian/rkward
 	# dirty hack to get rid of conflicting r.xml file without adjusting all makefiles


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