[openrtm-commit:00865] r2377 - in branches/RELENG_1_1/OpenRTM-aist: . packages/deb packages/deb/debian src/ext/ec/rtpreempt

openrtm @ openrtm.org openrtm @ openrtm.org
2012年 7月 7日 (土) 01:26:06 JST


Author: 
Date: 2012-07-07 01:26:06 +0900 (Sat, 07 Jul 2012)
New Revision: 2377

Added:
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/Makefile.am
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/README.Debian
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/changelog
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/changelog.ppa
   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/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/copyright
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/dirs
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/docs
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/rules
Removed:
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/README.Debian
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/changelog
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/compat
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/control
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/copyright
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/dirs
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/docs
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkgbuild.sh
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/rules
Modified:
   branches/RELENG_1_1/OpenRTM-aist/configure.ac
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/Makefile.am
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh
   branches/RELENG_1_1/OpenRTM-aist/src/ext/ec/rtpreempt/Makefile.am
Log:
Debian/Ubuntu package build related files and its location have been
modified.  Version specific control files have been added.  Lib option
-lrt has been added because deb package build gives -z,def option to
linker for more strict library dependency.


Modified: branches/RELENG_1_1/OpenRTM-aist/configure.ac
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/configure.ac	2012-07-06 15:15:01 UTC (rev 2376)
+++ branches/RELENG_1_1/OpenRTM-aist/configure.ac	2012-07-06 16:26:06 UTC (rev 2377)
@@ -1632,6 +1632,7 @@
 	build/Makefile
 	packages/Makefile
 	packages/deb/Makefile
+	packages/deb/debian/Makefile
 	packages/rpm/Makefile
 	src/Makefile
 	src/lib/Makefile

Modified: branches/RELENG_1_1/OpenRTM-aist/packages/deb/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/Makefile.am	2012-07-06 15:15:01 UTC (rev 2376)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/Makefile.am	2012-07-06 16:26:06 UTC (rev 2377)
@@ -42,24 +42,8 @@
 all-local: ${EXTRA_DIST} files
 	sh dpkg_build.sh
 
-files: changelog
-	echo "openrtm-aist_"${PKGVER}"_amd64.deb main extra" > files
-	echo "openrtm-aist-dev_"${PKGVER}"_amd64.deb main extra" >> files
-	echo "openrtm-aist-example_"${PKGVER}"_amd64.deb main extra" >> files
-	echo "openrtm-aist-doc_"${PKGVER}"_all.deb main extra" >> files
-
 clean-local:
 	rm -f *~
 	rm -f files
 
-EXTRA_DIST = \
-	README.Debian \
-	changelog     \
-	compat        \
-	control       \
-	control.1     \
-	copyright     \
-	dirs          \
-	docs          \
-	rules         \
-	dpkg_build.sh
+EXTRA_DIST = dpkg_build.sh

Deleted: branches/RELENG_1_1/OpenRTM-aist/packages/deb/README.Debian
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/README.Debian	2012-07-06 15:15:01 UTC (rev 2376)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/README.Debian	2012-07-06 16:26:06 UTC (rev 2377)
@@ -1,28 +0,0 @@
-openrtm-aist for Debian
------------------------
-Debian package of OpenRTM-aist
-
-OpenRTM-aist supports Debian and Ubuntu distribution.
-
-OpenRTM-aist official deb packages might be provided for the newest
-and former major releases of Debian under the following URL.  For the
-Ubuntu distribution, deb packages might be provided for desktop
-versions of officially supported Ubuntu.
-
-- Debian package repository
-http://www.openrtm.org/pub/Linux/debian/
-
-- Ubuntu package repository
-http://www.openrtm.org/pub/Linux/ubuntu/
-
-The easyest way to install OpenRTM-aist to your Debian/Ubuntu systems
-is to download installation shell script from the following URL.
-
-- Ubuntu installation script: pkg_install100_ubuntu.sh
-- Debian installation script: pkg_install100_debian.sh
-http://openrtm.org/svnroot/OpenRTM-aist/trunk/OpenRTM-aist/build/
-
-For more details about OpenRTM-aist please visit the official site.
-http://www.openrtm.org
-
- -- Noriaki Ando <n-ando at aist.go.jp>  Mon, 23 Jun 2008 16:18:55 +0900

