[rkward-cvs] SF.net SVN: rkward:[3955] branches/release_branch_0.5.7

[tfry at users.sourceforge.net]

Revision: 3955
          http://rkward.svn.sourceforge.net/rkward/?rev=3955&view=rev
Author:   tfry
Date:     2011-10-17 15:13:53 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
Merge r3954 from trunk

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

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

Property Changed:
----------------
    branches/release_branch_0.5.7/
    branches/release_branch_0.5.7/debian/


Property changes on: branches/release_branch_0.5.7
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2010_10_18_backend_restructuring_branch:3130-3196
/branches/release_branch_0.5.4:3098-3102,3127
/trunk/rkward:3894,3932-3933,3939,3944
   + /branches/2010_10_18_backend_restructuring_branch:3130-3196
/branches/release_branch_0.5.4:3098-3102,3127
/trunk/rkward:3894,3932-3933,3939,3944,3954


Property changes on: branches/release_branch_0.5.7/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
/trunk/rkward/debian:3894,3932-3933,3939,3944
   + /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
/trunk/rkward/debian:3894,3932-3933,3939,3944,3954

Modified: branches/release_branch_0.5.7/debian/changelog
===================================================================
--- branches/release_branch_0.5.7/debian/changelog	2011-10-17 15:12:38 UTC (rev 3954)
+++ branches/release_branch_0.5.7/debian/changelog	2011-10-17 15:13:53 UTC (rev 3955)
@@ -1,6 +1,7 @@
 rkward (0.5.6z+0.5.7-0pre1) unstable; urgency=low
 
   * new upstream release
+  * provide build-arch and build-indep targets
   * include buildflags as instructed by the dpkg developers
 
  -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Tue, 30 May 2011 15:30:00 +0200

Modified: branches/release_branch_0.5.7/debian/rules
===================================================================
--- branches/release_branch_0.5.7/debian/rules	2011-10-17 15:12:38 UTC (rev 3954)
+++ branches/release_branch_0.5.7/debian/rules	2011-10-17 15:13:53 UTC (rev 3955)
@@ -70,7 +70,9 @@
 		-DR_EXECUTABLE=/usr/bin/R/ \
 		-DR_LIBDIR=/usr/lib/R/site-library/
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 
 build-stamp: config.status
 	dh_testdir

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