[ros-common-msgs] 01/03: Fix location of genaction.py

[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-common-msgs.

commit 40df426ca03a8924d811c0a1110ab72ffc37ad76
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Nov 24 16:47:14 2015 +0100

    Fix location of genaction.py
---
 debian/control                                      |  2 +-
 debian/libactionlib-msgs-dev.install                |  2 +-
 .../patches/0003-Fix-location-of-genaction.py.patch | 21 +++++++++++++++++++++
 debian/patches/copyright-date-typo-fix.patch        | 14 +++++++++++---
 debian/patches/series                               |  1 +
 5 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index d1315e0..babfa63 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Vcs-Git: git://anonscm.debian.org/debian-science/packages/ros/ros-common-msgs.gi
 
 Package: libactionlib-msgs-dev
 Section: libdevel
-Architecture: any
+Architecture: all
 Depends: ${misc:Depends}, python
 Description: Messages relating to the Robot OS actionlib, C/C++ interface
  This package is part of Robot OS (ROS), and contains the common
diff --git a/debian/libactionlib-msgs-dev.install b/debian/libactionlib-msgs-dev.install
index bd7d8a5..08e6bb2 100644
--- a/debian/libactionlib-msgs-dev.install
+++ b/debian/libactionlib-msgs-dev.install
@@ -1,4 +1,4 @@
 usr/include/actionlib_msgs
 usr/share/actionlib_msgs
-usr/lib/*/actionlib_msgs
+usr/lib/*/actionlib_msgs usr/lib
 usr/lib/*/pkgconfig/actionlib_msgs.pc /usr/lib/pkgconfig
diff --git a/debian/patches/0003-Fix-location-of-genaction.py.patch b/debian/patches/0003-Fix-location-of-genaction.py.patch
new file mode 100644
index 0000000..f8fe769
--- /dev/null
+++ b/debian/patches/0003-Fix-location-of-genaction.py.patch
@@ -0,0 +1,21 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Tue, 24 Nov 2015 16:46:45 +0100
+Subject: Fix location of genaction.py
+
+---
+ actionlib_msgs/cmake/actionlib_msgs-extras.cmake.em | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/actionlib_msgs/cmake/actionlib_msgs-extras.cmake.em b/actionlib_msgs/cmake/actionlib_msgs-extras.cmake.em
+index ea29bd2..3e1cc48 100644
+--- a/actionlib_msgs/cmake/actionlib_msgs-extras.cmake.em
++++ b/actionlib_msgs/cmake/actionlib_msgs-extras.cmake.em
+@@ -8,7 +8,7 @@ include(CMakeParseArguments)
+ set(GENACTION_BIN "@(CMAKE_CURRENT_SOURCE_DIR)/scripts/genaction.py")
+ @[else]@
+ # program in installspace
+-set(GENACTION_BIN "${actionlib_msgs_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)/genaction.py")
++set(GENACTION_BIN "/usr/lib/actionlib_msgs/genaction.py")
+ @[end if]@
+ 
+ macro(add_action_files)
diff --git a/debian/patches/copyright-date-typo-fix.patch b/debian/patches/copyright-date-typo-fix.patch
index c4e4bdb..31c429e 100644
--- a/debian/patches/copyright-date-typo-fix.patch
+++ b/debian/patches/copyright-date-typo-fix.patch
@@ -1,11 +1,19 @@
-Description: Fix typo in copyright date
+From: Debian Science Maintainers
+ <debian-science-maintainers at lists.alioth.debian.org>
+Date: Tue, 24 Nov 2015 16:46:14 +0100
+Subject: copyright-date-typo-fix
 
 Forwarded: no
 #but it should be
 Last-Update: 2015-11-20
+---
+ sensor_msgs/src/sensor_msgs/point_cloud2.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
---- ros-common-msgs-1.12.3.orig/sensor_msgs/src/sensor_msgs/point_cloud2.py
-+++ ros-common-msgs-1.12.3/sensor_msgs/src/sensor_msgs/point_cloud2.py
+diff --git a/sensor_msgs/src/sensor_msgs/point_cloud2.py b/sensor_msgs/src/sensor_msgs/point_cloud2.py
+index 9bfc0c8..b19f103 100644
+--- a/sensor_msgs/src/sensor_msgs/point_cloud2.py
++++ b/sensor_msgs/src/sensor_msgs/point_cloud2.py
 @@ -2,7 +2,7 @@
  
  # Software License Agreement (BSD License)
diff --git a/debian/patches/series b/debian/patches/series
index dca799b..a86fc7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Added-CMakeLists-to-build-the-package.patch
 copyright-date-typo-fix.patch
+0003-Fix-location-of-genaction.py.patch

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