Merge branch 'master' of git://github.com/ros/genpy

.gitignore

@@ -1,2 +1,6 @@
 *.pyc
 ._*
+*~
+build/
+genpy.egg-info/
+dist/

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
 project(genpy)
 find_package(catkin)
 
-# add_subdirectory(scripts)
+add_subdirectory(scripts)
 
 install_cmake_infrastructure(genpy
   VERSION 0.0.1
@@ -17,5 +17,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/genpy
   )
 
 catkin_package(genpy)
-
 enable_python(genpy)

cmake/genpy-extras.cmake.in

@@ -3,9 +3,15 @@ if(@PACKAGE_NAME@_SOURCE_DIR)
   find_program_required(GENSRV_PY_BIN gensrv_py.py PATHS ${@PACKAGE_NAME@_SOURCE_DIR}/scripts)
   set(GENPY_TEMPLATE_DIR ${@PACKAGE_NAME@_SOURCE_DIR}/scripts)
 else()
-  find_program_required(GENMSG_PY_BIN genmsg_py.py)
-  find_program_required(GENSRV_PY_BIN gensrv_py.py)
-  set(GENPY_TEMPLATE_DIR ${CMAKE_INSTALL_PREFIX}/share/genpy)
+
+  find_program_required(GENMSG_PY_BIN genmsg_py.py
+    PATHS @CMAKE_INSTALL_PREFIX@/share/genpy/bin
+    )
+  find_program_required(GENSRV_PY_BIN gensrv_py.py
+    PATHS @CMAKE_INSTALL_PREFIX@/share/genpy/bin
+    )
+
+  set(GENPY_TEMPLATE_DIR @CMAKE_INSTALL_PREFIX@/share/genpy)
 endif()
 
 # Generate .msg->.h for py

scripts/CMakeLists.txt

@@ -1,10 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
-
 install(
   PROGRAMS genmsg_py.py gensrv_py.py
-  DESTINATION bin)
-
-#install(
-#  FILES msg.h.template srv.h.template
-#  DESTINATION share/genpy
-#  )
+  DESTINATION share/genpy/bin
+  )

setup.py

@@ -13,15 +13,15 @@
       package_dir = {'':'src'},
       install_requires=['genmsg'],
       scripts = ['scripts/genmsg_py.py', 'scripts/gensrv_py.py'],
-      author = "Ken Conley", 
+      author = "Ken Conley",
       author_email = "kwc@willowgarage.com",
       url = "http://www.ros.org/wiki/genpy",
-      download_url = "http://pr.willowgarage.com/downloads/genpy/", 
+      download_url = "http://pr.willowgarage.com/downloads/genpy/",
       keywords = ["ROS"],
       classifiers = [
-        "Programming Language :: Python", 
+        "Programming Language :: Python",
         "License :: OSI Approved :: BSD License" ],
-      description = "ROS msg/srv Python generation", 
+      description = "ROS msg/srv Python generation",
       long_description = """\
 Library and scripts for generating ROS message data structures in Python.
 """,

stack.yaml

@@ -1,18 +1,15 @@
-Package: genpy
-Version: 0.1.0
-Section: misc
-Priority: extra
-Architecture: any
-Depends: cmake, python, @(PackagePrefix)genmsg, @(PackagePrefix)catkin
-Build-Depends: cmake, python, python-setuptools,
-               @(PackagePrefix)catkin, @(PackagePrefix)genmsg 
+Catkin-ProjectName: genpy
+Version: 0.1.3
 Description: Willow Garage low level build system macros and infrastructure
 Author: Troy Straszheim <straszheim@willowgarage.com>, Morten Kjaergaard
 Maintainer: Troy Straszheim <straszheim@willowgarage.com>
 Homepage: http://www.ros.org
 
-Catkin-ProjectName: genpy
+Depends: catkin, genmsg
+
 Catkin-CopyrightType:  willowgarage
-Catkin-Depends: catkin, genmsg
-Catkin-ROS-Message-Generator: py
 Catkin-DebRulesType: python_distutils
+Catkin-ROS-Message-Generator: py
+
+Release-Pull: git://github.com/wg-debs/genpy.git
+Release-Push: git@github.com:wg-debs/genpy.git