[rkward] debian-official: Strip x-test locale from debian-official package

[Thomas Friedrichsmeier]

Git commit 51bb4b97bb1a1d85fe72e4dca30633cbaa6ddc3c by Thomas Friedrichsmeier.
Committed on 06/02/2016 at 13:53.
Pushed by tfry into branch 'master'.

Strip x-test locale from debian-official package

M  +2    -0    debian-official/changelog
M  +9    -3    debian-official/rules

http://commits.kde.org/rkward/51bb4b97bb1a1d85fe72e4dca30633cbaa6ddc3c

diff --git a/debian-official/changelog b/debian-official/changelog
index b084395..503613c 100644
--- a/debian-official/changelog
+++ b/debian-official/changelog
@@ -1,5 +1,7 @@
 rkward (0.6.4z+0.6.5+devel1-1) UNRELEASED; urgency=low
   * new upstream release
+  * strip testing locale "x-test" from package
+  * split architecture independent files into rkward-data package
   * add override for false-positive source-contains-prebuilt-javascript-object
     lintian warnings
 
diff --git a/debian-official/rules b/debian-official/rules
index d0ba5f6..bc7a25b 100755
--- a/debian-official/rules
+++ b/debian-official/rules
@@ -95,12 +95,18 @@ install: build
 	dh_installdirs
 
 	# Add here commands to install the package into debian/rkward.
-	cd $(CURDIR)/build && $(MAKE) install DESTDIR=$(CURDIR)/debian/rkward
+	cd $(CURDIR)/build && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	# 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