[openrtm-commit:00846] r2373 - in branches/RELENG_1_1: . OpenRTM-aist OpenRTM-aist/packages/deb OpenRTM-aist/packages/rpm

[openrtm ＠ openrtm.org]

Author: 
Date: 2012-06-07 20:10:01 +0900 (Thu, 07 Jun 2012)
New Revision: 2373

Added:
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/control.1
Modified:
   branches/RELENG_1_1/
   branches/RELENG_1_1/OpenRTM-aist/
   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/packages/rpm/rpm_build.sh.in
Log:
merged r2364-r2372 from RELEASE_1_1_0.


Property changes on: branches/RELENG_1_1
___________________________________________________________________
Added: svn:mergeinfo
   + /tags/RELEASE_1_1_0:2364-2372


Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213
   + /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213

Modified: branches/RELENG_1_1/OpenRTM-aist/packages/deb/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/Makefile.am	2012-06-07 11:07:27 UTC (rev 2372)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/Makefile.am	2012-06-07 11:10:01 UTC (rev 2373)
@@ -57,6 +57,7 @@
 	changelog     \
 	compat        \
 	control       \
+	control.1     \
 	copyright     \
 	dirs          \
 	docs          \

Copied: branches/RELENG_1_1/OpenRTM-aist/packages/deb/control.1 (from rev 2372, tags/RELEASE_1_1_0/OpenRTM-aist/packages/deb/control.1)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/control.1	                        (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/control.1	2012-06-07 11:10:01 UTC (rev 2373)
@@ -0,0 +1,39 @@
+Source: openrtm-aist
+Section: main
+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/dpkg_build.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh	2012-06-07 11:07:27 UTC (rev 2372)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/dpkg_build.sh	2012-06-07 11:10:01 UTC (rev 2373)
@@ -45,6 +45,7 @@
     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
@@ -83,6 +84,16 @@
     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
 #------------------------------------------------------------
@@ -102,20 +113,15 @@
 
 rm -f $packagedir/packages/openrtm-aist*
 
-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/
+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 rules $packagedir/debian/
 chmod 755 $packagedir/debian/rules
 
 cd $packagedir
 
 dpkg-buildpackage -W -us -uc -rfakeroot
 
-mv $packagedir/../openrtm-aist* $packagedir/packages/
\ No newline at end of file
+mv $packagedir/../openrtm-aist* $packagedir/packages/

Modified: branches/RELENG_1_1/OpenRTM-aist/packages/rpm/rpm_build.sh.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/rpm/rpm_build.sh.in	2012-06-07 11:07:27 UTC (rev 2372)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/rpm/rpm_build.sh.in	2012-06-07 11:10:01 UTC (rev 2373)
@@ -95,3 +95,5 @@
 # %prep process can be skiped. = --short-circuit -bc
 rpm_def="_topdir $builddir"
 rpmbuild --define "$rpm_def" -ba OpenRTM-aist.spec
+cd ..
+rm $packagename