From 3eab9dc9888bca1c98bf319156a8a8137722f65a Mon Sep 17 00:00:00 2001
From: Anthony Mallet <anthony.mallet@laas.fr>
Date: Thu, 14 Aug 2014 17:39:01 +0200
Subject: [PATCH] [image/ros-image-common] Update to 1.11.3

Changes since 1.10.5:

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Changelog for package camera_info_manager
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.11.3 (2014-05-19)
-------------------
* Add public member function to manually set camera info (`#19
  <https://github.com/ros-perception/image_common/issues/19>`_)
* make rostest in CMakeLists optional (`ros/rosdistro#3010
  <https://github.com/ros/rosdistro/issues/3010>`_)
* Contributors: Jack O'Quin, Jonathan Bohren, Lukas Bulwahn
---
 image/ros-image-common/Makefile  | 4 ++--
 image/ros-image-common/PLIST     | 8 +-------
 image/ros-image-common/depend.mk | 4 ++--
 image/ros-image-common/distinfo  | 6 +++---
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/image/ros-image-common/Makefile b/image/ros-image-common/Makefile
index 6761d6e3..059c0cc2 100644
--- a/image/ros-image-common/Makefile
+++ b/image/ros-image-common/Makefile
@@ -4,7 +4,7 @@
 
 ROS_PKG=		image_common
 ROS_METAPKG=		yes
-ROS_VERSION=		1.10.5
+ROS_VERSION=		1.11.3
 ROS_REPO=		ros-perception
 
 # for some reason, the tar.gz generated by git hub has "invalid headers"
@@ -15,7 +15,7 @@ ROS_COMMENT=		common code for working with images
 
 include ../../meta-pkgs/ros-base/Makefile.common
 
-CMAKE_ARGS+=		-DTINYXML_ROOT=${PREFIX.tinyxml}
+CMAKE_ARGS+=		-DTinyXML_ROOT_DIR=${PREFIX.tinyxml}
 CMAKE_ARGS+=		-DYAML_CPP_ROOT=${PREFIX.yaml-cpp}
 
 SUBST_CLASSES+=		py-interp
diff --git a/image/ros-image-common/PLIST b/image/ros-image-common/PLIST
index 6410c91e..a799ea14 100644
--- a/image/ros-image-common/PLIST
+++ b/image/ros-image-common/PLIST
@@ -1,4 +1,4 @@
-@comment Fri Jun 28 01:09:47 CEST 2013
+@comment Thu Aug 14 17:38:10 CEST 2014
 include/camera_calibration_parsers/parse.h
 include/camera_calibration_parsers/parse_ini.h
 include/camera_calibration_parsers/parse_yml.h
@@ -38,14 +38,8 @@ lib/pkgconfig/image_transport.pc
 lib/pkgconfig/polled_camera.pc
 lib/polled_camera/poller
 ${PYTHON_SITELIB}/polled_camera/__init__.py
-${PYTHON_SITELIB}/polled_camera/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/polled_camera/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
 ${PYTHON_SITELIB}/polled_camera/srv/_GetPolledImage.py
-${PYTHON_SITELIB}/polled_camera/srv/${PYTHON_PYCACHE}/_GetPolledImage${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/polled_camera/srv/${PYTHON_PYCACHE}/_GetPolledImage${PYTHON_TAG}.pyo
 ${PYTHON_SITELIB}/polled_camera/srv/__init__.py
-${PYTHON_SITELIB}/polled_camera/srv/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/polled_camera/srv/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
 share/camera_calibration_parsers/cmake/camera_calibration_parsersConfig-version.cmake
 share/camera_calibration_parsers/cmake/camera_calibration_parsersConfig.cmake
 share/camera_calibration_parsers/package.xml
diff --git a/image/ros-image-common/depend.mk b/image/ros-image-common/depend.mk
index e855e877..749e3442 100644
--- a/image/ros-image-common/depend.mk
+++ b/image/ros-image-common/depend.mk
@@ -18,12 +18,12 @@ SYSTEM_PREFIX.ros-image-common?=	${SYSTEM_PREFIX.ros-base}
 DEPEND_USE+=			ros-image-common
 ROS_DEPEND_USE+=		ros-image-common
 
-DEPEND_ABI.ros-image-common?=	ros-image-common>=1.8
+DEPEND_ABI.ros-image-common?=	ros-image-common>=1.10
 DEPEND_DIR.ros-image-common?=	../../image/ros-image-common
 
-DEPEND_ABI.ros-image-common.fuerte?=	ros-image-common>=1.8<1.9
 DEPEND_ABI.ros-image-common.groovy?=	ros-image-common>=1.10<1.11
 DEPEND_ABI.ros-image-common.hydro?=	ros-image-common>=1.11<1.12
+DEPEND_ABI.ros-image-common.indigo?=	ros-image-common>=1.11<1.12
 
 SYSTEM_SEARCH.ros-image-common=\
   'include/camera_calibration_parsers/parse.h'				\
diff --git a/image/ros-image-common/distinfo b/image/ros-image-common/distinfo
index 7c82bf07..9744d7c9 100644
--- a/image/ros-image-common/distinfo
+++ b/image/ros-image-common/distinfo
@@ -1,5 +1,5 @@
-SHA1 (ros/image_common-1.10.5.zip) = 9fde1f81fc584955c4aac470c224fa364d4314b5
-RMD160 (ros/image_common-1.10.5.zip) = bf428677ab278e5b110364414e862231b2fe0ab2
-Size (ros/image_common-1.10.5.zip) = 100577 bytes
+SHA1 (ros/image_common/1.11.3.zip) = 9e2d9f433521d7a5457d791c19f3524fb99100b3
+RMD160 (ros/image_common/1.11.3.zip) = 38a1d5e02b9a789609341962e30e18334c5b7202
+Size (ros/image_common/1.11.3.zip) = 105707 bytes
 SHA1 (patch-aa) = 4f7b4ab6f06a36d20111f2c712a303540aff2dcf
 SHA1 (patch-ab) = 8547681c695e9c7dc0bafd3598db9df47041e497