[ocl] 08/23: Solving conficts

[Leopold Palomo-Avellaneda]

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

lepalom-guest pushed a commit to branch master
in repository ocl.

commit b532ae1d2d3e96b2c9b04988eb58df073056d693
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date:   Wed Apr 15 08:59:16 2015 +0200

    Solving conficts
---
 debian/liborocos-ocl-common2.8-dev.install    | 2 ++
 debian/liborocos-ocl-tools-xenomai2.8.install | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/liborocos-ocl-common2.8-dev.install b/debian/liborocos-ocl-common2.8-dev.install
index 3ba3eb5..c63a1c2 100644
--- a/debian/liborocos-ocl-common2.8-dev.install
+++ b/debian/liborocos-ocl-common2.8-dev.install
@@ -2,4 +2,6 @@ usr/share/ocl/* usr/share/orocos-ocl/
 usr/share/lua*
 usr/include/*
 usr/lib/cmake/*
+usr/bin/orocreate-catkin-pkg
+usr/bin/orocreate-pkg
 
diff --git a/debian/liborocos-ocl-tools-xenomai2.8.install b/debian/liborocos-ocl-tools-xenomai2.8.install
index aaf622b..2512076 100644
--- a/debian/liborocos-ocl-tools-xenomai2.8.install
+++ b/debian/liborocos-ocl-tools-xenomai2.8.install
@@ -1 +1 @@
-usr/bin/*gnulinux*
+usr/bin/*xenomai*

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