Merge branch 'releases/0.6.5'

0586251c · Thomas Friedrichsmeier · 60e49920 · 84ae6970 · 0586251c · 0586251c
Commit 0586251c authored Apr 02, 2016 by Thomas Friedrichsmeier
45 changed files
--- a/ChangeLog
+++ b/ChangeLog
-UNRELEASED: --- Version 0.6.5 - Apr-02-2016
+--- Version 0.6.5 - Apr-02-2016
 - Add option to override CSS file used for the output window
 - When manually adding pluginmaps, load these after, not before other pluginmaps, by default
 - Added context menu option to search for information on current symbol online

--- a/debian-official/changelog
+++ b/debian-official/changelog
-rkward (0.6.4z+0.6.5+devel1-1) UNRELEASED; urgency=low
+rkward (0.6.5-1) UNRELEASED; urgency=low
  * new upstream release
-  * TODO: FIX changelog in case 0.6.4-2 never gets uploaded!!!!!!!!!!
+    (unchanged with respect to ~rc1)
+  * fix debian/watch file
+  * switch to dh-based rules file
+    !!!TODO!!!: Does this fix the rkward-data build for binary-arch problem?
+  * !!!TODO!!!: Make build really reproducible (fix for earlier attempt upstream)
+    closes: #783290

- -- Thomas Friedrichsmeier <tfry@users.sourceforge.net>  Wed, 10 Feb 2016 11:30:00 +0100
+ -- Thomas Friedrichsmeier <tfry@users.sourceforge.net>  Tue, 29 Mar 2016 11:00:00 +0100

-rkward (0.6.4-2) unstable; urgency=low
+rkward (0.6.5~rc1-1) unstable; urgency=low
+  * new upstream release
+  * split architecture independent files into new rkward-data package
  * bump standards version to 3.9.7 (no changes needed)
  * strip testing locale "x-test" from package
-  * split architecture independent files into new rkward-data package
  * add override for false-positive source-contains-prebuilt-javascript-object
    lintian warnings
  * make existing lintian overrides work with lintian 2.5.42
  * Adjust copyright file to changed filenames in rkward/qwinhost

- -- Thomas Friedrichsmeier <tfry@users.sourceforge.net>  Mon, 07 Mar 2016 14:00:00 +0100
+ -- Thomas Friedrichsmeier <tfry@users.sourceforge.net>  Tue, 29 Mar 2016 11:00:00 +0100

 rkward (0.6.4-1) unstable; urgency=low
  * new upstream release

--- a/debian-official/control
+++ b/debian-official/control
@@ -27,8 +27,8 @@ Package: rkward-data
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: rkward
-Breaks: rkward (<< 0.6.4-2~)
-Replaces: rkward (<< 0.6.4-2~)
+Breaks: rkward (<< 0.6.5~rc1-1~)
+Replaces: rkward (<< 0.6.5~rc1-1~)
 Description: KDE frontend to the R statistics language
 RKWard aims to become an easy to use, transparent frontend to R,
 a powerful system for statistical computation and graphics.

--- a/debian-official/patches/revert_to_khtml.patch
+++ b/debian-official/patches/revert_to_khtml.patch
@@ -35,7 +35,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
 -   rkfindbar.cpp
    rkdynamicsearchline.cpp
    rkaccordiontable.cpp
-    )
+    rkxmlguipreviewarea.cpp
 --- a/rkward/misc/rkfindbar.cpp
 +++ /dev/null
 @@ -1,160 +0,0 @@
@@ -545,13 +545,11 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
 	RK_TRACE (APP);
 
 -	RKConsole::pipeUserCommand (view->selectedText ());
