[catkin] 01/02: Resolving conflics
Leopold Palomo-Avellaneda
lepalom-guest at moszumanska.debian.org
Thu Dec 5 09:09:56 UTC 2013
This is an automated email from the git hooks/post-receive script.
lepalom-guest pushed a commit to branch debian-robotics
in repository catkin.
commit 44b32557a27f173afc1fdccc2e67479504410747
Merge: a114119 83c365a
Author: Leopold Palomo <leopold.palomo at upc.edu>
Date: Thu Dec 5 09:51:28 2013 +0100
Resolving conflics
CHANGELOG.rst | 133 ++++++++-
CMakeLists.txt | 6 +-
README.rst | 2 +-
bin/catkin_make | 26 +-
bin/catkin_make_isolated | 15 +-
bin/catkin_prepare_release | 301 +++++++++++++++------
bin/catkin_test_results | 3 +-
cmake/all.cmake | 2 +-
cmake/catkinConfig.cmake.in | 8 +
cmake/catkin_generate_environment.cmake | 5 +-
cmake/catkin_package.cmake | 41 ++-
cmake/catkin_python_setup.cmake | 7 +-
cmake/em/order_packages.cmake.em | 10 +-
cmake/em/pkg.pc.em | 8 +-
cmake/env-hooks/05.catkin_make.bash | 8 +-
cmake/env-hooks/05.catkin_make_isolated.bash | 8 +-
cmake/parse_package_xml.py | 17 +-
cmake/python.cmake | 9 +-
cmake/templates/_setup_util.py.in | 41 ++-
cmake/templates/env.sh.in | 8 +-
cmake/templates/pkg.context.pc.in | 15 +-
cmake/templates/pkgConfig.cmake.in | 15 +-
cmake/templates/setup.bash.in | 5 +-
cmake/templates/setup.sh.in | 45 ++-
cmake/templates/setup.zsh.in | 3 +-
cmake/test/catkin_download_test_data.cmake | 4 +
cmake/test/download_test_data.cmake | 4 +
cmake/test/gtest.cmake | 6 +-
cmake/test/nosetests.cmake | 6 +-
cmake/test/run_tests.py | 29 +-
cmake/test/tests.cmake | 85 +++++-
debian/control | 3 +-
doc/adv_user_guide/adv_user_guide.rst | 4 +-
doc/{user_guide => adv_user_guide}/builddocs.rst | 0
doc/howto/building_executables.rst | 4 +-
doc/howto/building_libraries.rst | 15 +-
doc/howto/building_msgs.rst | 11 +-
doc/howto/catkin_library_dependencies.rst | 18 +-
doc/howto/catkin_overview.rst | 7 +-
doc/howto/cpp_msg_dependencies.rst | 17 +-
doc/howto/downloading_test_data.rst | 61 +++++
doc/howto/dynamic_reconfiguration.rst | 2 +-
doc/howto/gtest_configuration.rst | 33 +++
doc/howto/index.rst | 15 +-
doc/howto/installing_cmake.rst | 2 +-
doc/howto/installing_other.rst | 2 +-
doc/howto/installing_python.rst | 4 +-
doc/howto/python_module_dependencies.rst | 12 +-
doc/howto/python_nose_configuration.rst | 29 ++
doc/howto/rostest_configuration.rst | 49 ++++
doc/howto/system_library_dependencies.rst | 16 +-
doc/index.rst | 67 +----
doc/{adv_user_guide => user_guide}/environment.rst | 26 +-
doc/user_guide/find_package.rst | 11 +-
doc/{adv_user_guide => user_guide}/glossary.rst | 0
doc/user_guide/installation.rst | 36 +++
doc/user_guide/standards.rst | 9 +-
doc/user_guide/user_guide.rst | 7 +-
doc/{adv_user_guide => user_guide}/variables.rst | 0
package.xml | 2 +-
python/catkin/builder.py | 259 +++++++++++-------
python/catkin/package_version.py | 52 ++++
python/catkin/tidy_xml.py | 15 +-
63 files changed, 1215 insertions(+), 448 deletions(-)
diff --cc debian/control
index 6fcc1fd,29a2d12..007d292
--- a/debian/control
+++ b/debian/control
@@@ -6,10 -6,11 +6,11 @@@ Priority: extr
Build-Depends: debhelper (>= 9),
python,
python-catkin-pkg,
- python-empy
- python-empy,
- cmake
++ python-empy,
++ cmake
Standards-Version: 3.9.4
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/ros/catkin.git
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/ros/catkin.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/ros/catkin.git
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/ros/catkin.git
Homepage: http://www.ros.org/wiki/catkin
X-Python-Version: >= 2.7
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/catkin.git
More information about the debian-science-commits
mailing list