[rkward/releases/0.6.5] /: Re-introduce split into rkward and rkward-data packages.

[Thomas Friedrichsmeier]

Git commit 38bdc05a137fdc58b2f4506ce19a8352c5bed9f1 by Thomas Friedrichsmeier.
Committed on 29/03/2016 at 11:20.
Pushed by tfry into branch 'releases/0.6.5'.

Re-introduce split into rkward and rkward-data packages.

Adjust packaging script to support creating ~rc-release packages.

M  +3    -2    debian-official/changelog
M  +16   -1    debian-official/control
A  +1    -0    debian-official/rkward-data.install
A  +1    -0    debian-official/rkward-data.manpages
M  +2    -1    debian-official/rkward.install
M  +5    -4    scripts/make_debian_package.sh

http://commits.kde.org/rkward/38bdc05a137fdc58b2f4506ce19a8352c5bed9f1

diff --git a/debian-official/changelog b/debian-official/changelog
index d8082e6..d86949e 100644
--- a/debian-official/changelog
+++ b/debian-official/changelog
@@ -1,5 +1,6 @@
-rkward (0.6.5-1) 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
   * add override for false-positive source-contains-prebuilt-javascript-object
@@ -7,7 +8,7 @@ rkward (0.6.5-1) unstable; urgency=low
   * make existing lintian overrides work with lintian 2.5.42
   * Adjust copyright file to changed filenames in rkward/qwinhost
 
- -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Thu, 24 Mar 2016 20:00:00 +0100
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Tue, 29 Mar 2016 11:00:00 +0100
 
 rkward (0.6.4-1) unstable; urgency=low
   * new upstream release
diff --git a/debian-official/control b/debian-official/control
index 9aaa137..468edfa 100644
--- a/debian-official/control
+++ b/debian-official/control
@@ -14,7 +14,7 @@ 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,
@@ -22,3 +22,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.
diff --git a/debian-official/rkward-data.install b/debian-official/rkward-data.install
new file mode 100644
index 0000000..3a5094e
--- /dev/null
+++ b/debian-official/rkward-data.install
@@ -0,0 +1 @@
+usr/share/
\ No newline at end of file
diff --git a/debian-official/rkward-data.manpages b/debian-official/rkward-data.manpages
new file mode 100644
index 0000000..56c56af
--- /dev/null
+++ b/debian-official/rkward-data.manpages
@@ -0,0 +1 @@
+build/doc/rkward/rkward.1
diff --git a/debian-official/rkward.install b/debian-official/rkward.install
index d7a0d79..e09844a 100644
--- a/debian-official/rkward.install
+++ b/debian-official/rkward.install
@@ -1 +1,2 @@
-usr/
\ No newline at end of file
+usr/bin/
+usr/lib/
\ No newline at end of file
diff --git a/scripts/make_debian_package.sh b/scripts/make_debian_package.sh
index 5dca805..3718eb9 100755
--- 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 --force-sign
 
 cd $DEBTEMPDIR
 dpkg-scansources . | bzip2 > Sources.bz2
-LINTIAN_PROFILE=debian lintian rkward_$VERSION-*.changes
+LINTIAN_PROFILE=debian lintian rkward_$VERSION${DEBSUFFIX}-*.changes