[rkward/releases/0.6.4] debian-official: Copy packaging changes from master, in preparation for a 0.6.4-2 package.

Wed Feb 10 10:06:59 UTC 2016

Git commit 449ccdd001e4529233683ddb0f1daa16dbee7402 by Thomas Friedrichsmeier.
Committed on 10/02/2016 at 10:06.
Pushed by tfry into branch 'releases/0.6.4'.

Copy packaging changes from master, in preparation for a 0.6.4-2 package.

M  +9    -1    debian-official/changelog
M  +14   -1    debian-official/control
A  +1    -0    debian-official/rkward-data.install
A  +1    -0    debian-official/rkward-data.manpages
A  +2    -0    debian-official/rkward.install
M  +14   -5    debian-official/rules
M  +1    -1    debian-official/source.lintian-overrides

http://commits.kde.org/rkward/449ccdd001e4529233683ddb0f1daa16dbee7402

diff --git a/debian-official/changelog b/debian-official/changelog
index 17b7f73..ef4f937 100644
--- a/debian-official/changelog
+++ b/debian-official/changelog
@@ -1,3 +1,11 @@
+rkward (0.6.4-2) unstable; urgency=low
+  * 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
+
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Wed, 10 Feb 2016 11:00:00 +0100
+
 rkward (0.6.4-1) unstable; urgency=low
   * new upstream release
   * add override for false-positive source-is-missing lintian warnings
@@ -10,7 +18,7 @@ rkward (0.6.4-1) unstable; urgency=low
   * Make build reproducible (thanks to Philip Rinn)
     closes: #783290
 
- -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Sat, 19 Dec 2015 21:10:00 +0100
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Wed, 16 Dec 2015 10:30:00 +0100
 
 rkward (0.6.3-1) unstable; urgency=low
   * new upstream release
diff --git a/debian-official/control b/debian-official/control
index 7068977..342bb07 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,16 @@ 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
+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..1aa5c0e
--- /dev/null
+++ b/debian-official/rkward-data.install
@@ -0,0 +1 @@
+usr/share/
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
new file mode 100644
index 0000000..e09844a
--- /dev/null
+++ b/debian-official/rkward.install
@@ -0,0 +1,2 @@
+usr/bin/
+usr/lib/
\ No newline at end of file
diff --git a/debian-official/rules b/debian-official/rules
index d0ba5f6..491ab34 100755
--- a/debian-official/rules
+++ b/debian-official/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
@@ -94,13 +97,19 @@ install: build
 	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-official/source.lintian-overrides b/debian-official/source.lintian-overrides
index 59ba7bd..836b8f5 100644
--- a/debian-official/source.lintian-overrides
+++ b/debian-official/source.lintian-overrides
@@ -1,4 +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-is-missing rkward/plugins/*.js
-
+rkward source: source-contains-prebuilt-javascript-object rkward/plugins/*.js

