Skip to content

Commit 4540cf9

Browse files
author
Aaron Roller
committed
build: bloom generated debian files
rename of package BREAKING CHANGE: dji_sdk now dji_osdk_ros AM-604/4_0_1
1 parent d2132e7 commit 4540cf9

13 files changed

Lines changed: 118 additions & 113 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ build
1414
catkin_ws
1515
.vscode
1616

17-
debian/ros-*-dji-onboard-sdk-ros*
17+
debian/ros-*-dji-onboard-sdk-ros*
18+
debian/ros-*-dji-osdk-ros*

‎Makefile‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎configure‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎debian/README.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎debian/bloom-generate.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Debian dir generated by bloom using AMROS cli

‎debian/changelog‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
ros-melodic-dji-onboard-sdk-ros (4.0.0-AM7) unstable; urgency=medium
1+
ros-melodic-dji-osdk-ros (4.0.1-0bionic) bionic; urgency=high
2+
3+
* Autogenerated, no changelog for this version found in CHANGELOG.rst.
4+
5+
-- kevin.hoo <kevin.hoo@dji.com> Mon, 11 Jan 2021 21:09:28 -0000
6+
7+

‎debian/control‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,12 @@
1-
Source: ros-melodic-dji-onboard-sdk-ros
2-
Section: unknown
3-
Priority: extra
4-
Maintainer: AutoModality <dev@automodality.com>
5-
Build-Depends: debhelper (>=9) ,
6-
dji-onboard-sdk,
7-
ros-melodic-nmea-msgs,
8-
libusb-1.0-0-dev,
9-
ffmpeg,
10-
Standards-Version: 3.9.6
11-
Homepage: https://github.com/AutoModality/OSDK-ROS
1+
Source: ros-melodic-dji-osdk-ros
2+
Section: misc
3+
Priority: optional
4+
Maintainer: kevin.hoo <kevin.hoo@dji.com>
5+
Build-Depends: debhelper (>= 9.0.0), ros-melodic-actionlib, ros-melodic-actionlib-msgs, ros-melodic-catkin, ros-melodic-geometry-msgs, ros-melodic-message-filters, ros-melodic-message-generation, ros-melodic-nav-msgs, ros-melodic-nmea-msgs, ros-melodic-roscpp, ros-melodic-rospy, ros-melodic-std-msgs
6+
Homepage: http://developer.dji.com/onboard-sdk/documentation/github-platform-docs/ROS/README.html
7+
Standards-Version: 3.9.2
128

13-
Package: ros-melodic-dji-onboard-sdk-ros
9+
Package: ros-melodic-dji-osdk-ros
1410
Architecture: any
15-
Multi-Arch: foreign
16-
Depends: ${misc:Depends}, ${shlibs:Depends} ,
17-
dji-onboard-sdk,
18-
ros-melodic-nmea-msgs,
19-
libusb-1.0-0-dev,
20-
ffmpeg,
21-
Description: OSDK-ROS node for interfacing with DJI's OSDK
22-
11+
Depends: ${shlibs:Depends}, ${misc:Depends}, ros-melodic-actionlib, ros-melodic-actionlib-msgs, ros-melodic-geometry-msgs, ros-melodic-message-filters, ros-melodic-message-runtime, ros-melodic-nav-msgs, ros-melodic-nmea-msgs, ros-melodic-roscpp, ros-melodic-rospy, ros-melodic-std-msgs
12+
Description: A ROS package using DJI Onboard SDK

‎debian/rules‎

Lines changed: 54 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,65 @@
11
#!/usr/bin/make -f
2-
# You must remove unused comment lines for the released package.
3-
#export DH_VERBOSE = 1
4-
#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
5-
#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
6-
#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
2+
# -*- makefile -*-
3+
# Sample debian/rules that uses debhelper.
4+
# This file was originally written by Joey Hess and Craig Small.
5+
# As a special exception, when this file is copied by dh-make into a
6+
# dh-make output file, you may use that output file without restriction.
7+
# This special exception was added by Craig Small in version 0.37 of dh-make.
78

8-
%:
9-
dh $@
9+
# Uncomment this to turn on verbose mode.
10+
export DH_VERBOSE=1
11+
# TODO: remove the LDFLAGS override. It's here to avoid esoteric problems
12+
# of this sort:
13+
# https://code.ros.org/trac/ros/ticket/2977
14+
# https://code.ros.org/trac/ros/ticket/3842
15+
export LDFLAGS=
16+
export PKG_CONFIG_PATH=/opt/ros/melodic/lib/pkgconfig
17+
# Explicitly enable -DNDEBUG, see:
18+
# https://github.com/ros-infrastructure/bloom/issues/327
19+
export DEB_CXXFLAGS_MAINT_APPEND=-DNDEBUG
1020

21+
%:
22+
dh $@ -v --buildsystem=cmake
1123

1224
override_dh_auto_configure:
13-
@echo "Running dh_auto_configure"
14-
dh_auto_configure
25+
# In case we're installing to a non-standard location, look for a setup.sh
26+
# in the install tree that was dropped by catkin, and source it. It will
27+
# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
28+
if [ -f "/opt/ros/melodic/setup.sh" ]; then . "/opt/ros/melodic/setup.sh"; fi && \
29+
dh_auto_configure -- \
30+
-DCATKIN_BUILD_BINARY_PACKAGE="1" \
31+
-DCMAKE_INSTALL_PREFIX="/opt/ros/melodic" \
32+
-DCMAKE_PREFIX_PATH="/opt/ros/melodic"
1533

1634
override_dh_auto_build:
17-
@echo "Running the build"
35+
# In case we're installing to a non-standard location, look for a setup.sh
36+
# in the install tree that was dropped by catkin, and source it. It will
37+
# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
38+
if [ -f "/opt/ros/melodic/setup.sh" ]; then . "/opt/ros/melodic/setup.sh"; fi && \
1839
dh_auto_build
19-
@echo "Done running the build"
40+
41+
override_dh_auto_test:
42+
# In case we're installing to a non-standard location, look for a setup.sh
43+
# in the install tree that was dropped by catkin, and source it. It will
44+
# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
45+
echo -- Running tests. Even if one of them fails the build is not canceled.
46+
if [ -f "/opt/ros/melodic/setup.sh" ]; then . "/opt/ros/melodic/setup.sh"; fi && \
47+
dh_auto_test || true
48+
49+
override_dh_shlibdeps:
50+
# In case we're installing to a non-standard location, look for a setup.sh
51+
# in the install tree that was dropped by catkin, and source it. It will
52+
# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
53+
if [ -f "/opt/ros/melodic/setup.sh" ]; then . "/opt/ros/melodic/setup.sh"; fi && \
54+
dh_shlibdeps -l$(CURDIR)/debian/ros-melodic-dji-osdk-ros//opt/ros/melodic/lib/
55+
56+
override_dh_auto_install:
57+
# In case we're installing to a non-standard location, look for a setup.sh
58+
# in the install tree that was dropped by catkin, and source it. It will
59+
# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
60+
if [ -f "/opt/ros/melodic/setup.sh" ]; then . "/opt/ros/melodic/setup.sh"; fi && \
61+
dh_auto_install
62+
2063

2164
override_dh_builddeb:
2265
dh_builddeb --destdir=.

‎debian/source/format‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.0 (quilt)

‎debian/source/options‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Automatically add upstream changes to the quilt overlay.
2+
# http://manpages.ubuntu.com/manpages/trusty/man1/dpkg-source.1.html
3+
# This supports reusing the orig.tar.gz for debian increments.
4+
auto-commit
5+

0 commit comments

Comments
 (0)