[ros-catkin] 01/02: Cleanup installation

[Jochen Sprickerhof]

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

jspricke-guest pushed a commit to branch master
in repository ros-catkin.

commit 25ef44348349607244874c77acfeea0f76a55cc6
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Nov 24 18:07:24 2015 +0100

    Cleanup installation
---
 debian/catkin.install   |  5 +++++
 debian/catkin.pyinstall |  1 +
 debian/rules            | 24 +++++++-----------------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/debian/catkin.install b/debian/catkin.install
new file mode 100644
index 0000000..aded0a8
--- /dev/null
+++ b/debian/catkin.install
@@ -0,0 +1,5 @@
+usr/share/catkin/package.xml
+usr/share/catkin/cmake
+cmake/env-hooks/* usr/share/bash-completion/completions
+usr/lib/*/pkgconfig usr/lib
+usr/bin
diff --git a/debian/catkin.pyinstall b/debian/catkin.pyinstall
new file mode 100644
index 0000000..3a22ba7
--- /dev/null
+++ b/debian/catkin.pyinstall
@@ -0,0 +1 @@
+python/catkin/*.py catkin
diff --git a/debian/rules b/debian/rules
index 25adb21..fad9cbd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,25 +1,15 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/default.mk
 
 %:
-	dh  $@ --parallel --buildsystem=cmake
-	dh  $@ --parallel --buildsystem=python_distutils
+	dh  $@ --parallel --buildsystem=cmake --with python2
+
+override_dh_auto_install:
+	dh_auto_install --destdir=debian/tmp
 
 override_dh_auto_clean:
 	dh_auto_clean --
-	-rm -rf build
 	-find . -name '*.pyc' -print0 | xargs -0 rm -f
-	-rm -f bin/catkin_findc
-	-rm -f bin/catkin_make_isolatedc
-
-override_dh_auto_install:
-	dh_auto_install --
-	mkdir -p debian/catkin/usr/share/bash-completion/completions
-	mv debian/catkin/usr/etc/catkin/profile.d/05.catkin_make.bash debian/catkin/usr/share/bash-completion/completions/catkin_make
-	mv debian/catkin/usr/etc/catkin/profile.d/05.catkin_make_isolated.bash debian/catkin/usr/share/bash-completion/completions/catkin_make_isolated
-	rm -r debian/catkin/usr/etc
-	-rm -f debian/catkin/usr/share/catkin/LICENSE
-	-rm -f debian/catkin/usr/*.*
-	-rm -f debian/catkin/usr/.*
-	-rm -f debian/catkin/usr/share/catkin/cmake/templates/script.in
-	-find debian/catkin -name '*.pyc' -print0 | xargs -0 rm -f
+	-rm -f bin/catkin_findc bin/catkin_make_isolatedc

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