diff -Nru ros-gencpp-0.5.3/CHANGELOG.rst ros-gencpp-0.5.5/CHANGELOG.rst
--- ros-gencpp-0.5.3/CHANGELOG.rst	2014-12-23 01:56:29.000000000 +0000
+++ ros-gencpp-0.5.5/CHANGELOG.rst	2016-06-27 22:00:58.000000000 +0000
@@ -2,6 +2,14 @@
 Changelog for package gencpp
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.5.5 (2016-06-27)
+------------------
+* fix extra semicolon warning (`#26 <https://github.com/ros/gencpp/issues/26>`_)
+
+0.5.4 (2016-03-14)
+------------------
+* fix unused parameter warning (`#24 <https://github.com/ros/gencpp/issues/24>`_)
+
 0.5.3 (2014-12-22)
 ------------------
 * remove copyright header from generated code (`#20 <https://github.com/ros/gencpp/issues/20>`_)
diff -Nru ros-gencpp-0.5.3/debian/changelog ros-gencpp-0.5.5/debian/changelog
--- ros-gencpp-0.5.3/debian/changelog	2015-12-22 14:55:00.000000000 +0000
+++ ros-gencpp-0.5.5/debian/changelog	2016-07-21 09:53:49.000000000 +0000
@@ -1,4 +1,22 @@
-ros-gencpp (0.5.3-3~20151222) trusty; urgency=medium
+ros-gencpp (0.5.5-1~20160721) trusty; urgency=medium
+
+  * Imported Upstream version 0.5.5
+
+ -- Jochen Sprickerhof <debian@jochen.sprickerhof.de>  Sun, 10 Jul 2016 09:34:40 +0200
+
+ros-gencpp (0.5.4-1) unstable; urgency=medium
+
+  * Imported Upstream version 0.5.4
+
+ -- Jochen Sprickerhof <debian@jochen.sprickerhof.de>  Sat, 18 Jun 2016 11:17:17 +0200
+
+ros-gencpp (0.5.3-4) unstable; urgency=medium
+
+  * Adopt to new libexec location in catkin
+
+ -- Jochen Sprickerhof <debian@jochen.sprickerhof.de>  Tue, 16 Feb 2016 10:39:10 +0100
+
+ros-gencpp (0.5.3-3) unstable; urgency=medium
 
   * Convert to new catkin with multiarch
 
diff -Nru ros-gencpp-0.5.3/debian/control ros-gencpp-0.5.5/debian/control
--- ros-gencpp-0.5.3/debian/control	2015-12-17 22:50:40.000000000 +0000
+++ ros-gencpp-0.5.5/debian/control	2016-07-21 08:31:09.000000000 +0000
@@ -5,7 +5,7 @@
 Uploaders: Thomas Moulard <thomas.moulard@gmail.com>,
            Jochen Sprickerhof <debian@jochen.sprickerhof.de>,
            Leopold Palomo-Avellaneda <leo@alaxarxa.net>
-Build-Depends: debhelper (>= 9), catkin (>> 0.6.16-2), python-genmsg, python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), dh-python
+Build-Depends: debhelper (>= 9), catkin (>= 0.6.16-4), python-genmsg, python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), dh-python
 Standards-Version: 3.9.6
 Homepage: http://wiki.ros.org/gencpp
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/ros/ros-gencpp.git
diff -Nru ros-gencpp-0.5.3/debian/python-gencpp.install ros-gencpp-0.5.5/debian/python-gencpp.install
--- ros-gencpp-0.5.3/debian/python-gencpp.install	2015-12-17 22:50:40.000000000 +0000
+++ ros-gencpp-0.5.5/debian/python-gencpp.install	2016-07-21 08:31:09.000000000 +0000
@@ -1,4 +1,4 @@
 usr/share/gencpp
-usr/lib/*/gencpp /usr/lib
+usr/lib/gencpp
 usr/lib/*/pkgconfig usr/lib
 usr/etc/ros /etc
diff -Nru ros-gencpp-0.5.3/package.xml ros-gencpp-0.5.5/package.xml
--- ros-gencpp-0.5.3/package.xml	2014-12-23 01:56:29.000000000 +0000
+++ ros-gencpp-0.5.5/package.xml	2016-06-27 22:00:58.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>gencpp</name>
-  <version>0.5.3</version>
+  <version>0.5.5</version>
   <description>C++ ROS message and service generators.</description>
   <maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
   <license>BSD</license>
diff -Nru ros-gencpp-0.5.3/scripts/msg.h.template ros-gencpp-0.5.5/scripts/msg.h.template
--- ros-gencpp-0.5.3/scripts/msg.h.template	2014-12-23 01:56:29.000000000 +0000
+++ ros-gencpp-0.5.5/scripts/msg.h.template	2016-06-27 22:00:58.000000000 +0000
@@ -70,6 +70,9 @@
   @('\n  '.join(gencpp.generate_initializer_list(spec, alloc_name != '' )))@
   {
 @# Fixed length arrays
+@[if alloc_name != '' and not [f for f in spec.parsed_fields() if f.is_array and f.array_len is not None and f.base_type == 'string']]@
+  (void)_alloc;
+@[end if]@
   @('\n  '.join(gencpp.generate_fixed_length_assigns(spec, alloc_name != '', '%s::'%(spec.package))))@
   }
 @[end for]
@@ -221,7 +224,7 @@
     {}
 @[end if]@
 
-    ROS_DECLARE_ALLINONE_SERIALIZER;
+    ROS_DECLARE_ALLINONE_SERIALIZER
   }; // struct @(cpp_class)
 
 } // namespace serialization