diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-11-23 09:51:32 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-11-23 09:51:32 +0000 |
| commit | 91f6409ddff9e82ef91fd43b829d1b6deb888c47 (patch) | |
| tree | b37d367a5cbaf0ecb631423f3778026574505afd | |
| parent | c3212bccb5c24af60b680ddcd2fa9ff99010372a (diff) | |
| download | ATCD-91f6409ddff9e82ef91fd43b829d1b6deb888c47.tar.gz | |
Fri Nov 23 09:51:01 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* debian/README.source:
Removed comment of patch that got integrated
* debian/libtao-2.1.6.install:
* debian/libtao-dev.install:
Added missing libraries
| -rw-r--r-- | ACE/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/debian/README.source | 8 | ||||
| -rw-r--r-- | ACE/debian/libtao-2.1.6.install | 1 | ||||
| -rw-r--r-- | ACE/debian/libtao-dev.install | 3 |
4 files changed, 15 insertions, 6 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 0b509b1835a..cdc5fec8398 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,12 @@ +Fri Nov 23 09:51:01 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * debian/README.source: + Removed comment of patch that got integrated + + * debian/libtao-2.1.6.install: + * debian/libtao-dev.install: + Added missing libraries + Fri Nov 23 09:39:17 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * debian/TAO_ACE.mwc: diff --git a/ACE/debian/README.source b/ACE/debian/README.source index f975b7c97c2..33734bbdb11 100644 --- a/ACE/debian/README.source +++ b/ACE/debian/README.source @@ -11,9 +11,7 @@ When preparing a new release, there are several things to remember: - - Update patch 34-bts386713 (change soversions) - - - Regenerate the list of include files for libace-inet-dev and +- Regenerate the list of include files for libace-inet-dev and libace-inet-ssl-dev: From debian/tmp: @@ -21,14 +19,14 @@ When preparing a new release, there are several things to remember: $ find . -type f | grep -vi https | grep -vi ssl --> These go to libace-inet-dev The ones matching HTTPS or SSL go in libace-inet-ssl-dev.install: - + usr/include/ace/INet/*SSL* usr/include/ace/INet/*HTTPS* But that might need updating if ACE_INet_SSL starts supporting FTPS or others libace-inet-ssl-dev requires libace-inet-dev - + Also, make sure none of the files in libace-inet-dev include anything from libace-inet-ssl-dev. Test with: diff --git a/ACE/debian/libtao-2.1.6.install b/ACE/debian/libtao-2.1.6.install index 494c7a596d3..a80041c6986 100644 --- a/ACE/debian/libtao-2.1.6.install +++ b/ACE/debian/libtao-2.1.6.install @@ -10,6 +10,7 @@ usr/lib/libTAO_DynamicAny-*.so usr/lib/libTAO_DynamicInterface-*.so usr/lib/libTAO_EndpointPolicy-*.so usr/lib/libTAO_IFR_Client-*.so +usr/lib/libTAO_IFR_Client_skel-*.so usr/lib/libTAO_IORInterceptor-*.so usr/lib/libTAO_IORManip-*.so usr/lib/libTAO_IORTable-*.so diff --git a/ACE/debian/libtao-dev.install b/ACE/debian/libtao-dev.install index b1e642b017a..7b09d87f5cd 100644 --- a/ACE/debian/libtao-dev.install +++ b/ACE/debian/libtao-dev.install @@ -25,6 +25,7 @@ usr/include/tao/EndpointPolicy usr/lib/libTAO_EndpointPolicy.so usr/include/tao/IFR_Client usr/lib/libTAO_IFR_Client.so +usr/lib/libTAO_IFR_Client_skel.so usr/include/tao/ImR_Client usr/lib/libTAO_ImR_Client.so usr/include/tao/IORInterceptor @@ -72,7 +73,7 @@ usr/include/tao/ETCL usr/lib/libTAO_ETCL.so usr/include/tao/Monitor usr/lib/libTAO_Monitor.so -../../TAO/MPC/config usr/lib/ace/TAO/MPC +usr/share/tao/MPC/config usr/lib/ace/TAO/MPC ../../TAO/rules.tao.GNU usr/lib/ace/TAO usr/lib/libTAO_IFR_BE.so usr/lib/libTAO_IDL_FE.so |