[SCM] openrtm branch, master, updated. upstream/1.1.0+dfsg1-RELEASE-53-g76f89d2

Thomas Moulard thomas.moulard at gmail.com
Sun Jun 23 01:01:23 UTC 2013 

The following commit has been merged in the master branch:
commit f5bcdf5e66cfde956422210fa54ef1ec33d0b561
Author: Thomas Moulard <thomas.moulard at gmail.com>
Date:   Fri Jun 21 19:01:21 2013 +0900

    Improve initial packaging.

diff --git a/debian/control b/debian/control
index b2647c3..e53afbb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,9 @@
 Source: openrtm-aist
 Priority: extra
 Maintainer: Thomas Moulard <thomas.moulard at gmail.com>
-Build-Depends: debhelper (>= 9), cmake,
-	       hardening-wrapper,
+Build-Depends: debhelper (>= 9), dh-autoreconf,
+	       pkg-kde-tools (>= 0.6),
+	       autotools-dev,
 	       doxygen, doxygen-latex,
 	       graphviz,
 	       libboost-all-dev,
@@ -10,10 +11,10 @@ Build-Depends: debhelper (>= 9), cmake,
 	       libomniorb4-dev,
 	       omniidl,
 	       omniorb-nameserver,
-	       python-yaml,
+	       python, python-yaml,
 	       libelf-dev
 Standards-Version: 3.9.4
-Section: contrib/science
+Section: science
 Homepage: http://www.openrtm.org/
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/openrtm-aist.git
 Vcs-Git: git://git.debian.org/debian-science/packages/openrtm-aist.git
@@ -22,6 +23,7 @@ Package: libcoil
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Internal OpenRTM library
  Internal OpenRTM library which should only be used in
  in coordination with libopenrtm.
@@ -31,8 +33,9 @@ Description: Internal OpenRTM library
 
 Package: libcoil-dev
 Architecture: any
-Section: contrib/libdevel
+Section: libdevel
 Depends: uuid-dev, libcoil (= ${binary:Version}), ${misc:Depends}
+Multi-Arch: same
 Description: Internal OpenRTM library - development files
  Internal OpenRTM library which should only be used in
  in coordination with libopenrtm.
@@ -41,8 +44,9 @@ Description: Internal OpenRTM library - development files
 
 Package: libcoil-dbg
 Architecture: any
-Section: contrib/debug
+Section: debug
 Depends: libcoil (= ${binary:Version}), ${misc:Depends}
+Multi-Arch: same
 Description: Internal OpenRTM library - debugging symbols
  Internal OpenRTM library which should only be used in
  in coordination with libopenrtm.
@@ -52,7 +56,8 @@ Description: Internal OpenRTM library - debugging symbols
 Package: libopenrtm-aist
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: omniorb-nameserver, libcoil (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, python
+Depends: omniorb-nameserver, libcoil (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Component-oriented robotics middleware
  Development platform allowing robotics system design by writing
  RT-components and connecting them together.
@@ -61,9 +66,10 @@ Description: Component-oriented robotics middleware
 
 Package: libopenrtm-aist-dev
 Architecture: any
-Section: contrib/libdevel
+Section: libdevel
 Depends: libcoil-dev (= ${binary:Version}), libopenrtm-aist (= ${binary:Version}), libboost-all-dev, libomniorb4-dev, uuid-dev, libelf-dev, omniidl, ${misc:Depends}
 Suggests: libopenrtm-aist-doc (= ${binary:Version})
+Multi-Arch: same
 Description: Component-oriented robotics middleware - development files
  Development platform allowing robotics system design by writing
  RT-components and connecting them together.
@@ -73,8 +79,9 @@ Description: Component-oriented robotics middleware - development files
 
 Package: libopenrtm-aist-dbg
 Architecture: any
-Section: contrib/debug
+Section: debug
 Depends: libopenrtm-aist (= ${binary:Version}), libcoil-dbg (= ${binary:Version}), ${misc:Depends}
+Multi-Arch: same
 Description: Component-oriented robotics middleware - debugging symbols
  Development platform allowing robotics system design by writing
  RT-components and connecting them together.
@@ -84,11 +91,26 @@ Description: Component-oriented robotics middleware - debugging symbols
 
 Package: libopenrtm-aist-doc
 Architecture: all
-Section: contrib/doc
+Section: doc
 Depends: ${misc:Depends}
+Multi-Arch: foreign
 Description: Component-oriented robotics middleware - documentation
  Development platform allowing robotics system design by writing
  RT-components and connecting them together.
  .
  This package contains the documentation for the C++ version of
  this software.
+
+Package: libopenrtm-aist-tools
+Architecture: any
+Section: doc
+Depends: libopenrtm-aist (= ${binary:Version}),
+	 python,
+	 ${shlibs:Depends},
+	 ${misc:Depends}
+Multi-Arch: foreign
+Description: Component-oriented robotics middleware - tools
+ Development platform allowing robotics system design by writing
+ RT-components and connecting them together.
+ .
+ This package contains additional tools for OpenRTM.
diff --git a/debian/copyright b/debian/copyright
index 7376f01..b3f712d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: OpenRTM AIST++
+Upstream-Name: Noriaki Ando and the OpenRTM-aist Project team
 Upstream-Contact: openrtm-users at openrtm.org
 Source: http://openrtm.org/openrtm/en/content/download
 
diff --git a/debian/libopenrtm-aist-tools.install b/debian/libopenrtm-aist-tools.install
new file mode 100644
index 0000000..6560709
--- /dev/null
+++ b/debian/libopenrtm-aist-tools.install
@@ -0,0 +1,3 @@
+usr/bin/rtc*
+usr/bin/rtm-naming
+usr/bin/rtm-skelwrapper
diff --git a/debian/libopenrtm-aist.manpages b/debian/libopenrtm-aist-tools.manpages
similarity index 100%
rename from debian/libopenrtm-aist.manpages
rename to debian/libopenrtm-aist-tools.manpages
diff --git a/debian/libopenrtm-aist.install b/debian/libopenrtm-aist.install
index ecb510c..dcb6795 100644
--- a/debian/libopenrtm-aist.install
+++ b/debian/libopenrtm-aist.install
@@ -1,7 +1,4 @@
 etc/rtc.conf.sample
-usr/bin/rtc*
-usr/bin/rtm-naming
-usr/bin/rtm-skelwrapper
 usr/lib/*/libRTC-*.so
 usr/lib/*/openrtm-*/ec/RTPreemptEC.so*
 usr/lib/*/openrtm-*/sdo/ComponentObserverConsumer.so*
diff --git a/debian/rules b/debian/rules
index a553752..2b8753b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,22 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# Hardening flags.
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 
-export DEBUILD_DPKG_BUILDPACKAGE_OPTS="-I.svn -I.git"
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
-.PHONY: override_dh_stripx
+#export DEBUILD_DPKG_BUILDPACKAGE_OPTS="-I.svn -I.git"
+
+.PHONY: override_dh_strip
 
 %:
-	dh  $@
+	dh  $@  --parallel --with pkgkde-symbolshelper
 
 override_dh_strip:
 	dh_strip -plibcoil --dbg-package=libcoil-dbg
 	dh_strip -plibopenrtm-aist --dbg-package=libopenrtm-aist-dbg
+	dh_strip -plibopenrtm-aist-tools

-- 
openrtm

More information about the debian-science-commits mailing list