[ocl] 01/23: Reorganization of files
Leopold Palomo-Avellaneda
leo at alaxarxa.net
Wed Apr 15 11:42:04 UTC 2015
This is an automated email from the git hooks/post-receive script.
lepalom-guest pushed a commit to branch master
in repository ocl.
commit 28f8b177926452254026faa4948d19914deb7885
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date: Tue Apr 14 17:05:28 2015 +0200
Reorganization of files
---
debian/control | 83 +++++-----------------
debian/liborocos-ocl-common-bin.install | 11 ---
debian/liborocos-ocl-common2.8-dev.install | 5 ++
debian/liborocos-ocl-corba-gnulinux2.8-dev.install | 1 -
debian/liborocos-ocl-corba-gnulinux2.8.install | 2 -
debian/liborocos-ocl-corba2.8-dev.install | 1 -
debian/liborocos-ocl-gnulinux2.8-bin.install | 8 ---
debian/liborocos-ocl-gnulinux2.8-dev.install | 12 ++--
debian/liborocos-ocl-gnulinux2.8.install | 18 ++---
debian/liborocos-ocl-tools-gnulinux2.8.install | 1 +
debian/liborocos-ocl-tools-xenomai2.8.install | 1 +
debian/liborocos-ocl-xenomai2.8-dev.install | 5 ++
debian/liborocos-ocl-xenomai2.8.install | 4 ++
debian/liborocos-ocl2.8-dev.install | 19 -----
14 files changed, 42 insertions(+), 129 deletions(-)
diff --git a/debian/control b/debian/control
index 45155b0..b6a81db 100644
--- a/debian/control
+++ b/debian/control
@@ -1,59 +1,39 @@
Source: orocos-ocl
-Priority: extra
-Maintainer: Peter Soetens <peter.soetens at fmtc.be>
+Priority: optional
+Section: libs
+Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Build-Depends: debhelper (>= 9), cmake (>=2.6.2), libboost-program-options-dev,
pkg-config, libncurses-dev, libreadline-dev,
libnetcdf-dev, linux-libc-dev,
- liborocos-rtt-corba-gnulinux2.8-dev ( >= 2.8 ),
- liborocos-rtt-corba-xenomai2.8-dev ( >= 2.8 ),
+ liborocos-rtt-gnulinux2.8-dev ( >= 2.8 ),
+ liborocos-rtt-xenomai2.8-dev ( >= 2.8 ),
liborocos-log4cpp6.0-dev,
- libnetcdf-dev,
libxerces-c-dev,
- liblua5.1-0-dev
+ liblua5.1-0-dev,
+ catkin
Standards-Version: 3.9.6
Section: libs
-Package: liborocos-ocl2.8-dbg
-Section: libdevel
-Priority: extra
-Architecture: any
-Depends: orocos-ocl-gnulinux2.8-bin (= ${binary:Version})
-Description: Orocos Component Library (debug symbols)
- The Orocos Component Library contains components for real-time control of robots and machines.
- .
- This package contains the debugging symbols.
-
Package: liborocos-ocl2.8-dev
-Section: libdevel
Architecture: any
-Depends: liborocos-ocl-gnulinux2.8-dev | liborocos-ocl-lxrt2.8-dev | liborocos-ocl-xenomai2.8-dev
+Depends: liborocos-ocl-gnulinux2.8-dev | liborocos-ocl-xenomai2.8-dev
Description: Orocos Component Library Headers
Orocos Component Library
.
Header files.
-Package: liborocos-ocl-corba2.8-dev
-Section: libdevel
-Architecture: any
-Depends: liborocos-ocl2.8-dev
-Description: Orocos Component Library Headers - CORBA extensions
- Orocos Component Library
- .
- Header files.
-
Package: liborocos-ocl-common-bin
-Section: libdevel
Architecture: any
-Depends: liborocos-ocl-gnulinux2.8-dev | liborocos-ocl-lxrt2.8-dev | liborocos-ocl-xenomai2.8-dev
+Depends: ${misc:Depends}, liborocos-ocl-gnulinux2.8-dev | liborocos-ocl-xenomai2.8-dev
Description: Orocos Component Generation script
Contains the orocreate-pkg script for creating new component packages.
Package: liborocos-ocl-gnulinux2.8-dev
-Section: libdevel
Architecture: any
-Depends: liborocos-ocl-gnulinux2.8 (= ${Source-Version}), liborocos-rtt-gnulinux2.8-dev ( >= 2.8 ),
- liborocos-ocl2.8-dev, libncurses-dev, libreadline-dev, libnetcdf-dev | netcdfg-dev, linux-libc-dev
+Depends: ${misc:Depends}, liborocos-ocl-gnulinux2.8 (= ${binary:Version}), liborocos-rtt-gnulinux2.8-dev ( >= 2.8 ),
+ liborocos-ocl2.8-dev, libncurses-dev, libreadline-dev, libnetcdf-dev, linux-libc-dev
Conflicts: liborocos-ocl-gnulinux-dev
Replaces: liborocos-ocl-gnulinux-dev
Provides: liborocos-ocl-gnulinux-dev
@@ -73,22 +53,9 @@ Description: Orocos Component Library for gnulinux
.
Library and tools.
-Package: liborocos-ocl-corba-gnulinux2.8-dev
-Section: libdevel
-Architecture: any
-Depends: liborocos-ocl-gnulinux2.8-dev (= ${Source-Version}), liborocos-rtt-corba-gnulinux2.8-dev ( >= 2.8 )
-Conflicts: liborocos-ocl-corba-gnulinux-dev
-Replaces: liborocos-ocl-corba-gnulinux-dev
-Provides: liborocos-ocl-corba-gnulinux-dev
-Description: Orocos Component Library - CORBA extensions for gnulinux
- Orocos Component Library
- .
- Development files.
-
Package: liborocos-ocl-corba-gnulinux2.8
-Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, liborocos-ocl-gnulinux2.8 (= ${binary:Version})
Description: Orocos Component Library - CORBA extensions for gnulinux
This package contains the Reporting, TaskBrowser and Deployment
components. The included deployer application can be used to
@@ -98,9 +65,8 @@ Description: Orocos Component Library - CORBA extensions for gnulinux
Package: liborocos-ocl-gnulinux2.8-bin
-Section: libdevel
Architecture: any
-Depends: liborocos-ocl-gnulinux2.8 (= ${Source-Version}), liborocos-ocl-corba-gnulinux2.8, tao-naming, ${shlibs:Depends}
+Depends: ${misc:Depends}, liborocos-ocl-gnulinux2.8 (= ${binary:Version}), liborocos-ocl-corba-gnulinux2.8, tao-naming, ${shlibs:Depends}
Conflicts: orocos-ocl-gnulinux-bin
Replaces: orocos-ocl-gnulinux-bin
Provides: orocos-ocl-gnulinux-bin
@@ -108,31 +74,17 @@ Description: Orocos Component Library - Binaries for gnulinux
This package contains the ctaskbrowser-gnulinux,
cdeployer-gnulinux and deployer-gnulinux applications.
-Package: orocos-ocl-gnulinux2.8-dev
-Section: libdevel
-Architecture: any
-Depends: liborocos-ocl-gnulinux2.8-dev, liborocos-ocl-corba-gnulinux2.8-dev
-Conflicts: orocos-ocl-gnulinux-dev
-Replaces: orocos-ocl-gnulinux-dev
-Provides: orocos-ocl-gnulinux-dev
-Description: Orocos Component Library - All library development packages for gnulinux
- A super package for Orocos Component Library
- .
- Development files.
-
Package: orocos-ocl-gnulinux2.8
-Section: libdevel
Architecture: any
-Depends: liborocos-ocl-gnulinux2.8 (= ${Source-Version})
+Depends: ${misc:Depends}, liborocos-ocl-gnulinux2.8 (= ${binary:Version})
Description: Orocos Component Library - All library packages for gnulinux
A super package for Orocos Component Library
.
Libraries.
Package: orocos-ocl-xenomai2.8-dev
-Section: libdevel
Architecture: any
-Depends: liborocos-ocl-xenomai2.8-dev, liborocos-ocl-corba-xenomai2.8-dev
+Depends: ${misc:Depends}, liborocos-ocl-xenomai2.8-dev, liborocos-ocl-corba-xenomai2.8-dev
Conflicts: orocos-ocl-gnulinux-dev
Replaces: orocos-ocl-gnulinux-dev
Provides: orocos-ocl-gnulinux-dev
@@ -143,9 +95,8 @@ Description: Orocos Component Library - All library development packages for
Development files.
Package: orocos-ocl-xenomai2.8
-Section: libdevel
Architecture: any
-Depends: liborocos-ocl-xenomai2.8 (= ${Source-Version})
+Depends: ${misc:Depends}, liborocos-ocl-xenomai2.8 (= ${binary:Version})
Description: Orocos Component Library - All library packages for xenomai
A super package for Orocos Component Library
.
diff --git a/debian/liborocos-ocl-common-bin.install b/debian/liborocos-ocl-common-bin.install
deleted file mode 100644
index 6f1ae46..0000000
--- a/debian/liborocos-ocl-common-bin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-usr/share/ocl/* usr/share/orocos-ocl/
-usr/share/lua* usr/share/orocos-ocl/
-usr/bin/orocreate-pkg
-usr/bin/ctaskbrowser
-usr/bin/cdeployer
-usr/bin/deployer
-usr/bin/deployer-corba
-usr/bin/rttlua
-usr/bin/rttscript
-usr/bin/rttlua-tlsf
-usr/bin/rttlua-corba
diff --git a/debian/liborocos-ocl-common2.8-dev.install b/debian/liborocos-ocl-common2.8-dev.install
new file mode 100644
index 0000000..3ba3eb5
--- /dev/null
+++ b/debian/liborocos-ocl-common2.8-dev.install
@@ -0,0 +1,5 @@
+usr/share/ocl/* usr/share/orocos-ocl/
+usr/share/lua*
+usr/include/*
+usr/lib/cmake/*
+
diff --git a/debian/liborocos-ocl-corba-gnulinux2.8-dev.install b/debian/liborocos-ocl-corba-gnulinux2.8-dev.install
deleted file mode 100644
index 8958dca..0000000
--- a/debian/liborocos-ocl-corba-gnulinux2.8-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/liborocos-ocl-deployment-corba-gnulinux.so
diff --git a/debian/liborocos-ocl-corba-gnulinux2.8.install b/debian/liborocos-ocl-corba-gnulinux2.8.install
deleted file mode 100644
index cab1c84..0000000
--- a/debian/liborocos-ocl-corba-gnulinux2.8.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/liborocos-ocl-deployment-corba-gnulinux.so.*
-
diff --git a/debian/liborocos-ocl-corba2.8-dev.install b/debian/liborocos-ocl-corba2.8-dev.install
deleted file mode 100644
index 7a21394..0000000
--- a/debian/liborocos-ocl-corba2.8-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/include/orocos/ocl/CorbaDeploymentComponent.hpp
diff --git a/debian/liborocos-ocl-gnulinux2.8-bin.install b/debian/liborocos-ocl-gnulinux2.8-bin.install
deleted file mode 100644
index 556a042..0000000
--- a/debian/liborocos-ocl-gnulinux2.8-bin.install
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/bin/ctaskbrowser-gnulinux
-usr/bin/cdeployer-gnulinux
-usr/bin/deployer-gnulinux
-usr/bin/deployer-corba-gnulinux
-usr/bin/rttlua-gnulinux
-usr/bin/rttlua-tlsf-gnulinux
-usr/bin/rttscript-gnulinux
-usr/bin/rttlua-corba-gnulinux
diff --git a/debian/liborocos-ocl-gnulinux2.8-dev.install b/debian/liborocos-ocl-gnulinux2.8-dev.install
index 22213f8..b3f445b 100644
--- a/debian/liborocos-ocl-gnulinux2.8-dev.install
+++ b/debian/liborocos-ocl-gnulinux2.8-dev.install
@@ -1,7 +1,5 @@
-usr/lib/pkgconfig/orocos-ocl-gnulinux.pc
-usr/lib/pkgconfig/ocl-gnulinux.pc
-usr/lib/pkgconfig/ocl-timer-gnulinux.pc
-usr/lib/pkgconfig/ocl-deployment-gnulinux.pc
-usr/lib/pkgconfig/ocl-taskbrowser-gnulinux.pc
-usr/lib/pkgconfig/ocl-reporting-gnulinux.pc
-usr/lib/pkgconfig/ocl-lua-gnulinux.pc
+usr/lib/*gnulinux.so
+usr/lib/orocos/gnulinux/ocl/*gnulinux*.so
+usr/lib/orocos/gnulinux/ocl/plugins/*gnulinux*.so
+usr/lib/orocos/gnulinux/ocl/types/*gnulinux*.so
+usr/lib/pkgconfig/*gnulinux.pc
diff --git a/debian/liborocos-ocl-gnulinux2.8.install b/debian/liborocos-ocl-gnulinux2.8.install
index 7b898a2..84031c2 100644
--- a/debian/liborocos-ocl-gnulinux2.8.install
+++ b/debian/liborocos-ocl-gnulinux2.8.install
@@ -1,14 +1,4 @@
-usr/lib/liborocos-ocl-deployment-gnulinux.so.*
-usr/lib/liborocos-ocl-taskbrowser-gnulinux.so.*
-usr/lib/orocos/gnulinux/ocl/liborocos-ocl-common-gnulinux.so.*
-usr/lib/orocos/gnulinux/ocl/liborocos-ocl-reporting-gnulinux.so.*
-usr/lib/orocos/gnulinux/ocl/liborocos-ocl-reporting-netcdf-gnulinux.so.*
-usr/lib/orocos/gnulinux/ocl/liborocos-ocl-timer-gnulinux.so.*
-usr/lib/orocos/gnulinux/ocl/liborocos-ocl-helloworld-gnulinux.so.*
-usr/lib/orocos/gnulinux/ocl/liborocos-ocl-lua-gnulinux.so.*
-usr/lib/orocos/gnulinux/ocl/liborocos-ocl-lua-tlsf-gnulinux.so.*
-usr/lib/orocos/gnulinux/ocl/plugins/libos-gnulinux.so.*
-usr/lib/orocos/gnulinux/ocl/plugins/libprint-gnulinux.so.*
-usr/lib/orocos/gnulinux/ocl/plugins/librttlua-plugin-gnulinux.so.*
-usr/lib/orocos/gnulinux/ocl/plugins/librttlua-tlsf-plugin-gnulinux.so.*
-usr/lib/orocos/gnulinux/ocl/types/libocl-gnulinux.so.*
+usr/lib/*gnulinux.so.*
+usr/lib/orocos/gnulinux/ocl/*gnulinux*.so.*
+usr/lib/orocos/gnulinux/ocl/plugins/*gnulinux*.so.*
+usr/lib/orocos/gnulinux/ocl/types/*gnulinux*.so.*
diff --git a/debian/liborocos-ocl-tools-gnulinux2.8.install b/debian/liborocos-ocl-tools-gnulinux2.8.install
new file mode 100644
index 0000000..aaf622b
--- /dev/null
+++ b/debian/liborocos-ocl-tools-gnulinux2.8.install
@@ -0,0 +1 @@
+usr/bin/*gnulinux*
diff --git a/debian/liborocos-ocl-tools-xenomai2.8.install b/debian/liborocos-ocl-tools-xenomai2.8.install
new file mode 100644
index 0000000..aaf622b
--- /dev/null
+++ b/debian/liborocos-ocl-tools-xenomai2.8.install
@@ -0,0 +1 @@
+usr/bin/*gnulinux*
diff --git a/debian/liborocos-ocl-xenomai2.8-dev.install b/debian/liborocos-ocl-xenomai2.8-dev.install
new file mode 100644
index 0000000..da07a78
--- /dev/null
+++ b/debian/liborocos-ocl-xenomai2.8-dev.install
@@ -0,0 +1,5 @@
+usr/lib/*xenomai.so
+usr/lib/orocos/xenomai/ocl/*xenomai*.so
+usr/lib/orocos/xenomai/ocl/plugins/*xenomai*.so
+usr/lib/orocos/xenomai/ocl/types/*xenomai*.so
+usr/lib/pkgconfig/*xenomai.pc
diff --git a/debian/liborocos-ocl-xenomai2.8.install b/debian/liborocos-ocl-xenomai2.8.install
new file mode 100644
index 0000000..0336de2
--- /dev/null
+++ b/debian/liborocos-ocl-xenomai2.8.install
@@ -0,0 +1,4 @@
+usr/lib/*xenomai.so.*
+usr/lib/orocos/xenomai/ocl/*xenomai*.so.*
+usr/lib/orocos/xenomai/ocl/plugins/*xenomai*.so.*
+usr/lib/orocos/xenomai/ocl/types/*xenomai*.so.*
diff --git a/debian/liborocos-ocl2.8-dev.install b/debian/liborocos-ocl2.8-dev.install
deleted file mode 100644
index b455c00..0000000
--- a/debian/liborocos-ocl2.8-dev.install
+++ /dev/null
@@ -1,19 +0,0 @@
-usr/include/orocos/ocl/ocl-config.h
-usr/include/orocos/ocl/OCL.hpp
-usr/include/orocos/ocl/Component.hpp
-usr/include/orocos/ocl/DeploymentComponent.hpp
-usr/include/orocos/ocl/TaskBrowser.hpp
-usr/include/orocos/ocl/ReportingComponent.hpp
-usr/include/orocos/ocl/command.hpp
-usr/include/orocos/ocl/datasender.hpp
-usr/include/orocos/ocl/socket.hpp
-usr/include/orocos/ocl/socketmarshaller.hpp
-usr/include/orocos/ocl/TcpReporting.hpp
-usr/include/orocos/ocl/FileReporting.hpp
-usr/include/orocos/ocl/ConsoleReporting.hpp
-usr/include/orocos/ocl/NiceHeaderMarshaller.hpp
-usr/include/orocos/ocl/HMIConsoleOutput.hpp
-usr/include/orocos/ocl/TimerComponent.hpp
-usr/include/orocos/ocl/NetcdfReporting.hpp
-usr/include/orocos/ocl/NetcdfHeaderMarshaller.hpp
-usr/include/orocos/ocl/NetcdfMarshaller.hpp
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/orocos/ocl.git
More information about the debian-science-commits
mailing list