[iep] 06/16: d/rules: build and install resources to common pkg

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository iep.

commit d8fc923d9d861e91ba82ebe3b624beb536f3d8a3
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Jan 30 10:28:35 2015 +0000

    d/rules: build and install resources to common pkg
---
 debian/rules | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/rules b/debian/rules
index 7e6453b..0edef14 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,23 +12,23 @@ IEP_DESTDIR=debian/iep
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
+override_dh_auto_build:
+	dh_auto_build
+	# generate application icon
+	convert $(CURDIR)/iep/resources/appicons/ieplogo32.png -resize 32 \
+		$(CURDIR)/iep/resources/appicons/ieplogo.xpm	
+
 override_dh_auto_install:
 	dh_auto_install
-	# move arch-indep files to /usr/share
-	find . -type d -name __pycache__ | xargs rm -rf
-	mkdir -p $(CURDIR)/$(PYBUILD_DESTDIR_python3)/usr/share/$(PYBUILD_NAME)
-	mv $(CURDIR)/$(PYBUILD_DESTDIR_python3)/usr/lib/python3.4/dist-packages/iep/resources \
-		$(CURDIR)/$(PYBUILD_DESTDIR_python3)/usr/share/$(PYBUILD_NAME)/
-	mv $(CURDIR)/$(PYBUILD_DESTDIR_python3)/usr/lib/python3.4/dist-packages/iep/*.txt \
-		$(CURDIR)/$(PYBUILD_DESTDIR_python3)/usr/share/$(PYBUILD_NAME)/
-	# move script to separate iep package
+	# install common package files
+	dh_install --package=iep-common iep/resources usr/share/$(PYBUILD_NAME)
+	dh_install --package=iep-common iep/*.txt usr/share/$(PYBUILD_NAME)
+	rm -rf $(CURDIR)/$(PYBUILD_DESTDIR_python3)/iep/resources
+	rm -rf $(CURDIR)/$(PYBUILD_DESTDIR_python3)/iep/*.txt
+	# install launcher 
 	dh_install --sourcedir=$(CURDIR)/$(PYBUILD_DESTDIR_python3) \
 		--package=iep usr/bin
 	rm -rf $(CURDIR)/$(PYBUILD_DESTDIR_python3)/usr/bin
 	# install desktop file
 	mkdir -p $(CURDIR)/$(IEP_DESTDIR)/usr/share/applications
 	cp $(CURDIR)/debian/iep.desktop $(CURDIR)/$(IEP_DESTDIR)/usr/share/applications
-	# generate and install icon
-	mkdir -p $(CURDIR)/$(IEP_DESTDIR)/usr/share/pixmaps
-	convert $(CURDIR)/iep/resources/appicons/ieplogo32.png -resize 32 \
-		$(CURDIR)/$(IEP_DESTDIR)/usr/share/pixmaps/ieplogo.xpm

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/iep.git