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

[tfry at users.sourceforge.net]

Revision: 3492
          http://rkward.svn.sourceforge.net/rkward/?rev=3492&view=rev
Author:   tfry
Date:     2011-03-21 08:38:30 +0000 (Mon, 21 Mar 2011)

Log Message:
-----------
Grr. Now the fix causes the failure...

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

Modified: trunk/rkward/debian/changelog
===================================================================
--- trunk/rkward/debian/changelog	2011-03-21 08:15:40 UTC (rev 3491)
+++ trunk/rkward/debian/changelog	2011-03-21 08:38:30 UTC (rev 3492)
@@ -1,6 +1,7 @@
 rkward (0.5.5.z+0.5.6-0devel1) unstable; urgency=low
 
   * new upstream release
+  * Remove empty directory removal rkwardtests/inst. Now fixed upstream.
 
  -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Tue, 20 Mar 2011 15:30:00 +0200
 

Modified: trunk/rkward/debian/rules
===================================================================
--- trunk/rkward/debian/rules	2011-03-21 08:15:40 UTC (rev 3491)
+++ trunk/rkward/debian/rules	2011-03-21 08:38:30 UTC (rev 3492)
@@ -94,11 +94,6 @@
 	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.