[SCM] OCE packaging branch, master, updated. 5dac5e735cfa4d7f03d9b47485541d5819fe6f5a

Denis Barbier bouzim at gmail.com
Sat Nov 5 15:41:24 UTC 2011


The following commit has been merged in the master branch:
commit 3651c8bc824eb75bfe01f87ce9da3490c68046f7
Author: Denis Barbier <bouzim at gmail.com>
Date:   Sat Nov 5 16:29:17 2011 +0100

    Move usr/share/oce-*/src/StdResource/* from liboce-ocaf-lite1 into liboce-foundation1
    
    ResourceManager, which is part of TKernel, looks for those files.
    No conflict is needed since paths are different.

diff --git a/debian/liboce-foundation1.install b/debian/liboce-foundation1.install
index 9c567cf..deb8aac 100644
--- a/debian/liboce-foundation1.install
+++ b/debian/liboce-foundation1.install
@@ -4,8 +4,9 @@ usr/lib/libTKernel.so.*
 usr/lib/libTKMath.so.*
 usr/lib/libTKAdvTools.so.*
 
-usr/share/oce-*/src/UnitsAPI/*
 usr/share/oce-*/src/OS/*
+usr/share/oce-*/src/StdResource/*
+usr/share/oce-*/src/UnitsAPI/*
 
 usr/lib/oce-*/env.sh
 usr/lib/oce-*/env.csh
diff --git a/debian/liboce-ocaf-lite1.install b/debian/liboce-ocaf-lite1.install
index f00e25a..d19da4a 100644
--- a/debian/liboce-ocaf-lite1.install
+++ b/debian/liboce-ocaf-lite1.install
@@ -12,5 +12,3 @@ usr/lib/libTKPLCAF.so.*
 usr/lib/libTKTObj.so.*
 usr/lib/libTKShapeSchema.so.*
 usr/lib/libTKStdLSchema.so.*
-
-usr/share/oce-*/src/StdResource/*

-- 
OCE packaging



More information about the debian-science-commits mailing list