[openrtm-commit:01506] r2597 - in branches/RELENG_1_1/OpenRTM-aist/packages/deb: . debian
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 11月 25日 (火) 15:44:44 JST
Author: kawauchi
Date: 2014-11-25 15:44:44 +0900 (Tue, 25 Nov 2014)
New Revision: 2597
Added:
branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.not-multiarch
branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/rules.not-multiarch
Removed:
branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.lucid
branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.marveric
branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.natty
branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.oneiric
branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.precise
branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.squeeze
branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.trusty
branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.wheezy
Modified:
branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/compat
branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control
branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/rules
branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh
Log:
[compat, ->RELEASE_1_1_1] Library installation path in the deb package, has been modified to use the multiarch feature. control, rules file has been organized.
Modified: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/Makefile.am 2014-11-25 05:45:32 UTC (rev 2596)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/Makefile.am 2014-11-25 06:44:44 UTC (rev 2597)
@@ -17,15 +17,9 @@
changelog.ppa \
compat \
control \
- control.lucid \
- control.marveric \
- control.natty \
- control.oneiric \
- control.precise \
- control.trusty \
- control.squeeze \
- control.wheezy \
+ control.not-multiarch \
copyright \
dirs \
docs \
- rules
+ rules \
+ rules.not-multiarch
Modified: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/compat
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/compat 2014-11-25 05:45:32 UTC (rev 2596)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/compat 2014-11-25 06:44:44 UTC (rev 2597)
@@ -1 +1 @@
-7
+9
Modified: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control 2014-11-25 05:45:32 UTC (rev 2596)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control 2014-11-25 06:44:44 UTC (rev 2597)
@@ -2,12 +2,14 @@
Section: science
Priority: extra
Maintainer: Noriaki Ando <n-ando at aist.go.jp>
-Build-Depends: debhelper, libomniorb4-dev, omniidl4, omniorb4-nameserver, python, uuid-dev
+Build-Depends: debhelper (>= 9), libomniorb4-dev, omniidl, omniorb-nameserver, python, uuid-dev
Standards-Version: 3.8.4
Homepage: http://www.openrtm.org
Package: openrtm-aist
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: OpenRTM-aist, RT-Middleware distributed by AIST
OpenRTM-aist is a reference implementation of RTC (Robotic Technology
@@ -22,6 +24,7 @@
Package: openrtm-aist-dev
Architecture: any
+Multi-Arch: same
Depends: openrtm-aist
Description: OpenRTM-aist headers for development
The header files and libraries needed for developing programs using
@@ -29,6 +32,7 @@
Package: openrtm-aist-example
Architecture: any
+Multi-Arch: same
Depends: openrtm-aist
Description: OpenRTM-aist examples
Example components and sources
Deleted: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.lucid
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.lucid 2014-11-25 05:45:32 UTC (rev 2596)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.lucid 2014-11-25 06:44:44 UTC (rev 2597)
@@ -1,39 +0,0 @@
-Source: openrtm-aist
-Section: science
-Priority: extra
-Maintainer: Noriaki Ando <n-ando at aist.go.jp>
-Build-Depends: debhelper, libomniorb4-dev, omniidl4, omniorb4-nameserver, python, uuid-dev
-Standards-Version: 3.8.4
-Homepage: http://www.openrtm.org
-
-Package: openrtm-aist
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenRTM-aist, RT-Middleware distributed by AIST
- OpenRTM-aist is a reference implementation of RTC (Robotic Technology
- Component) specification which is OMG standard. OpenRTM-aist includes
- RT-Middleware runtime environment and RTC framework. The OMG standard
- defines a component model and certain important infrastructure
- services applicable to the domain of robotics software development.
- OpenRTM-aist is being developed and distributed by Intelligent
- Systems Research Institute, National Institute of Advanced Industrial
- Science and Technology (AIST), Japan.
- Please see http://www.openrtm.org/ for more detail.
-
-Package: openrtm-aist-dev
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist headers for development
- The header files and libraries needed for developing programs using
- OpenRTM-aist.
-
-Package: openrtm-aist-example
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist examples
- Example components and sources
-
-Package: openrtm-aist-doc
-Architecture: all
-Description: Documentation for openrtm-aist
- Developer documentation.
Deleted: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.marveric
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.marveric 2014-11-25 05:45:32 UTC (rev 2596)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.marveric 2014-11-25 06:44:44 UTC (rev 2597)
@@ -1,39 +0,0 @@
-Source: openrtm-aist
-Section: science
-Priority: extra
-Maintainer: Noriaki Ando <n-ando at aist.go.jp>
-Build-Depends: debhelper, libomniorb4-dev, omniidl4, omniorb4-nameserver, python, uuid-dev
-Standards-Version: 3.8.4
-Homepage: http://www.openrtm.org
-
-Package: openrtm-aist
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenRTM-aist, RT-Middleware distributed by AIST
- OpenRTM-aist is a reference implementation of RTC (Robotic Technology
- Component) specification which is OMG standard. OpenRTM-aist includes
- RT-Middleware runtime environment and RTC framework. The OMG standard
- defines a component model and certain important infrastructure
- services applicable to the domain of robotics software development.
- OpenRTM-aist is being developed and distributed by Intelligent
- Systems Research Institute, National Institute of Advanced Industrial
- Science and Technology (AIST), Japan.
- Please see http://www.openrtm.org/ for more detail.
-
-Package: openrtm-aist-dev
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist headers for development
- The header files and libraries needed for developing programs using
- OpenRTM-aist.
-
-Package: openrtm-aist-example
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist examples
- Example components and sources
-
-Package: openrtm-aist-doc
-Architecture: all
-Description: Documentation for openrtm-aist
- Developer documentation.
Deleted: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.natty
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.natty 2014-11-25 05:45:32 UTC (rev 2596)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.natty 2014-11-25 06:44:44 UTC (rev 2597)
@@ -1,39 +0,0 @@
-Source: openrtm-aist
-Section: science
-Priority: extra
-Maintainer: Noriaki Ando <n-ando at aist.go.jp>
-Build-Depends: debhelper, libomniorb4-dev, omniidl, omniorb-nameserver, python, uuid-dev
-Standards-Version: 3.8.4
-Homepage: http://www.openrtm.org
-
-Package: openrtm-aist
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenRTM-aist, RT-Middleware distributed by AIST
- OpenRTM-aist is a reference implementation of RTC (Robotic Technology
- Component) specification which is OMG standard. OpenRTM-aist includes
- RT-Middleware runtime environment and RTC framework. The OMG standard
- defines a component model and certain important infrastructure
- services applicable to the domain of robotics software development.
- OpenRTM-aist is being developed and distributed by Intelligent
- Systems Research Institute, National Institute of Advanced Industrial
- Science and Technology (AIST), Japan.
- Please see http://www.openrtm.org/ for more detail.
-
-Package: openrtm-aist-dev
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist headers for development
- The header files and libraries needed for developing programs using
- OpenRTM-aist.
-
-Package: openrtm-aist-example
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist examples
- Example components and sources
-
-Package: openrtm-aist-doc
-Architecture: all
-Description: Documentation for openrtm-aist
- Developer documentation.
Added: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.not-multiarch
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.not-multiarch (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.not-multiarch 2014-11-25 06:44:44 UTC (rev 2597)
@@ -0,0 +1,39 @@
+Source: openrtm-aist
+Section: science
+Priority: extra
+Maintainer: Noriaki Ando <n-ando at aist.go.jp>
+Build-Depends: debhelper, libomniorb4-dev, omniidl4 | omniidl, omniorb4-nameserver | omniorb-nameserver, python, uuid-dev
+Standards-Version: 3.8.4
+Homepage: http://www.openrtm.org
+
+Package: openrtm-aist
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: OpenRTM-aist, RT-Middleware distributed by AIST
+ OpenRTM-aist is a reference implementation of RTC (Robotic Technology
+ Component) specification which is OMG standard. OpenRTM-aist includes
+ RT-Middleware runtime environment and RTC framework. The OMG standard
+ defines a component model and certain important infrastructure
+ services applicable to the domain of robotics software development.
+ OpenRTM-aist is being developed and distributed by Intelligent
+ Systems Research Institute, National Institute of Advanced Industrial
+ Science and Technology (AIST), Japan.
+ Please see http://www.openrtm.org/ for more detail.
+
+Package: openrtm-aist-dev
+Architecture: any
+Depends: openrtm-aist
+Description: OpenRTM-aist headers for development
+ The header files and libraries needed for developing programs using
+ OpenRTM-aist.
+
+Package: openrtm-aist-example
+Architecture: any
+Depends: openrtm-aist
+Description: OpenRTM-aist examples
+ Example components and sources
+
+Package: openrtm-aist-doc
+Architecture: all
+Description: Documentation for openrtm-aist
+ Developer documentation.
Deleted: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.oneiric
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.oneiric 2014-11-25 05:45:32 UTC (rev 2596)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.oneiric 2014-11-25 06:44:44 UTC (rev 2597)
@@ -1,39 +0,0 @@
-Source: openrtm-aist
-Section: science
-Priority: extra
-Maintainer: Noriaki Ando <n-ando at aist.go.jp>
-Build-Depends: debhelper, libomniorb4-dev, omniidl, omniorb-nameserver, python, uuid-dev
-Standards-Version: 3.8.4
-Homepage: http://www.openrtm.org
-
-Package: openrtm-aist
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenRTM-aist, RT-Middleware distributed by AIST
- OpenRTM-aist is a reference implementation of RTC (Robotic Technology
- Component) specification which is OMG standard. OpenRTM-aist includes
- RT-Middleware runtime environment and RTC framework. The OMG standard
- defines a component model and certain important infrastructure
- services applicable to the domain of robotics software development.
- OpenRTM-aist is being developed and distributed by Intelligent
- Systems Research Institute, National Institute of Advanced Industrial
- Science and Technology (AIST), Japan.
- Please see http://www.openrtm.org/ for more detail.
-
-Package: openrtm-aist-dev
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist headers for development
- The header files and libraries needed for developing programs using
- OpenRTM-aist.
-
-Package: openrtm-aist-example
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist examples
- Example components and sources
-
-Package: openrtm-aist-doc
-Architecture: all
-Description: Documentation for openrtm-aist
- Developer documentation.
Deleted: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.precise
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.precise 2014-11-25 05:45:32 UTC (rev 2596)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.precise 2014-11-25 06:44:44 UTC (rev 2597)
@@ -1,39 +0,0 @@
-Source: openrtm-aist
-Section: science
-Priority: extra
-Maintainer: Noriaki Ando <n-ando at aist.go.jp>
-Build-Depends: debhelper, libomniorb4-dev, omniidl, omniorb-nameserver, python, uuid-dev
-Standards-Version: 3.8.4
-Homepage: http://www.openrtm.org
-
-Package: openrtm-aist
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenRTM-aist, RT-Middleware distributed by AIST
- OpenRTM-aist is a reference implementation of RTC (Robotic Technology
- Component) specification which is OMG standard. OpenRTM-aist includes
- RT-Middleware runtime environment and RTC framework. The OMG standard
- defines a component model and certain important infrastructure
- services applicable to the domain of robotics software development.
- OpenRTM-aist is being developed and distributed by Intelligent
- Systems Research Institute, National Institute of Advanced Industrial
- Science and Technology (AIST), Japan.
- Please see http://www.openrtm.org/ for more detail.
-
-Package: openrtm-aist-dev
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist headers for development
- The header files and libraries needed for developing programs using
- OpenRTM-aist.
-
-Package: openrtm-aist-example
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist examples
- Example components and sources
-
-Package: openrtm-aist-doc
-Architecture: all
-Description: Documentation for openrtm-aist
- Developer documentation.
Deleted: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.squeeze
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.squeeze 2014-11-25 05:45:32 UTC (rev 2596)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.squeeze 2014-11-25 06:44:44 UTC (rev 2597)
@@ -1,39 +0,0 @@
-Source: openrtm-aist
-Section: science
-Priority: extra
-Maintainer: Noriaki Ando <n-ando at aist.go.jp>
-Build-Depends: debhelper, libomniorb4-dev, omniidl4, omniorb4-nameserver, python, uuid-dev
-Standards-Version: 3.8.4
-Homepage: http://www.openrtm.org
-
-Package: openrtm-aist
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenRTM-aist, RT-Middleware distributed by AIST
- OpenRTM-aist is a reference implementation of RTC (Robotic Technology
- Component) specification which is OMG standard. OpenRTM-aist includes
- RT-Middleware runtime environment and RTC framework. The OMG standard
- defines a component model and certain important infrastructure
- services applicable to the domain of robotics software development.
- OpenRTM-aist is being developed and distributed by Intelligent
- Systems Research Institute, National Institute of Advanced Industrial
- Science and Technology (AIST), Japan.
- Please see http://www.openrtm.org/ for more detail.
-
-Package: openrtm-aist-dev
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist headers for development
- The header files and libraries needed for developing programs using
- OpenRTM-aist.
-
-Package: openrtm-aist-example
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist examples
- Example components and sources
-
-Package: openrtm-aist-doc
-Architecture: all
-Description: Documentation for openrtm-aist
- Developer documentation.
Deleted: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.trusty
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.trusty 2014-11-25 05:45:32 UTC (rev 2596)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.trusty 2014-11-25 06:44:44 UTC (rev 2597)
@@ -1,39 +0,0 @@
-Source: openrtm-aist
-Section: science
-Priority: extra
-Maintainer: Noriaki Ando <n-ando at aist.go.jp>
-Build-Depends: debhelper, libomniorb4-dev, omniidl, omniorb-nameserver, python, uuid-dev
-Standards-Version: 3.8.4
-Homepage: http://www.openrtm.org
-
-Package: openrtm-aist
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenRTM-aist, RT-Middleware distributed by AIST
- OpenRTM-aist is a reference implementation of RTC (Robotic Technology
- Component) specification which is OMG standard. OpenRTM-aist includes
- RT-Middleware runtime environment and RTC framework. The OMG standard
- defines a component model and certain important infrastructure
- services applicable to the domain of robotics software development.
- OpenRTM-aist is being developed and distributed by Intelligent
- Systems Research Institute, National Institute of Advanced Industrial
- Science and Technology (AIST), Japan.
- Please see http://www.openrtm.org/ for more detail.
-
-Package: openrtm-aist-dev
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist headers for development
- The header files and libraries needed for developing programs using
- OpenRTM-aist.
-
-Package: openrtm-aist-example
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist examples
- Example components and sources
-
-Package: openrtm-aist-doc
-Architecture: all
-Description: Documentation for openrtm-aist
- Developer documentation.
Deleted: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.wheezy
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.wheezy 2014-11-25 05:45:32 UTC (rev 2596)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.wheezy 2014-11-25 06:44:44 UTC (rev 2597)
@@ -1,39 +0,0 @@
-Source: openrtm-aist
-Section: science
-Priority: extra
-Maintainer: Noriaki Ando <n-ando at aist.go.jp>
-Build-Depends: debhelper, libomniorb4-dev, omniidl, omniorb-nameserver, python, uuid-dev
-Standards-Version: 3.8.4
-Homepage: http://www.openrtm.org
-
-Package: openrtm-aist
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenRTM-aist, RT-Middleware distributed by AIST
- OpenRTM-aist is a reference implementation of RTC (Robotic Technology
- Component) specification which is OMG standard. OpenRTM-aist includes
- RT-Middleware runtime environment and RTC framework. The OMG standard
- defines a component model and certain important infrastructure
- services applicable to the domain of robotics software development.
- OpenRTM-aist is being developed and distributed by Intelligent
- Systems Research Institute, National Institute of Advanced Industrial
- Science and Technology (AIST), Japan.
- Please see http://www.openrtm.org/ for more detail.
-
-Package: openrtm-aist-dev
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist headers for development
- The header files and libraries needed for developing programs using
- OpenRTM-aist.
-
-Package: openrtm-aist-example
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist examples
- Example components and sources
-
-Package: openrtm-aist-doc
-Architecture: all
-Description: Documentation for openrtm-aist
- Developer documentation.
Modified: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/rules
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/rules 2014-11-25 05:45:32 UTC (rev 2596)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/rules 2014-11-25 06:44:44 UTC (rev 2597)
@@ -21,6 +21,8 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# Multiarch support
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
CFLAGS = -Wall -g
@@ -39,7 +41,7 @@
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
#Architecture
@@ -116,12 +118,10 @@
# for openrtm-aist-example package
#$(MAKE)
- (mkdir $(CURDIR)/debian/openrtm-aist-example/usr/)
- (ln -s $(CURDIR)/debian/openrtm-aist/usr/lib $(CURDIR)/debian/openrtm-aist-example/usr/)
- (ln -s $(CURDIR)/debian/openrtm-aist/usr/lib64 $(CURDIR)/debian/openrtm-aist-example/usr/)
+ (mkdir -p $(CURDIR)/debian/openrtm-aist-example/usr/lib)
+ (ln -s $(CURDIR)/debian/openrtm-aist/usr/lib/$(DEB_HOST_MULTIARCH) $(CURDIR)/debian/openrtm-aist-example/usr/lib)
(cd $(CURDIR)/examples ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-example install)
- (rm $(CURDIR)/debian/openrtm-aist-example/usr/lib)
- (rm $(CURDIR)/debian/openrtm-aist-example/usr/lib64)
+ (rm -r $(CURDIR)/debian/openrtm-aist-example/usr/lib)
dh_install -s
# Must not depend on anything. This is to be called by
Added: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/rules.not-multiarch
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/rules.not-multiarch (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/rules.not-multiarch 2014-11-25 06:44:44 UTC (rev 2597)
@@ -0,0 +1,165 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets by Bill Allombert 2001
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+config.status: configure
+ dh_testdir
+ # Add here commands to configure the package.
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --libdir=\$${prefix}/lib/i386-linux-gnu
+
+
+#Architecture
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: config.status
+
+ # Add here commands to compile the arch part of the package.
+ #$(MAKE)
+ touch $@
+
+build-indep: build-indep-stamp
+build-indep-stamp: config.status
+
+ # Add here commands to compile the indep part of the package.
+ #$(MAKE) doc
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
+
+ # Add here commands to clean up after the build process.
+ # -$(MAKE) distclean
+ #rm -f config.sub config.guess
+
+ dh_clean
+
+install: install-indep install-arch
+install-indep:
+ dh_testdir
+ dh_testroot
+ dh_clean -k -i
+ dh_installdirs -i
+
+ # Add here commands to install the indep part of the package into
+ # debian/<package>-doc.
+ #INSTALLDOC#
+ # for openrtm-aist-doc package
+ (cd $(CURDIR)/docs ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-doc install)
+
+ dh_install -i
+
+install-arch:
+ dh_testdir
+ dh_testroot
+ dh_clean -k -s
+ dh_installdirs -s
+
+ # Add here commands to install the arch part of the package into
+ # debian/tmp.
+ $(MAKE)
+
+ # for openrtm-aist package
+ (cd $(CURDIR)/src/lib/coil/posix ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install-exec)
+ (cd $(CURDIR)/src/lib/rtm ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install-exec)
+ (cd $(CURDIR)/etc ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install-exec)
+ (cd $(CURDIR)/utils/rtcd ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install)
+ (cd $(CURDIR)/utils/rtcprof ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install)
+ (cd $(CURDIR)/utils/rtm-naming ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install)
+ (cd $(CURDIR)/utils/rtm-config ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install)
+ (cd $(CURDIR)/src/ext ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install)
+
+ # for openrtm-dev package
+ #$(MAKE)
+ (cd $(CURDIR)/src/lib/rtm ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install-data-recursive)
+ (cd $(CURDIR)/src/lib/coil ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install-data)
+ (cd $(CURDIR)/utils/rtc-template ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install)
+ (cd $(CURDIR)/utils/rtm-skelwrapper ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install)
+ (cd $(CURDIR)/utils/cmake ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install)
+ (cd $(CURDIR)/src/lib/coil/utils/coil-config ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install)
+
+ # for openrtm-aist-example package
+ #$(MAKE)
+ (mkdir -p $(CURDIR)/debian/openrtm-aist-example/usr/lib)
+ (ln -s $(CURDIR)/debian/openrtm-aist/usr/lib/i386-linux-gnu $(CURDIR)/debian/openrtm-aist-example/usr/lib)
+ (cd $(CURDIR)/examples ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-example install)
+ (rm -r $(CURDIR)/debian/openrtm-aist-example/usr/lib)
+
+ dh_install -s
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs ChangeLog
+ dh_installdocs
+ dh_installexamples
+# dh_installmenu
+# dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_python
+# dh_installinit
+# dh_installcron
+# dh_installinfo
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+# dh_perl
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+ $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch
+
Modified: branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh 2014-11-25 05:45:32 UTC (rev 2596)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh 2014-11-25 06:44:44 UTC (rev 2597)
@@ -40,6 +40,9 @@
dist_name=""
dist_key=""
+# not support multiarch
+not_multiarch_cnmaes="lucid marveric squeeze natty oneiric"
+
#---------------------------------------
# Debianコードネーム取得
#---------------------------------------
@@ -122,15 +125,38 @@
rm -f $packagedir/packages/openrtm-aist*
cp -r debian $packagedir
-chmod 755 $packagedir/debian/rules
-if test -f $packagedir/debian/control.$DISTRIB_CODENAME; then
- mv $packagedir/debian/control /tmp/control.$$
- cp $packagedir/debian/control.$DISTRIB_CODENAME $packagedir/debian/control
+
+# check multiarch support
+multiarch_flg="OFF"
+if test "x$dist_key" = "xDebian" || test "x$dist_key" = "xUbuntu" ; then
+ for c in $not_multiarch_cnmaes; do
+ if test $DISTRIB_CODENAME = $c ; then
+ mv $packagedir/debian/compat /tmp/compat.$$
+ echo 7 > $packagedir/debian/compat
+ mv $packagedir/debian/rules /tmp/rules.$$
+ cp $packagedir/debian/rules.not-multiarch $packagedir/debian/rules
+ DEB_HOST_ARCH=`dpkg-architecture -qDEB_HOST_ARCH`
+ if test "x$DEB_HOST_ARCH" = "xamd64" ; then
+ sed -i -s 's/i386/x86_64/' $packagedir/debian/rules
+ fi
+ mv $packagedir/debian/control /tmp/control.$$
+ cp $packagedir/debian/control.not-multiarch $packagedir/debian/control
+ multiarch_flg="ON"
+ echo "... Multiarch not supported."
+ break
+ fi
+ done
fi
+chmod 755 $packagedir/debian/rules
+
cd $packagedir
rm -f config.status
dpkg-buildpackage -W -us -uc -rfakeroot
mv $packagedir/../openrtm-aist* $packagedir/packages/
-mv /tmp/control.$$ $packagedir/debian/control
\ No newline at end of file
+if test "x$multiarch_flg" = "xON" ; then
+ mv /tmp/compat.$$ $packagedir/debian/compat
+ mv /tmp/rules.$$ $packagedir/debian/rules
+ mv /tmp/control.$$ $packagedir/debian/control
+fi
More information about the openrtm-commit
mailing list