-+	RKConsole::pipeUserCommand (khtmlpart->selectedText ());
- }
- 
+-}
+-
 -void RKHTMLWindow::findRequest (const QString& text, bool backwards, const RKFindBar* findbar, bool* found) {
-+void RKHTMLWindow::doGotoAnchor (const QString &anchor_name) {
- 	RK_TRACE (APP);
- 
+-	RK_TRACE (APP);
+-
 -	QWebPage::FindFlags flags = QWebPage::FindWrapsAroundDocument;
 -	if (backwards) flags |= QWebPage::FindBackward;
 -	bool highlight = findbar->isOptionSet (RKFindBar::HighlightAll);
@@ -563,12 +561,11 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
 -
 -	*found = page->findText (text, flags);
 -	have_highlight = found && highlight;
-+	goto_anchor_name = anchor_name;
-+	QTimer::singleShot (0, this, SLOT (doGotoAnchorNow()));
+	RKConsole::pipeUserCommand (khtmlpart->selectedText ());
 }
 
 -void RKHTMLWindow::slotPrint () {
-+void RKHTMLWindow::doGotoAnchorNow () {
+void RKHTMLWindow::doGotoAnchor (const QString &anchor_name) {
 	RK_TRACE (APP);
 
 -	// NOTE: taken from kwebkitpart, with small mods
@@ -578,15 +575,18 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
 -		view->print (dlg->printer ());
 -	}
 -	delete dlg;
-+	if (khtmlpart) khtmlpart->gotoAnchor (goto_anchor_name);
+	goto_anchor_name = anchor_name;
+	QTimer::singleShot (0, this, SLOT (doGotoAnchorNow()));
 }
 
 -void RKHTMLWindow::slotSave () {
-	RK_TRACE (APP);
-
+void RKHTMLWindow::doGotoAnchorNow () {
+ 	RK_TRACE (APP);
+ 
 -	page->downloadUrl (page->mainFrame ()->url ());
-}
-
+	if (khtmlpart) khtmlpart->gotoAnchor (goto_anchor_name);
+ }
+ 
 -void RKHTMLWindow::saveRequested (const QNetworkRequest& request) {
 +void RKHTMLWindow::slotPrint () {
 	RK_TRACE (APP);
@@ -734,20 +734,20 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
 }
 
 -void RKHTMLWindow::refresh () {
-	RK_TRACE (APP);
-
-	view->reload ();
-}
-
-void RKHTMLWindow::scrollToBottom () {
 +void RKHTMLWindow::slotOpenUrl (const KUrl & url, const KParts::OpenUrlArguments &, const KParts::BrowserArguments &) {
 	RK_TRACE (APP);
 
-	RK_ASSERT (window_mode == HTMLOutputWindow);
-	view->page ()->mainFrame ()->setScrollBarValue (Qt::Vertical, view->page ()->mainFrame ()->scrollBarMaximum (Qt::Vertical));
+-	view->reload ();
 +	openURL (url);
 }
 
+-void RKHTMLWindow::scrollToBottom () {
+-	RK_TRACE (APP);
+-
+-	RK_ASSERT (window_mode == HTMLOutputWindow);
+-	view->page ()->mainFrame ()->setScrollBarValue (Qt::Vertical, view->page ()->mainFrame ()->scrollBarMaximum (Qt::Vertical));
+-}
+-
 -void RKHTMLWindow::zoomIn () {
 +void RKHTMLWindow::refresh () {
 	RK_TRACE (APP);
@@ -919,7 +919,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
 -	outputFlush->setText (i18n ("&Flush Output"));
 -	outputFlush->setIcon (KIcon ("edit-delete"));
 -
-	outputRefresh = actionCollection ()->addAction ("output_refresh", window->page->action (QWebPage::ReloadAndBypassCache), SLOT (trigger()));
+-	outputRefresh = actionCollection ()->addAction ("output_refresh", window, SLOT (refresh()));
 -	outputRefresh->setText (i18n ("&Refresh Output"));
 -	outputRefresh->setIcon (KIcon ("view-refresh"));
 -
@@ -1290,7 +1290,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
 /////////////////////////////////////
 /////////////////////////////////////
 
-@@ -1085,3 +995,4 @@
+@@ -1100,3 +1010,4 @@
 }
 
 #include "rkhtmlwindow.moc"
@@ -1530,7 +1530,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
 };
 
 #include <QMultiHash>
-@@ -235,3 +201,4 @@
+@@ -236,3 +202,4 @@
 };
 
 #endif

--- a/debian-official/rkward-data.install
+++ b/debian-official/rkward-data.install
-usr/share/
+usr/share/
\ No newline at end of file
--- a/debian-official/rkward-data.manpages
+++ b/debian-official/rkward-data.manpages
-build/doc/rkward/rkward.1
+debian/build/doc/rkward/rkward.1
--- a/debian-official/rules
+++ b/debian-official/rules
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Based on the sample debian/rules of dh_make
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# For CXXFLAGS and CFLAGS.
-# See http://lists.debian.org/debian-devel-announce/2011/09/msg00001.html 
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-
-CFLAGS += -Wall
-
-# Workaround for cmake not handling CPPFLAGS (https://wiki.debian.org/HardeningWalkthrough):
-CFLAGS += $(CPPFLAGS)
-CXXFLAGS += $(CPPFLAGS)
-
-# 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)
@@ -31,29 +10,20 @@ builttime = $(shell dpkg-parsechangelog -l$(CURDIR)/debian/changelog | awk -F':

 # easier typing
 DESTDIR = $(CURDIR)/debian/tmp
+BUILDDIR = $(CURDIR)/debian/build

-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-
-build-stamp:
-	dh_testdir
-
-	mkdir -p $(CURDIR)/build
+%:
+	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR)

+override_dh_auto_configure:
+	mkdir -p $(BUILDDIR)
 	# Some installations of R need a specific version of the compiler(s)
 	# R CMD config provides info on which compiler to use
-	cd $(CURDIR)/build && \
+	cd $(BUILDDIR) && \
 	CC="`/usr/bin/R CMD config CC`" \
 	CXX="`/usr/bin/R CMD config CXX`" \
 	F77="`/usr/bin/R CMD config F77`" \
-	cmake .. \
+	cmake ../.. \
 		-DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` \
 		-DDATA_INSTALL_DIR=`kde4-config --install data` \
 		-DHTML_INSTALL_DIR=`kde4-config --install html` \
@@ -74,62 +44,21 @@ build-stamp:
 		-DR_LIBDIR=/usr/lib/R/site-library/ \
 		-DBUILD_TIMESTAMP="$(builttime)"

-	# Add here commands to compile the package.
-	cd $(CURDIR)/build && $(MAKE)
-
-	touch build-stamp
+override_dh_auto_install:
+	dh_auto_install

-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	# remove any .svn subdir included by accident
-	rm -rf $(CURDIR)/debian/.svn
-
-	# Add here commands to clean up after the build process.
-	rm -rf $(CURDIR)/build/
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	# Install into debian/tmp, first
-	cd $(CURDIR)/build && $(MAKE) install DESTDIR=$(DESTDIR)
 	# dirty hack to get rid of conflicting r.xml file without adjusting all makefiles
 	rm -vf $(DESTDIR)/`kde4-config --install data`/katepart/syntax/r.xml
-	
 	# remove unneeded R package files
 	rm -vf $(DESTDIR)/usr/lib/R/site-library/R.css $(DESTDIR)/usr/lib/R/site-library/rkward/COPYING
-
 	# remove x-test locale
 	rm -rvf $(DESTDIR)/usr/share/kde4/apps/rkward/po/x-test $(DESTDIR)/usr/share/locale/x-test

-	# Sort the remaining bits into rkward and rkward-data subpackages
-	dh_install
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-	dh_installman
-	dh_link
-	dh_strip
+override_dh_compress:
 	# do not compress KDE HTML help
 	dh_compress -Xusr/share/doc/kde/HTML
-	dh_fixperms
-	dh_installdeb
+
+override_dh_shlibdeps:
 	dh_shlibdeps
 	# unfortunately, the r-base-core dependency can not be found by dh_shlibdeps, so we need to get at the version manually
 	# NOTE: This "if" is currently always true (see build-deps), but left here, for convenience, in case we get into trouble
@@ -137,9 +66,3 @@ binary-arch: build install
 	@if [ "$(RMAJOR)" -eq "3" ] && [ "$(RMINOR)" -ge "0" ] ; then \
 		echo "rvers=r-base-core (>= 3.0.0)" >> $(CURDIR)/debian/rkward.substvars ; \
 	fi
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
--- a/debian-official/source/lintian-overrides
+++ b/debian-official/source/lintian-overrides
 # Some of the plugin .js-files seem to generate false positives. Most of these _are_ primary sources, none of them are minified or post-processed in any other way.
-# A handful of .js-files _are_ generated (upstream, manually), indeed. These carry a corresponding notice, and their primary sources are included in rkward/plugins/rkwarddev_scripts .
-rkward source: source-contains-prebuilt-javascript-object rkward/plugins/*
-rkward source: source-is-missing rkward/plugins/*
+# A handful of .js-files _are_ generated (upstream, manually), indeed. These carry a corresponding notice, and their primary sources are included in rkward/plugins/rkwarddev_scripts.
+rkward source: source-contains-prebuilt-javascript-object rkward/plugins/*.js*
+rkward source: source-is-missing rkward/plugins/*.js*
--- a/debian-official/watch
+++ b/debian-official/watch
 version=3
-opts=uversionmangle=s/-(pre\d*)$/~$1/ \
-http://sf.net/rkward/rkward-(.*)\.tar\.gz
-# Bart Martens <bartm@debian.org>  Sat, 17 Nov 2012 08:07:53 +0000
+http://download.kde.org/stable/rkward/([\d.]+)/src/rkward-([\d.]+)\.tar\.gz
--- a/debian/changelog
+++ b/debian/changelog
-rkward (0.6.4z+0.6.5+devel1-1) UNRELEASED; urgency=low
+rkward (0.6.5-1) UNRELEASED; urgency=low
  * new upstream release
+  * fix debian/watch file
+  * split architecture independent files into new rkward-data package
+  * bump standards version to 3.9.7 (no changes needed)
+  * strip testing locale "x-test" from package
+  * add override for false-positive source-contains-prebuilt-javascript-object
+    and source-is-missing lintian warnings

- -- Thomas Friedrichsmeier <tfry@users.sourceforge.net>  Wed, 16 Dec 2015 10:30:00 +0100
+ -- Thomas Friedrichsmeier <tfry@users.sourceforge.net>  Wed, 30 Mar 2016 14:00:00 +0100

 rkward (0.6.4-1) unstable; urgency=low
  * new upstream release

--- a/debian/control
+++ b/debian/control
@@ -8,14 +8,14 @@ Build-Depends: cmake,
               libqtwebkit-dev | libqt4-dev (<< 4:4.7),
               libx11-dev,
               r-base-dev (>= 2.8.0)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Homepage: http://rkward.kde.org
 Vcs-Browser: http://quickgit.kde.org/?p=rkward.git&a=tree&f=debian
 Vcs-Git: git://anongit.kde.org/rkward.git

 Package: rkward
 Architecture: any
-Depends: ${misc:Depends}, ${rvers}, ${shlibs:Depends}
+Depends: rkward-data, ${misc:Depends}, ${rvers}, ${shlibs:Depends}
 Recommends: r-base-html
 Description: KDE frontend to the R statistics language
 RKWard aims to become an easy to use, transparent frontend to R,
@@ -23,3 +23,18 @@ Description: KDE frontend to the R statistics language
 Besides a convenient GUI for the most important statistical functions,
 future versions will also provide seamless integration with an
 office-suite.
+
+Package: rkward-data
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: rkward
+Breaks: rkward (<< 0.6.5~rc1-1~)
+Replaces: rkward (<< 0.6.5~rc1-1~)
+Description: KDE frontend to the R statistics language
+ RKWard aims to become an easy to use, transparent frontend to R,
+ a powerful system for statistical computation and graphics.
+ Besides a convenient GUI for the most important statistical functions,
+ future versions will also provide seamless integration with an
+ office-suite.
+ .
+ This package provides the architecture independent data files for rkward.
--- a/debian/rkward-data.install
+++ b/debian/rkward-data.install
+usr/share/
\ No newline at end of file
--- a/debian/rkward-data.manpages
+++ b/debian/rkward-data.manpages
+build/doc/rkward/rkward.1
--- a/debian/rkward.install
+++ b/debian/rkward.install
+usr/bin/
+usr/lib/
\ No newline at end of file
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,9 @@ RMINOR = $(shell echo $(RVERS) | awk -F. '{print $$2}')
 # set built-time of GNUR packages to time of created binary package based on stamp in changelog
 builttime = $(shell dpkg-parsechangelog -l$(CURDIR)/debian/changelog | awk -F': ' '/Date/ {print $$2}')

+# easier typing
+DESTDIR = $(CURDIR)/debian/tmp
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
@@ -91,16 +94,22 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs

-	# Add here commands to install the package into debian/rkward.
-	cd $(CURDIR)/build && $(MAKE) install DESTDIR=$(CURDIR)/debian/rkward
+	# Install into debian/tmp, first
+	cd $(CURDIR)/build && $(MAKE) install DESTDIR=$(DESTDIR)
 	# dirty hack to get rid of conflicting r.xml file without adjusting all makefiles
-	rm -vf $(CURDIR)/debian/rkward/`kde4-config --install data`/katepart/syntax/r.xml
+	rm -vf $(DESTDIR)/`kde4-config --install data`/katepart/syntax/r.xml
 	
 	# remove unneeded R package files
-	rm -vf $(CURDIR)/debian/rkward/usr/lib/R/site-library/R.css $(CURDIR)/debian/rkward/usr/lib/R/site-library/rkward/COPYING
+	rm -vf $(DESTDIR)/usr/lib/R/site-library/R.css $(DESTDIR)/usr/lib/R/site-library/rkward/COPYING
+
+	# remove x-test locale
+	rm -rvf $(DESTDIR)/usr/share/kde4/apps/rkward/po/x-test $(DESTDIR)/usr/share/locale/x-test
+
+	# Sort the remaining bits into rkward and rkward-data subpackages
+	dh_install --sourcedir=$(DESTDIR)

 # Build architecture-independent files here.
 binary-indep: build install
@@ -114,7 +123,7 @@ binary-arch: build install
 	dh_installdocs
 	dh_installexamples
 	dh_installmenu
-	dh_installman $(CURDIR)/build/doc/rkward/rkward.1
+	dh_installman
 	dh_link
 	dh_strip
 	# do not compress KDE HTML help

--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
+# Some of the plugin .js-files seem to generate false positives. Most of these _are_ primary sources, none of them are minified or post-processed in any other way.
+# A handful of .js-files _are_ generated (upstream, manually), indeed. These carry a corresponding notice, and their primary sources are included in rkward/plugins/rkwarddev_scripts.
+rkward source: source-contains-prebuilt-javascript-object rkward/plugins/*.js*
+rkward source: source-is-missing rkward/plugins/*.js*
--- a/debian/watch
+++ b/debian/watch
 version=3
-opts=uversionmangle=s/-(pre\d*)$/~$1/ \
-http://sf.net/rkward/rkward-(.*)\.tar\.gz
-# Bart Martens <bartm@debian.org>  Sat, 17 Nov 2012 08:07:53 +0000
+http://download.kde.org/stable/rkward/([\d.]+)/src/rkward-([\d.]+)\.tar\.gz
--- a/rkward/main.cpp
+++ b/rkward/main.cpp
@@ -130,7 +130,7 @@ int main(int argc, char *argv[]) {
 	options.add ("nowarn-external", ki18n ("When used in conjunction with rkward://runplugin/-URLs specified on the command line, suppresses the warning about application-external (untrusted) links."));
 	options.add ("+[Files]", ki18n ("File or files to open, typically a workspace, or an R script file. When loading several things, you should specify the workspace, first."), 0);

-	KAboutData aboutData("rkward", QByteArray (), ki18n ("RKWard"), RKWARD_VERSION, ki18n ("Frontend to the R statistics language"), KAboutData::License_GPL, ki18n ("(c) 2002, 2004 - 2014"), KLocalizedString (), "http://rkward.kde.org", "submit@bugs.kde.org");
+	KAboutData aboutData("rkward", QByteArray (), ki18n ("RKWard"), RKWARD_VERSION, ki18n ("Frontend to the R statistics language"), KAboutData::License_GPL, ki18n ("(c) 2002, 2004 - 2016"), KLocalizedString (), "http://rkward.kde.org", "submit@bugs.kde.org");
 	aboutData.addAuthor (ki18n ("Thomas Friedrichsmeier"), ki18n ("Project leader / main developer"));
 	aboutData.addAuthor (ki18n ("Pierre Ecochard"), ki18n ("C++ developer between 2004 and 2007"));
 	aboutData.addAuthor (ki18n ("Prasenjit Kapat"), ki18n ("Many plugins, suggestions, plot history feature"));

--- a/rkward/rbackend/rpackages/rkwardtests/R/rkwardtests-internal.R
+++ b/rkward/rbackend/rpackages/rkwardtests/R/rkwardtests-internal.R
@@ -158,6 +158,10 @@ rktest.runRKTest <- function (test, standard.path, suite.id) {
 		else result@error <- "no"
 	}

+	rktest.cleanTestFile (output_file)
+	rktest.cleanTestFile (code_file)
+	rktest.cleanTestFile (message_file)
+
 	result@output_match = rktest.compare.against.standard (output_file, standard.path, test@fuzzy_output)
 	if (result@output_match == "MISMATCH") passed <- FALSE
 	result@message_match = rktest.compare.against.standard (message_file, standard.path)
@@ -170,6 +174,15 @@ rktest.runRKTest <- function (test, standard.path, suite.id) {
 	result
 }

+# Make replacements to stabilize comparison. Currently strips tempdir path.
+rktest.cleanTestFile <- function (filename) {
+	if (file.exists (filename)) {
+		raw <- readLines (filename)
+		cleaned <- gsub (getwd (), "PATH", raw, fixed=TRUE)
+		writeLines (cleaned, filename)
+	}
+}
+
 rktest.cleanRKTestSuite <- function (suite) {
      # kept for backwards compatibility ;-)
      rktest.removeTempSuiteDir(suite@id)

--- a/scripts/make_debian_package.sh
+++ b/scripts/make_debian_package.sh
@@ -2,12 +2,13 @@
 cd `dirname $0`/..
 BASEDIR=`pwd`
 VERSION=`${BASEDIR}/scripts/getversion.sh ${1}`
+DEBSUFFIX=${2}
 DEBDIR=${BASEDIR}/debian-official
 DEBTEMPDIR=${BASEDIR}/debiantemp
 rm -rf ${DEBTEMPDIR}
 mkdir ${DEBTEMPDIR}

-if [ -z "`head -n 1 ${DEBDIR}/changelog | grep "rkward (${VERSION}-"`" ]; then
+if [ -z "`head -n 1 ${DEBDIR}/changelog | grep "rkward (${VERSION}${DEBSUFFIX}-"`" ]; then
  echo "Version mismatch! Adjust ${DEBDIR}/changelog, first."
  exit 1
 fi
@@ -18,13 +19,13 @@ if [ ! -f ${BASEDIR}/rkward-$VERSION.tar.gz ]; then
  exit 1
 fi

-cp ${BASEDIR}/rkward-$VERSION.tar.gz $DEBTEMPDIR/rkward_$VERSION.orig.tar.gz
+cp ${BASEDIR}/rkward-$VERSION.tar.gz $DEBTEMPDIR/rkward_$VERSION${DEBSUFFIX}.orig.tar.gz
 cd $DEBTEMPDIR
-tar -xzf rkward_$VERSION.orig.tar.gz
+tar -xzf rkward_$VERSION${DEBSUFFIX}.orig.tar.gz
 cd rkward-$VERSION
 cp -a ${DEBDIR} debian
-dpkg-buildpackage -k0x1858CBB6 -rfakeroot
+dpkg-buildpackage -k0x1858CBB6 -rfakeroot --force-sign

 cd $DEBTEMPDIR
 dpkg-scansources . | bzip2 > Sources.bz2
-LINTIAN_PROFILE=debian lintian rkward_$VERSION-*.changes
+LINTIAN_PROFILE=debian lintian rkward_$VERSION${DEBSUFFIX}-*.changes
--- a/tests/distributions/weibull_probabilities.rkcommands.R
+++ b/tests/distributions/weibull_probabilities.rkcommands.R
@@ -3,7 +3,7 @@ local({
 q <- seq (0, qweibull (.99, shape=1.0, scale=1.0), length.out=20)
 p <- pweibull (q, shape=1.0, scale=1.0)
 ## Print result
-rk.header ("Weilbull distribution", parameters=list("Shape"="1.0",
+rk.header ("Weibull distribution", parameters=list("Shape"="1.0",
 	"Scale"="1.0",
 	"Tail"="Lower tail: P[X ≤ x]"))
 rk.results (data.frame ("Quantile"=q, "Probability"=p, check.names=FALSE))

--- a/tests/distributions/weibull_probabilities.rkout
+++ b/tests/distributions/weibull_probabilities.rkout
-<h1>Weilbull distribution</h1>
+<h1>Weibull distribution</h1>
 <h2>Parameters</h2>
 <ul><li>Shape: 1.0</li>
 <li>Scale: 1.0</li>

--- a/tests/distributions/wilcoxon_probabilities.rkcommands.R
+++ b/tests/distributions/wilcoxon_probabilities.rkcommands.R
@@ -3,7 +3,7 @@ local({
 q <- seq.int (0, 25, by=2)
 p <- pwilcox (q, m=5, n=5)
 ## Print result
-rk.header ("Wilcox Rank Sum distribution", parameters=list("m (Numbers of observations in the first sample)"="5",
+rk.header ("Wilcoxon Rank Sum distribution", parameters=list("m (Numbers of observations in the first sample)"="5",
 	"n (Numbers of observations in the second sample)"="5",
 	"Tail"="Lower tail: P[X ≤ x]"))
 rk.results (data.frame ("Quantile"=q, "Probability"=p, check.names=FALSE))

--- a/tests/distributions/wilcoxon_probabilities.rkout
+++ b/tests/distributions/wilcoxon_probabilities.rkout
-<h1>Wilcox Rank Sum distribution</h1>
+<h1>Wilcoxon Rank Sum distribution</h1>
 <h2>Parameters</h2>
 <ul><li>m (Numbers of observations in the first sample): 5</li>
 <li>n (Numbers of observations in the second sample): 5</li>

--- a/tests/import_export_plugins.R
+++ b/tests/import_export_plugins.R
@@ -14,14 +14,14 @@ suite <- new ("RKTestSuite", id="import_export_plugins",
 		new ("RKTest", id="load_r_object", call=function () {
 			save (women.data, file="women.RData")

-			rk.call.plugin ("rkward::load_r_object", file.selection="women.RData", envir.active="0", submit.mode="submit")
+			rk.call.plugin ("rkward::load_r_object", file.selection=file.path (getwd(), "women.RData"), envir.active="0", submit.mode="submit")

 			stopifnot (all.equal (.GlobalEnv$women.data, datasets::women))
 		}),
 		new ("RKTest", id="import_csv", call=function () {
 			write.csv (women.data, file="women.csv")

-			rk.call.plugin ("rkward::import_csv", allow_escapes.state="", blanklinesskip.state="TRUE", checkname.state="TRUE", colclass.string="", colname.string="", dec.string="'.'", doedit.state="0", file.selection="women.csv", flush.state="", na.text="NA", name.objectname="women", nrows.text="-1", quick.string="csv", quote.string="'\\\"'", sep.string="','", skip.text="0", strings_as_factors.string="", stripwhite.state="FALSE", rowname.string="rowcol", nomrow.text="1", submit.mode="submit")
+			rk.call.plugin ("rkward::import_csv", allow_escapes.state="0", blanklinesskip.state="1", checkname.state="1", colclass.string="", colname.string="", commentchar.text="", dec.string="'.'", doedit.state="0", file.selection=file.path (getwd(), "women.csv"), fill.state="1", flush.state="0", header.state="1", na.text="NA", name.objectname="women", name.parent=".GlobalEnv", nomrow.text="1", nrows.text="-1", quick.string="csv", quote.string="'\\\"'", rowname.string="rowcol", sep.string="','", skip.text="0", strings_as_factors.string="", stripwhite.state="0", submit.mode="submit")

 			stopifnot (all.equal (.GlobalEnv$women, datasets::women))
 		}),
@@ -30,22 +30,21 @@ suite <- new ("RKTestSuite", id="import_export_plugins",
 			rk.sync.global ()

 			# this one is expected to fail, as it would overwrite the existing "women" in globalenv()
-			rk.call.plugin ("rkward::import_csv", file.selection="women.csv", name.objectname="women", submit.mode="submit")
+			rk.call.plugin ("rkward::import_csv", allow_escapes.state="0", blanklinesskip.state="1", checkname.state="1", colclass.string="", colname.string="", commentchar.text="", dec.string="'.'", doedit.state="0", file.selection=file.path (getwd(), "women.csv"), fill.state="1", flush.state="0", header.state="1", na.text="NA", name.objectname="women", name.parent=".GlobalEnv", nomrow.text="1", nrows.text="-1", quick.string="csv", quote.string="'\\\"'", rowname.string="rowcol", sep.string="','", skip.text="0", strings_as_factors.string="", stripwhite.state="0", submit.mode="submit")
 		}, expect_error=TRUE),
 		new ("RKTest", id="setworkdir", call=function () {
 			oldwd <- getwd ()
 			on.exit (setwd (oldwd))

-			# we can only use relative paths, here, to make sure the tests produce identical commands on all systems
-			rk.call.plugin ("rkward::setworkdir", dir.selection="..", submit.mode="submit")
+			rk.call.plugin ("rkward::setworkdir", dir.selection=file.path (getwd(), ".."), submit.mode="submit")
 			stopifnot (oldwd != getwd ())

-			rk.call.plugin ("rkward::setworkdir", dir.selection="import_export_plugins", submit.mode="submit")
+			rk.call.plugin ("rkward::setworkdir", dir.selection=file.path (getwd(), "import_export_plugins"), submit.mode="submit")
 			stopifnot (oldwd == getwd ())
 		}),
 		new ("RKTest", id="import_spss", call=function () {
 # NOTE: read.spss currently failing when run in non iso8859-1 locale. See http://r.789695.n4.nabble.com/read-spss-locale-and-encodings-td881149.html
-			rk.call.plugin ("rkward::import_spss", convert_var_labels.state="1", data_frame.state="1", do_locale_conversion.state="0", doedit.state="0", file.selection="import_export_plugins_testfile.sav", labels_limit.real="1.00", saveto.objectname="my.spss.data", trim_labels.state="0", use_labels.state="1", submit.mode="submit")
+			rk.call.plugin ("rkward::import_spss", convert_var_labels.state="1", data_frame.state="1", do_locale_conversion.state="0", doedit.state="0", file.selection=file.path (getwd(), "import_export_plugins_testfile.sav"), labels_limit.real="1.00", saveto.objectname="my.spss.data", trim_labels.state="0", use_labels.state="1", submit.mode="submit")

 			# In order to check, whether the import was correct
 			rk.print (my.spss.data)
@@ -55,7 +54,7 @@ suite <- new ("RKTestSuite", id="import_export_plugins",
 			# variable, yet.
 		}, libraries=c("foreign"), files=c("../import_export_plugins_testfile.sav")),
 		new ("RKTest", id="import_stata", call=function () {
-			rk.call.plugin ("rkward::import_stata", convert_dates.state="1", convert_factors.state="1", convert_underscore.state="0", do_locale_conversion.state="1", doedit.state="0", encoding.string="ISO8859-1", file.selection="import_export_plugins_testfile.dta", missing_type.state="0", saveto.objectname="my.stata.data", saveto.parent=".GlobalEnv", submit.mode="submit")
+			rk.call.plugin ("rkward::import_stata", convert_dates.state="1", convert_factors.state="1", convert_underscore.state="0", do_locale_conversion.state="1", doedit.state="0", encoding.string="ISO8859-1", file.selection=file.path (getwd(), "import_export_plugins_testfile.dta"), missing_type.state="0", saveto.objectname="my.stata.data", saveto.parent=".GlobalEnv", submit.mode="submit")

 			# In order to check, whether the import was correct
 			rk.print (my.stata.data)
@@ -77,11 +76,11 @@ suite <- new ("RKTestSuite", id="import_export_plugins",

 			cat ("testx <- c (20:30)\nprint (\"ok\")\n", file="source.R")

-			rk.call.plugin ("rkward::load_source", chdir.state="FALSE", echo.state="0", file.selection="source.R", local.state="TRUE", printeval.state="FALSE", submit.mode="submit")
+			rk.call.plugin ("rkward::load_source", chdir.state="FALSE", echo.state="0", file.selection=file.path (getwd(), "source.R"), local.state="TRUE", printeval.state="FALSE", submit.mode="submit")

 			stopifnot (!exists ("testx", globalenv ()))

-			rk.call.plugin ("rkward::load_source", chdir.state="FALSE", echo.state="1", file.selection="source.R", local.state="FALSE", printeval.state="FALSE", submit.mode="submit")
+			rk.call.plugin ("rkward::load_source", chdir.state="FALSE", </