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

tfry at users.sourceforge.net tfry at users.sourceforge.net
Mon Jul 27 15:00:01 UTC 2009 

Revision: 2576
          http://rkward.svn.sourceforge.net/rkward/?rev=2576&view=rev
Author:   tfry
Date:     2009-07-27 15:00:00 +0000 (Mon, 27 Jul 2009)

Log Message:
-----------
Support for Ubuntu 8.04 in rules (by m-eik)
Better R version detection (by m-eik)
Assorted futher small updates of the debian package (see debian/changelog)

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

Modified: trunk/rkward/debian/changelog
===================================================================
--- trunk/rkward/debian/changelog	2009-07-27 12:26:34 UTC (rev 2575)
+++ trunk/rkward/debian/changelog	2009-07-27 15:00:00 UTC (rev 2576)
@@ -1,3 +1,14 @@
+rkward (0.5.1-1) unstable; urgency=low
+
+  * new upstream release
+  * dropped notice on development status from description
+  * added notice on differing copyright and additional
+    LGPL licence of some files
+  * better version detection (thanks to Meik Michalke)
+  * added conditional patch to support Ubuntu 8.04 (thanks to Meik Michalke)
+  * removed support for building with kdelibs5-dev < 4.1.0
+    closes: #531086 (dropped build depends on cmake and libphonon-dev)
+
 rkward (0.5.0d-3) unstable; urgency=low
 
   * build-depend on libx11-dev

Modified: trunk/rkward/debian/control
===================================================================
--- trunk/rkward/debian/control	2009-07-27 12:26:34 UTC (rev 2575)
+++ trunk/rkward/debian/control	2009-07-27 15:00:00 UTC (rev 2576)
@@ -2,7 +2,7 @@
 Section: math
 Priority: optional
 Maintainer: Thomas Friedrichsmeier <tfry at users.sourceforge.net>
-Build-Depends: debhelper (>= 7.0.0), cmake, libphonon-dev, kdelibs5-dev, r-base-dev (>= 2.1.0), libx11-dev
+Build-Depends: debhelper (>= 7.0.0), kdelibs5-dev, r-base-dev (>= 2.7.0), libx11-dev
 Standards-Version: 3.8.1
 
 Package: rkward
@@ -15,6 +15,3 @@
  Besides a convenient GUI for the most important statistical functions,
  future versions will also provide seamless integration with an
  office-suite.
- .
- RKWard is still in development status. Right now it is most useful as an IDE
- to users with some experience in R, or willing to learn R.

Modified: trunk/rkward/debian/copyright
===================================================================
--- trunk/rkward/debian/copyright	2009-07-27 12:26:34 UTC (rev 2575)
+++ trunk/rkward/debian/copyright	2009-07-27 15:00:00 UTC (rev 2576)
@@ -4,7 +4,10 @@
 It was downloaded from http://rkward.sourceforge.net
 
 Copyright: 2002 - 2009 Thomas Friedrichsmeier and the RKWard team
-
 License:
 You are free to distribute this software under the terms of the GNU General Public License.
 On Debian systems, the complete text of the GNU General Public License can be found in the file `/usr/share/common-licenses/GPL'.
+
+Files: rkward/qwinhost.cpp.orig rkward/qwinhost.cpp rkward/qwinhost.h.orig rkward/qwinhost.h
+Copyright: (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+License: LPGL-2.1
\ No newline at end of file

Modified: trunk/rkward/debian/rules
===================================================================
--- trunk/rkward/debian/rules	2009-07-27 12:26:34 UTC (rev 2575)
+++ trunk/rkward/debian/rules	2009-07-27 15:00:00 UTC (rev 2576)
@@ -5,13 +5,28 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# Determine the installed distribution and release number
+# Will be used to determine if certain tweaks are needed, see below
+DISTRO = $(shell lsb_release -s -i -r)
+
+# Ubuntu 8.04 uses a different PATH for KDE 4 apps and needs some patching
+ifeq ("$(DISTRO)","Ubuntu 8.04")
+export PATH := $(PATH):/usr/lib/kde4/bin
+# If the following variables are set, patches are applied
+PATCHTARGET = patch-ubuntu804
+UNPATCHTARGET = unpatch
+endif
+
+
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 #we need to know the R version
-RVERS = $(shell dpkg-query -W --showformat='$${Version}' r-base-core) 
+RVERS = $(shell dpkg-query -W --showformat='$${Version}' r-base-core)
+RMAJOR = $(shell echo $(RVERS) | awk -F. '{print $$1}')
+RMINOR = $(shell echo $(RVERS) | awk -F. '{print $$2}')
 
 CFLAGS = -Wall -g
 
@@ -21,7 +36,7 @@
 	CFLAGS += -O2
 endif
 
-config.status:
+config.status: $(PATCHTARGET) # Will only be called if set, see above
 	dh_testdir
 
 	mkdir -p $(CURDIR)/build
@@ -51,7 +66,7 @@
 
 build: build-stamp
 
-build-stamp:  config.status
+build-stamp: config.status
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -59,7 +74,7 @@
 
 	touch build-stamp
 
-clean:
+clean: $(UNPATCHTARGET) # Will only be called if set, see above
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -108,22 +123,26 @@
 	dh_installdeb
 	dh_shlibdeps
 	# unfortunately, the r-base-core dependency can not be found by dh_shlibdeps, so we need to get at the version manually
-	@if [ "$(RVERS)" '>' "2.4.9" ] ; then \
-		echo "rvers=r-base-core (>= 2.4.9)" >> $(CURDIR)/debian/rkward.substvars ; \
+	@if [ "$(RMAJOR)" -eq "2" ] && [ "$(RMINOR)" -ge "9" ] ; then \
+		echo "rvers=r-base-core (>= 2.9.0)" >> $(CURDIR)/debian/rkward.substvars ; \
 	else \
-		if [ "$(RVERS)" '>' "2.3.9" ] ; then \
-			echo "rvers=r-base-core (<= 2.4.9), r-base-core (>= 2.3.9)" >> $(CURDIR)/debian/rkward.substvars ; \
-		else \
-			if [ "$(RVERS)" '>' "2.2.1.svn37823" ] ; then \
-				echo "rvers=r-base-core (<= 2.3.9), r-base-core (>= 2.3.0)" >> $(CURDIR)/debian/rkward.substvars ; \
-			else \
-				echo "rvers=r-base-core (<= 2.2.1-6), r-base-core (>= 2.1.0)" >> $(CURDIR)/debian/rkward.substvars ; \
-			fi \
-		fi \
-	fi
+		if [ "$(RMAJOR)" -eq "2" ] && [ "$(RMINOR)" -ge "8" ] ; then \
+		echo "rvers=r-base-core (<< 2.9.0), r-base-core (>= 2.8.0)" >> $(CURDIR)/debian/rkward.substvars ; \
+	else \
+		if [ "$(RMAJOR)" -eq "2" ] && [ "$(RMINOR)" -ge "7" ] ; then \
+		echo "rvers=r-base-core (<< 2.8.0), r-base-core (>= 2.7.0)" >> $(CURDIR)/debian/rkward.substvars ; \
+	fi ; fi ; fi
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
+patch-ubuntu804:
+	dpatch apply 10_hardy_menu
+	dpatch cat-all >patch-stamp
+ 
+unpatch:
+	dpatch deapply-all
+	rm -rf patch-stamp debian/patched
+
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install patch-ubuntu804 unpatch


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

More information about the rkward-tracker mailing list