[rkward-cvs] SF.net SVN: rkward:[3484] branches/release_branch_0.5.5/debian

[tfry at users.sourceforge.net]

Revision: 3484
          http://rkward.svn.sourceforge.net/rkward/?rev=3484&view=rev
Author:   tfry
Date:     2011-03-20 13:04:21 +0000 (Sun, 20 Mar 2011)

Log Message:
-----------
Merge deb-building fixes from trunk.

Modified Paths:
--------------
    branches/release_branch_0.5.5/debian/changelog
    branches/release_branch_0.5.5/debian/rules

Modified: branches/release_branch_0.5.5/debian/changelog
===================================================================
--- branches/release_branch_0.5.5/debian/changelog	2011-03-20 12:57:27 UTC (rev 3483)
+++ branches/release_branch_0.5.5/debian/changelog	2011-03-20 13:04:21 UTC (rev 3484)
@@ -1,8 +1,16 @@
-rkward (0.5.5-0devel1) unstable; urgency=low
+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
+  * add man-page link for new binary rkward.rbackend
 
- -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Mon, 04 Oct 2010 14:30:00 +0200
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Tue, 15 Mar 2011 14:30:00 +0200
 
 rkward (0.5.4-1) unstable; urgency=low
 

Modified: branches/release_branch_0.5.5/debian/rules
===================================================================
--- branches/release_branch_0.5.5/debian/rules	2011-03-20 12:57:27 UTC (rev 3483)
+++ branches/release_branch_0.5.5/debian/rules	2011-03-20 13:04:21 UTC (rev 3484)
@@ -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
@@ -115,8 +120,9 @@
 	dh_installexamples
 	dh_installmenu
 	dh_installman debian/rkward.1
-	# Link manpage for rkward.bin to rkward
+	# Link manpage for rkward.bin and rkward.rbackend to rkward
 	ln -sf rkward.1.gz debian/rkward/usr/share/man/man1/rkward.bin.1.gz
+	ln -sf rkward.1.gz debian/rkward/usr/share/man/man1/rkward.rbackend.1.gz
 	dh_link
 	dh_strip
 	# do not compress KDE HTML help


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