[rkward/releases/0.6.5] debian: Split into rkward and rkward-data for PPA releases, too.

[Thomas Friedrichsmeier]

Git commit cabce4e158d11281b2dc26c69cf80a63c89bd27b by Thomas Friedrichsmeier.
Committed on 31/03/2016 at 19:09.
Pushed by tfry into branch 'releases/0.6.5'.

Split into rkward and rkward-data for PPA releases, too.

M  +5    -0    debian/changelog
M  +17   -2    debian/control
A  +1    -0    debian/rkward-data.install
A  +1    -0    debian/rkward-data.manpages
A  +2    -0    debian/rkward.install
M  +15   -6    debian/rules
A  +4    -0    debian/source.lintian-overrides

http://commits.kde.org/rkward/cabce4e158d11281b2dc26c69cf80a63c89bd27b

diff --git a/debian/changelog b/debian/changelog
index de08bff..1bbf443 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 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 at users.sourceforge.net>  Wed, 30 Mar 2016 14:00:00 +0100
 
diff --git a/debian/control b/debian/control
index 642c07a..6878073 100644
--- 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.
diff --git a/debian/rkward-data.install b/debian/rkward-data.install
new file mode 100644
index 0000000..3a5094e
--- /dev/null
+++ b/debian/rkward-data.install
@@ -0,0 +1 @@
+usr/share/
\ No newline at end of file
diff --git a/debian/rkward-data.manpages b/debian/rkward-data.manpages
new file mode 100644
index 0000000..56c56af
--- /dev/null
+++ b/debian/rkward-data.manpages
@@ -0,0 +1 @@
+build/doc/rkward/rkward.1
diff --git a/debian/rkward.install b/debian/rkward.install
new file mode 100644
index 0000000..e09844a
--- /dev/null
+++ b/debian/rkward.install
@@ -0,0 +1,2 @@
+usr/bin/
+usr/lib/
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 3200f21..f798733 100755
--- 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
 
 # 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
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..3fc784b
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,4 @@
+# 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*