Deleted: branches/RELENG_1_1/OpenRTM-aist/packages/deb/changelog
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/changelog	2012-07-06 15:15:01 UTC (rev 2376)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/changelog	2012-07-06 16:26:06 UTC (rev 2377)
@@ -1,29 +0,0 @@
-openrtm-aist (1.1.0-0) experimental; urgency=low
-
-  * 1.1.0-0 (1.1.0-RELEASE). OpenRTM-aist-1.1.0-RELEASE
-
- -- Noriaki Ando <n-ando at aist.go.jp>  Thu, 28 May 2010 16:58:44 +0900
-
-openrtm-aist (1.0.0-2) unstable; urgency=low
-
-  * 1.0.0-2 (1.0.0-RELEASE). A bug (rtcprof not included) has been fixed.
-
- -- Noriaki Ando <n-ando at aist.go.jp>  Thu, 28 May 2010 16:58:44 +0900
-
-openrtm-aist (1.0.0-1) unstable; urgency=low
-
-  * 1.0.0-1 (1.0.0-RELEASE).
-
- -- Noriaki Ando <n-ando at aist.go.jp>  Thu, 28 May 2010 16:58:44 +0900
-
-openrtm-aist (1.0.0-0) unstable; urgency=low
-
-  * 1.0.0-0 (1.0.0-RC1).
-
- -- Noriaki Ando <n-ando at aist.go.jp>  Thu, 28 May 2009 11:58:55 +0900
-
-openrtm-aist (0.4.2-0) unstable; urgency=low
-
- * Initial release.
-
- -- Noriaki Ando <n-ando at aist.go.jp>  Mon, 23 Jun 2008 16:18:55 +0900

Deleted: branches/RELENG_1_1/OpenRTM-aist/packages/deb/compat
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/compat	2012-07-06 15:15:01 UTC (rev 2376)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/compat	2012-07-06 16:26:06 UTC (rev 2377)
@@ -1 +0,0 @@
-4

Deleted: branches/RELENG_1_1/OpenRTM-aist/packages/deb/control
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/control	2012-07-06 15:15:01 UTC (rev 2376)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/control	2012-07-06 16:26:06 UTC (rev 2377)
@@ -1,39 +0,0 @@
-Source: openrtm-aist
-Section: main
-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/copyright
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/copyright	2012-07-06 15:15:01 UTC (rev 2376)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/copyright	2012-07-06 16:26:06 UTC (rev 2377)
@@ -1,35 +0,0 @@
-This package was debianized by Noriaki Ando <n-ando at aist.go.jp> on
-Mon, 23 Jun 2008 16:18:55 +0900.
-
-It was downloaded from http://www.openrtm.org
-
-Upstream Author(s): 
-
-    Noriaki Ando <n-ando at aist.go.jp>
-
-Copyright: 
-
-    Copyright (C) 2003-2011
-    Noriaki Ando and the OpenRTM-aist Project team
-    Intelligent Systems Research Institute,
-    National Institute of Advanced Industrial Science and Technology (AIST),
-    Tsukuba, Japan, All rights reserved.
-
-License:
-
-    The OpenRTM-aist is the dual-licensed open source software. You can
-    use, copy, distribute and/or modify this library under the terms and
-    conditions of either of the licenses below.
-    
-    1) LGPL (GNU Lesser General Public License - v 2.1)
-    See COPYING.LIB.
-    
-    2) Individual Licnese
-    You can purchase license from AIST and/or AIST's TLO to copy,
-    distribute, modify and/or sublicense the library without any
-    limitation in the terms of LGPL. The individual license should be
-    concluded with a negotiated agreement between you and AIST and/or AIST
-    TLO. To conclude individual license, contact the person responsible of
-    AIST.
-
-

