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

[tfry at users.sf.net]

Revision: 4747
          http://sourceforge.net/p/rkward/code/4747
Author:   tfry
Date:     2013-05-10 16:26:58 +0000 (Fri, 10 May 2013)
Log Message:
-----------
Merge bookkeeping for 0.6.1-1 upload, and some cleanups

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

Modified: trunk/rkward/debian/changelog
===================================================================
--- trunk/rkward/debian/changelog	2013-05-09 06:24:52 UTC (rev 4746)
+++ trunk/rkward/debian/changelog	2013-05-10 16:26:58 UTC (rev 4747)
@@ -1,9 +1,20 @@
 rkward (0.6.1z+0.6.2-0pre1) unstable; urgency=low
 
   * new upstream release
+  * avoid duplicate cmake run during build
+  * upstream increased lowest supported R version to 2.8.0
+  * drop dependency on cmake, already provided by kdelibs5-dev
+    closes: #531086
+
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Fri, 10 May 2013 12:30:00 +0100
+
+rkward (0.6.1-1) unstable; urgency=low
+
+  * upstream release 0.6.1-rc1 was made available as 0.6.1 without changes
+  * new upload to build against R 3.0.0 on most architectures
   * when built against r-base-core >= 3.0.0, depend on r-base-core <= 3.0.0
 
- -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Thu, 11 Apr 2013 12:30:00 +0100
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Thu, 07 May 2013 12:30:00 +0100
 
 rkward (0.6.1~rc1-1) unstable; urgency=low
 

Modified: trunk/rkward/debian/control
===================================================================
--- trunk/rkward/debian/control	2013-05-09 06:24:52 UTC (rev 4746)
+++ trunk/rkward/debian/control	2013-05-10 16:26:58 UTC (rev 4747)
@@ -2,7 +2,7 @@
 Section: math
 Priority: optional
 Maintainer: Thomas Friedrichsmeier <tfry at users.sourceforge.net>
-Build-Depends: debhelper (>= 6.0.0), kdelibs5-dev, cmake, r-base-dev (>= 2.7.0), libx11-dev
+Build-Depends: debhelper (>= 6.0.0), kdelibs5-dev, r-base-dev (>= 2.8.0), libx11-dev
 Standards-Version: 3.9.4
 Homepage: http://rkward.sourceforge.net
 Vcs-Browser: http://sourceforge.net/p/rkward/code/HEAD/tree/trunk/rkward/debian/

Modified: trunk/rkward/debian/rules
===================================================================
--- trunk/rkward/debian/rules	2013-05-09 06:24:52 UTC (rev 4746)
+++ trunk/rkward/debian/rules	2013-05-10 16:26:58 UTC (rev 4747)
@@ -32,7 +32,11 @@
 	CFLAGS += -O2
 endif
 
-config.status:
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+
+build-stamp:
 	dh_testdir
 
 	mkdir -p $(CURDIR)/build
@@ -63,13 +67,6 @@
 		-DR_EXECUTABLE=/usr/bin/R/ \
 		-DR_LIBDIR=/usr/lib/R/site-library/
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-
-build-stamp: config.status
-	dh_testdir
-
 	# Add here commands to compile the package.
 	cd $(CURDIR)/build && $(MAKE)