[Pkg-ace-commits] [pkg-ace] r547 - in trunk/debian: . patches
tgg at alioth.debian.org
tgg at alioth.debian.org
Sat Dec 15 20:56:10 UTC 2007
Author: tgg
Date: 2007-12-15 20:56:10 +0000 (Sat, 15 Dec 2007)
New Revision: 547
Removed:
trunk/debian/patches/07-svn-ace-doxygen-short-names.dpatch
trunk/debian/patches/12-autoconf-ACE_HAS_POSIX_SEM_TIMEOUT_test.dpatch
Modified:
trunk/debian/changelog
trunk/debian/patches/00list
trunk/debian/patches/03-g++-new-throws.dpatch
trunk/debian/patches/34-bts386713.dpatch
trunk/debian/rules
Log:
update to 5.6.2
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-11-22 07:02:45 UTC (rev 546)
+++ trunk/debian/changelog 2007-12-15 20:56:10 UTC (rev 547)
@@ -1,4 +1,4 @@
-ace (5.6.1-1) experimental; urgency=low
+ace (5.6.2-1) experimental; urgency=low
* New upstream release.
* Generate .am files instead of patching them; hence drop:
Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list 2007-11-22 07:02:45 UTC (rev 546)
+++ trunk/debian/patches/00list 2007-12-15 20:56:10 UTC (rev 547)
@@ -3,9 +3,7 @@
02-qt4
04-reduce-opt
06-revert-mpc-kokyu-change.dpatch
-07-svn-ace-doxygen-short-names.dpatch
08-fix-perl-shebang
-12-autoconf-ACE_HAS_POSIX_SEM_TIMEOUT_test
15-fix-fltk-include
34-bts386713
50-prepatch-dummy-mark
Modified: trunk/debian/patches/03-g++-new-throws.dpatch
===================================================================
--- trunk/debian/patches/03-g++-new-throws.dpatch 2007-11-22 07:02:45 UTC (rev 546)
+++ trunk/debian/patches/03-g++-new-throws.dpatch 2007-12-15 20:56:10 UTC (rev 547)
@@ -5,9 +5,9 @@
## DP: don't test if new() throws std::bad_alloc
@DPATCH@
---- ACE_wrappers.orig/configure.ac
-+++ ACE_wrappers/configure.ac
-@@ -5105,47 +5105,7 @@
+--- orig/configure.ac
++++ mod/configure.ac
+@@ -5224,57 +5224,7 @@
ACE_CACHE_CHECK([if new throws std::bad_alloc exception on failure],
[ace_cv_new_throws_bad_alloc_exception],
[
@@ -24,10 +24,20 @@
-# include <exception.h>
-#endif
-
+-/* We already checked for ACE_LACKS_NUMERIC_LIMITS */
+-#if !defined ACE_LACKS_NUMERIC_LIMITS
+-#include <limits>
+-#endif
+-
- int main(int, char *[]) {
+-#if defined ACE_LACKS_NUMERIC_LIMITS
+- const size_t ALLOC_SIZE = 2 * 1024 * 1024 * 1024;
+-#else
+- const size_t ALLOC_SIZE = std::numeric_limits<size_t>::max () / 2;
+-#endif
- while (1) {
- try {
-- char *a = new char[1024*1024];
+- char *a = new char[ALLOC_SIZE];
- if (a == 0) {
- return 1; /* new() does NOT throw exceptions */
- }
Deleted: trunk/debian/patches/07-svn-ace-doxygen-short-names.dpatch
===================================================================
--- trunk/debian/patches/07-svn-ace-doxygen-short-names.dpatch 2007-11-22 07:02:45 UTC (rev 546)
+++ trunk/debian/patches/07-svn-ace-doxygen-short-names.dpatch 2007-12-15 20:56:10 UTC (rev 547)
@@ -1,13 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## DP: Produces shorted doxygen filenames for ACE. Taken from SVN.
- at DPATCH@
---- ACE_wrappers.orig/etc/ace.doxygen
-+++ ACE_wrappers/etc/ace.doxygen
-@@ -34,6 +34,7 @@
- DISTRIBUTE_GROUP_DOC = YES
- TAB_SIZE = 8
- ENABLED_SECTIONS =
-+SHORT_NAMES = YES
-
- #---------------------------------------------------------------------------
- # configuration options related to warning and progress messages
Deleted: trunk/debian/patches/12-autoconf-ACE_HAS_POSIX_SEM_TIMEOUT_test.dpatch
===================================================================
--- trunk/debian/patches/12-autoconf-ACE_HAS_POSIX_SEM_TIMEOUT_test.dpatch 2007-11-22 07:02:45 UTC (rev 546)
+++ trunk/debian/patches/12-autoconf-ACE_HAS_POSIX_SEM_TIMEOUT_test.dpatch 2007-12-15 20:56:10 UTC (rev 547)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12-autoconf_ACE_HAS_POSIX_SEM_TIMEOUT_test.dpatch
-##
-## DP: add missing AC_DEFINE for ACE_HAS_POSIX_SEM_TIMEOUT
-
- at DPATCH@
---- ACE_wrappers.orig/configure.ac
-+++ ACE_wrappers/configure.ac
-@@ -4422,7 +4422,8 @@
- dnl action if cross-compiling
- ace_cv_sem_timedwait_works=yes
- ])
-- ],,)
-+ ],
-+ [AC_DEFINE([ACE_HAS_POSIX_SEM_TIMEOUT])],)
- fi
-
-
Modified: trunk/debian/patches/34-bts386713.dpatch
===================================================================
--- trunk/debian/patches/34-bts386713.dpatch 2007-11-22 07:02:45 UTC (rev 546)
+++ trunk/debian/patches/34-bts386713.dpatch 2007-12-15 20:56:10 UTC (rev 547)
@@ -12,7 +12,7 @@
static const char pg_poa_factory_name[] = "TAO_GOA";
static const char pg_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE(
- "TAO_GOA", "TAO_PortableGroup", "_make_TAO_PG_Object_Adapter_Factory", "");
-+ "TAO_GOA", "libTAO_PortableGroup-1.6.1.so", "_make_TAO_PG_Object_Adapter_Factory", "");
++ "TAO_GOA", "libTAO_PortableGroup-1.6.2.so", "_make_TAO_PG_Object_Adapter_Factory", "");
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -23,7 +23,7 @@
this->configuration ()->process_directive (
ACE_DYNAMIC_SERVICE_DIRECTIVE("PolicyFactory_Loader",
- "TAO_PI",
-+ "libTAO_PI-1.6.1.so",
++ "libTAO_PI-1.6.2.so",
"_make_TAO_PolicyFactory_Loader",
""));
loader =
@@ -32,7 +32,7 @@
config->process_directive (
ACE_DYNAMIC_SERVICE_DIRECTIVE ("ORBInitializer_Registry",
- "TAO_PI",
-+ "libTAO_PI-1.6.1.so",
++ "libTAO_PI-1.6.2.so",
"_make_ORBInitializer_Registry",
""));
this->orbinitializer_registry_ =
@@ -41,7 +41,7 @@
this->configuration ()->process_directive
(ACE_DYNAMIC_SERVICE_DIRECTIVE("TypeCodeFactory",
- "TAO_TypeCodeFactory",
-+ "libTAO_TypeCodeFactory-1.6.1.so",
++ "libTAO_TypeCodeFactory-1.6.2.so",
"_make_TAO_TypeCodeFactory_Loader",
""));
loader =
@@ -50,7 +50,7 @@
this->configuration()->process_directive
(ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory",
- "TAO_CodecFactory",
-+ "libTAO_CodecFactory-1.6.1.so",
++ "libTAO_CodecFactory-1.6.2.so",
"_make_TAO_CodecFactory_Loader",
""));
loader =
@@ -59,7 +59,7 @@
this->configuration()->process_directive
(ACE_DYNAMIC_SERVICE_DIRECTIVE("Compression",
- "TAO_Compression",
-+ "libTAO_Compression-1.6.1.so",
++ "libTAO_Compression-1.6.2.so",
"_make_TAO_Compression_Loader",
""));
loader =
@@ -68,7 +68,7 @@
this->configuration()->process_directive
(ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_POA_Current_Factory",
- "TAO_PortableServer",
-+ "libTAO_PortableServer-1.6.1.so",
++ "libTAO_PortableServer-1.6.2.so",
"_make_TAO_POA_Current_Factory",
""));
loader =
@@ -77,7 +77,7 @@
this->configuration ()->process_directive
(ACE_DYNAMIC_SERVICE_DIRECTIVE("PICurrent_Loader",
- "TAO_PI",
-+ "libTAO_PI-1.6.1.so",
++ "libTAO_PI-1.6.2.so",
"_make_TAO_PICurrent_Loader",
""));
loader =
@@ -86,7 +86,7 @@
this->configuration ()->process_directive
(ACE_DYNAMIC_SERVICE_DIRECTIVE("DynamicAny_Loader",
- "TAO_DynamicAny",
-+ "libTAO_DynamicAny-1.6.1.so",
++ "libTAO_DynamicAny-1.6.2.so",
"_make_TAO_DynamicAny_Loader",
""));
loader =
@@ -95,7 +95,7 @@
this->configuration()->process_directive
(ACE_DYNAMIC_SERVICE_DIRECTIVE("IORManip_Loader",
- "TAO_IORManip",
-+ "libTAO_IORManip-1.6.1.so",
++ "libTAO_IORManip-1.6.2.so",
"_make_TAO_IORManip_Loader",
""));
loader =
@@ -104,7 +104,7 @@
this->configuration ()->process_directive
(ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_IORTable",
- "TAO_IORTable",
-+ "libTAO_IORTable-1.6.1.so",
++ "libTAO_IORTable-1.6.2.so",
"_make_TAO_Table_Adapter_Factory",
""));
factory =
@@ -115,7 +115,7 @@
ACE_Service_Config::process_directive (
ACE_DYNAMIC_SERVICE_DIRECTIVE("ORBInitializer_Registry",
- "TAO_PI",
-+ "libTAO_PI-1.6.1.so",
++ "libTAO_PI-1.6.2.so",
"_make_ORBInitializer_Registry",
""));
orbinitializer_registry_ =
@@ -126,7 +126,7 @@
ACE_Service_Config::process_directive (
ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory",
- "TAO_CodecFactory",
-+ "libTAO_CodecFactory-1.6.1.so",
++ "libTAO_CodecFactory-1.6.2.so",
"_make_TAO_CodecFactory_Loader",
""));
loader =
@@ -137,7 +137,7 @@
ACE_Service_Config::process_directive (
ACE_DYNAMIC_SERVICE_DIRECTIVE(
- "ImR_Client_Adapter", "TAO_ImR_Client",
-+ "ImR_Client_Adapter", "libTAO_ImR_Client-1.6.1.so",
++ "ImR_Client_Adapter", "libTAO_ImR_Client-1.6.2.so",
"_make_ImR_Client_Adapter_Impl", ""));
adapter =
@@ -148,7 +148,7 @@
ACE_DYNAMIC_SERVICE_DIRECTIVE (
"TAO_Codeset",
- "TAO_Codeset",
-+ "libTAO_Codeset-1.6.1.so",
++ "libTAO_Codeset-1.6.2.so",
"_make_TAO_Codeset_Manager_Factory",
""));
@@ -159,7 +159,7 @@
ACE_DYNAMIC_SERVICE_DIRECTIVE(
"TAO_RT_Object_Adapter_Factory",
- "TAO_RTPortableServer",
-+ "libTAO_RTPortableServer-1.6.1.so",
++ "libTAO_RTPortableServer-1.6.2.so",
"_make_TAO_RT_Object_Adapter_Factory",
"");
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2007-11-22 07:02:45 UTC (rev 546)
+++ trunk/debian/rules 2007-12-15 20:56:10 UTC (rev 547)
@@ -267,15 +267,10 @@
echo "#define ACE_HAS_SENDFILE" >> $(CONFIG)
- echo "#define ACE_HAS_WCSNLEN" >> $(CONFIG)
echo "#define ACE_LACKS_WCSICMP" >> $(CONFIG)
echo "#define ACE_POSIX_SIG_PROACTOR" >> $(CONFIG)
-ifneq (,$(findstring $(DEB_HOST_ARCH),i386 amd64))
- echo "#define ACE_HAS_INTEL_ASSEMBLY" >> $(CONFIG)
-endif
-
# TODO: ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO?
touch $@
More information about the Pkg-ace-commits
mailing list