Added: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/Makefile.am	                        (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/Makefile.am	2012-07-06 16:26:06 UTC (rev 2377)
@@ -0,0 +1,28 @@
+## -*- Makefile -*-
+##------------------------------------------------------------
+## Makefile.am for deb package
+##
+## $Id$
+##------------------------------------------------------------
+
+AUTOMAKE_OPTIONS = 1.4
+
+
+clean-local:
+	rm -f *~
+
+EXTRA_DIST = \
+	README.Debian    \
+	changelog        \
+	changelog.ppa    \
+	compat           \
+	control          \
+	control.lucid    \
+	control.marveric \
+	control.natty    \
+	control.oneiric  \
+	control.precise  \
+	copyright        \
+	dirs             \
+	docs             \
+	rules

Copied: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/README.Debian (from rev 2370, branches/RELENG_1_1/OpenRTM-aist/packages/deb/README.Debian)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/README.Debian	                        (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/README.Debian	2012-07-06 16:26:06 UTC (rev 2377)
@@ -0,0 +1,28 @@
+openrtm-aist for Debian
+-----------------------
+Debian package of OpenRTM-aist
+
+OpenRTM-aist supports Debian and Ubuntu distribution.
+
+OpenRTM-aist official deb packages might be provided for the newest
+and former major releases of Debian under the following URL.  For the
+Ubuntu distribution, deb packages might be provided for desktop
+versions of officially supported Ubuntu.
+
+- Debian package repository
+http://www.openrtm.org/pub/Linux/debian/
+
+- Ubuntu package repository
+http://www.openrtm.org/pub/Linux/ubuntu/
+
+The easyest way to install OpenRTM-aist to your Debian/Ubuntu systems
+is to download installation shell script from the following URL.
+
+- Ubuntu installation script: pkg_install100_ubuntu.sh
+- Debian installation script: pkg_install100_debian.sh
+http://openrtm.org/svnroot/OpenRTM-aist/trunk/OpenRTM-aist/build/
+
+For more details about OpenRTM-aist please visit the official site.
+http://www.openrtm.org
+
+ -- Noriaki Ando <n-ando at aist.go.jp>  Mon, 23 Jun 2008 16:18:55 +0900

Copied: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/changelog (from rev 2370, branches/RELENG_1_1/OpenRTM-aist/packages/deb/changelog)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/changelog	                        (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/changelog	2012-07-06 16:26:06 UTC (rev 2377)
@@ -0,0 +1,29 @@
+openrtm-aist (1.1.0-0) experimental; urgency=low
+
+  * 1.1.0-0 (1.1.0-RELEASE). OpenRTM-aist-1.1.0-RELEASE
+
+ -- Noriaki Ando <n-ando at aist.go.jp>  Thu, 28 May 2010 16:58:44 +0900
+
+openrtm-aist (1.0.0-2) unstable; urgency=low
+
+  * 1.0.0-2 (1.0.0-RELEASE). A bug (rtcprof not included) has been fixed.
+
+ -- Noriaki Ando <n-ando at aist.go.jp>  Thu, 28 May 2010 16:58:44 +0900
+
+openrtm-aist (1.0.0-1) unstable; urgency=low
+
+  * 1.0.0-1 (1.0.0-RELEASE).
+
+ -- Noriaki Ando <n-ando at aist.go.jp>  Thu, 28 May 2010 16:58:44 +0900
+
+openrtm-aist (1.0.0-0) unstable; urgency=low
+
+  * 1.0.0-0 (1.0.0-RC1).
+
+ -- Noriaki Ando <n-ando at aist.go.jp>  Thu, 28 May 2009 11:58:55 +0900
+
+openrtm-aist (0.4.2-0) unstable; urgency=low
+
+ * Initial release.
+
+ -- Noriaki Ando <n-ando at aist.go.jp>  Mon, 23 Jun 2008 16:18:55 +0900

Added: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/changelog.ppa
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/changelog.ppa	                        (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/changelog.ppa	2012-07-06 16:26:06 UTC (rev 2377)
@@ -0,0 +1,6 @@
+openrtm-aist (1.0.2-3~ppa7precise) precise; urgency=low
+
+  * 1.0.2-3 (1.0.2-RELEASE) initial release for ppa.
+
+ -- OpenRTM-aist <openrtm at openrtm.org>  Mon, 04 Jul 2012 18:25:42 +0900
+

Copied: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/compat (from rev 2370, branches/RELENG_1_1/OpenRTM-aist/packages/deb/compat)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/compat	                        (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/compat	2012-07-06 16:26:06 UTC (rev 2377)
@@ -0,0 +1 @@
+7

Copied: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control (from rev 2370, branches/RELENG_1_1/OpenRTM-aist/packages/deb/control)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control	                        (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control	2012-07-06 16:26:06 UTC (rev 2377)
@@ -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, 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.

Added: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.lucid
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.lucid	                        (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.lucid	2012-07-06 16:26:06 UTC (rev 2377)
@@ -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, 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.

Added: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.marveric
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.marveric	                        (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.marveric	2012-07-06 16:26:06 UTC (rev 2377)
@@ -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, 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.

Added: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.natty
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.natty	                        (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.natty	2012-07-06 16:26:06 UTC (rev 2377)
@@ -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, 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.oneiric
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.oneiric	                        (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.oneiric	2012-07-06 16:26:06 UTC (rev 2377)
@@ -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, 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.precise
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.precise	                        (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.precise	2012-07-06 16:26:06 UTC (rev 2377)
@@ -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, 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.

Copied: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/copyright (from rev 2370, branches/RELENG_1_1/OpenRTM-aist/packages/deb/copyright)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/copyright	                        (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/copyright	2012-07-06 16:26:06 UTC (rev 2377)
@@ -0,0 +1,35 @@
+This package was debianized by Noriaki Ando <n-ando at aist.go.jp> on
+Mon, 23 Jun 2008 16:18:55 +0900.
+
+It was downloaded from http://www.openrtm.org
+
+Upstream Author(s): 
+
+    Noriaki Ando <n-ando at aist.go.jp>
+
+Copyright: 
+
+    Copyright (C) 2003-2012
+    Noriaki Ando and the OpenRTM-aist Project team
+    Intelligent Systems Research Institute,
+    National Institute of Advanced Industrial Science and Technology (AIST),
+    Tsukuba, Japan, All rights reserved.
+
+License:
+
+    The OpenRTM-aist is the dual-licensed open source software. You can
+    use, copy, distribute and/or modify this library under the terms and
+    conditions of either of the licenses below.
+    
+    1) LGPL (GNU Lesser General Public License - v 2.1)
+    See COPYING.LIB.
+    
+    2) Individual Licnese
+    You can purchase license from AIST and/or AIST's TLO to copy,
+    distribute, modify and/or sublicense the library without any
+    limitation in the terms of LGPL. The individual license should be
+    concluded with a negotiated agreement between you and AIST and/or AIST
+    TLO. To conclude individual license, contact the person responsible of
+    AIST.
+
+

Copied: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/dirs (from rev 2370, branches/RELENG_1_1/OpenRTM-aist/packages/deb/dirs)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/dirs	                        (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/dirs	2012-07-06 16:26:06 UTC (rev 2377)
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin

Copied: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/docs (from rev 2370, branches/RELENG_1_1/OpenRTM-aist/packages/deb/docs)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/docs	                        (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/docs	2012-07-06 16:26:06 UTC (rev 2377)
@@ -0,0 +1,3 @@
+NEWS
+README
+README.jp

Copied: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/rules (from rev 2370, branches/RELENG_1_1/OpenRTM-aist/packages/deb/rules)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/rules	                        (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/rules	2012-07-06 16:26:06 UTC (rev 2377)
@@ -0,0 +1,168 @@
+#!/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"
+
+
+#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 $(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/)
+	(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)
+
+	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 
+

Deleted: branches/RELENG_1_1/OpenRTM-aist/packages/deb/dirs
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/dirs	2012-07-06 15:15:01 UTC (rev 2376)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/dirs	2012-07-06 16:26:06 UTC (rev 2377)
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin

Deleted: branches/RELENG_1_1/OpenRTM-aist/packages/deb/docs
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/docs	2012-07-06 15:15:01 UTC (rev 2376)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/docs	2012-07-06 16:26:06 UTC (rev 2377)
@@ -1,3 +0,0 @@
-NEWS
-README
-README.jp

Modified: branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh	2012-07-06 15:15:01 UTC (rev 2376)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh	2012-07-06 16:26:06 UTC (rev 2377)
@@ -45,7 +45,6 @@
     if test "x$DISTRIB_DESCRIPTION" != "x" ; then
 	dist_name=$DISTRIB_DESCRIPTION-`uname -m`
 	dist_key=$DISTRIB_ID
-    dist_release=$DISTRIB_RELEASE
     fi
 fi
 # Check the Fedora version
@@ -84,44 +83,33 @@
     exit 0
 fi
 
-
-file_list="README.Debian changelog compat control copyright dirs docs files rules"
-if test "x$dist_release" = "x11.04" || \
-   test "x$dist_release" = "x11.10" || \
-   test "x$dist_release" = "x12.04" || \
-   test "x$dist_release" = "x12.11" ; then
-   file_list="README.Debian changelog compat control.1 copyright dirs docs files rules"
-fi
-
-
 #------------------------------------------------------------
 # create "files" file
 #------------------------------------------------------------
-if test ! -f "files" ; then
-    PKGVER=`head -n 1 changelog | sed 's/.*(\([0-9\.\-]*\).*/\1/'`
-    echo "openrtm-aist_"${PKGVER}"_amd64.deb main extra" > files
-    echo "openrtm-aist-dev_"${PKGVER}"_amd64.deb main extra" >> files
-    echo "openrtm-aist-example_"${PKGVER}"_amd64.deb main extra" >> files
-    echo "openrtm-aist-doc_"${PKGVER}"_all.deb main extra" >> files
-fi
+#if test ! -f "files" ; then
+#    PKGVER=`head -n 1 changelog | sed 's/.*(\([0-9\.\-]*\).*/\1/'`
+#    echo "openrtm-aist_"${PKGVER}"_amd64.deb main extra" > files
+#    echo "openrtm-aist-dev_"${PKGVER}"_amd64.deb main extra" >> files
+#    echo "openrtm-aist-example_"${PKGVER}"_amd64.deb main extra" >> files
+#    echo "openrtm-aist-doc_"${PKGVER}"_all.deb main extra" >> files
+#fi
 
 #------------------------------------------------------------
 # package build process
 #------------------------------------------------------------
 packagedir=`pwd`/../../
-mkdir $packagedir/debian
-
 rm -f $packagedir/packages/openrtm-aist*
 
-for f in $file_list; do
-    f_real=`echo $f | sed -e 's/\(.*\)\.[0-9]*/\1/'`
-    cp $f $packagedir/debian/$f_real
-done
-chmod 444 $packagedir/debian/files
+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
+fi
 
 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

Deleted: branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkgbuild.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkgbuild.sh	2012-07-06 15:15:01 UTC (rev 2376)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkgbuild.sh	2012-07-06 16:26:06 UTC (rev 2377)
@@ -1,77 +0,0 @@
-#!/bin/sh 
-
-export PATH=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/local/X11R6/bin:/usr/local/sbin:/usr/sbin:/sbin
-export LANG=C
-export LC_ALL=C
-
-# system information
-os=`uname -s`
-release=`uname -r`-`uname -p`
-
-dist_name=""
-dist_key=""
-# Check the lsb distribution name
-if test -f /etc/lsb-release ; then
-    . /etc/lsb-release
-    if test "x$DISTRIB_DESCRIPTION" != "x" ; then
-	dist_name=$DISTRIB_DESCRIPTION-`uname -m`
-	dist_key=$DISTRIB_ID
-    fi
-fi
-# Check the Fedora version
-if test "x$dist_name" = "x" && test -f /etc/fedora-release ; then
-    dist_name=`cat /etc/fedora-release`-`uname -m`
-    dist_key=`sed -e 's/.[^0-9]*\([0-9]\).*/fc\1/' /etc/fedora-release`
-fi
-#Check the Debian version
-if test "x$dist_name" = "x" && test -f /etc/debian_version ; then
-    dist_name="Debian"`cat /etc/debian_version`-`uname -m`
-    dist_key="Debian"
-fi
-# Check the Vine version
-if test "x$dist_name" = "x" && test -f /etc/vine-release ; then
-    dist_name=`cat /etc/vine-release`-`uname -m`
-    dist_key=`sed -e 's/.*\([0-9]\)\.\([0-9]\).*/vl\1\2/' /etc/vine-release`
-fi
-# Check the TuboLinux version
-if test "x$dist_name" = "x" && test -f /etc/turbolinux-release ; then
-    dist_name=`cat /etc/tubolinux-release`-`uname -m`
-    dist_key=""
-fi
-
-if test "x$dist_name" = "x" ; then
-    dist_name=$os$release
-fi
-# Check the RedHat/Fedora version
-if test "x$dist_name" = "x" && test -f /etc/redhat-release ; then
-    dist_name=`cat /etc/redhat-release`-`uname -m`
-fi
-
-# only fedora and vine
-if test ! "x$dist_key" = "xDebian" -a ! "x$dist_key" = "xUbuntu" ; then
-    echo $dist_key
-    echo "This is not debian/ubuntu"
-    exit 0
-fi
-
-#------------------------------------------------------------
-# package build process
-#------------------------------------------------------------
-$packagedir=../../
-mkdir $packagedir/debian
-
-cp README.Debian $packagedir/debian/
-cp changelog $packagedir/debian/
-cp compat $packagedir/debian/
-cp control $packagedir/debian/
-cp copyright $packagedir/debian/
-cp dirs $packagedir/debian/
-cp docs $packagedir/debian/
-cp files $packagedir/debian/
-chmod 444 $packagedir/debian/files
-cp rules $packagedir/debian/
-chmod 755 $packagedir/debian/rules
-
-cd $packagedir
-
-dpkg-buildpackage -W -us -uc -rfakeroot

Deleted: branches/RELENG_1_1/OpenRTM-aist/packages/deb/rules
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/rules	2012-07-06 15:15:01 UTC (rev 2376)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/rules	2012-07-06 16:26:06 UTC (rev 2377)
@@ -1,168 +0,0 @@
-#!/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"
-
-
-#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-exec)
-
-	# 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 $(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/)
-	(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)
-
-	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/src/ext/ec/rtpreempt/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/ext/ec/rtpreempt/Makefile.am	2012-07-06 15:15:01 UTC (rev 2376)
+++ branches/RELENG_1_1/OpenRTM-aist/src/ext/ec/rtpreempt/Makefile.am	2012-07-06 16:26:06 UTC (rev 2377)
@@ -20,8 +20,9 @@
 RTPreemptEC_la_LDFLAGS = -module -shared
 RTPreemptEC_la_FLAGS   = -L$(top_builddir)/src/lib/rtm/.lib
 RTPreemptEC_la_LIBADD  = \
+	-lrt                                  \
 	$(top_builddir)/src/lib/rtm/libRTC.la \
 	$(top_builddir)/src/lib/coil/lib/libcoil.la 
 
 clean-local:
-	rm -rf *~ *.o *.so
\ No newline at end of file
+	rm -rf *~ *.o *.so



More information about the openrtm-commit mailing list