[Pkg-corba-commits] r213 - in /trunk/omniorb: ./ debian/ debian/patches/ debian/source/ include/ mk/ src/
flub-guest at users.alioth.debian.org
flub-guest at users.alioth.debian.org
Mon Jul 26 21:15:22 UTC 2010
Author: flub-guest
Date: Mon Jul 26 21:14:56 2010
New Revision: 213
URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=213
Log:
Convert to use source format 3.0 (quilt)
This results in much easier to maintain differences then
svn-buildpackage's default mergeWithUpstream behaviour.
Added:
trunk/omniorb/debian/patches/
trunk/omniorb/debian/patches/buildsys
trunk/omniorb/debian/patches/configfile
trunk/omniorb/debian/patches/cos_stubs
trunk/omniorb/debian/patches/revert_abi_breakage
trunk/omniorb/debian/patches/series
trunk/omniorb/debian/source/
trunk/omniorb/debian/source/format
Removed:
trunk/omniorb/include/
trunk/omniorb/mk/
trunk/omniorb/sample.cfg
trunk/omniorb/src/
Modified:
trunk/omniorb/debian/ (props changed)
trunk/omniorb/debian/changelog
trunk/omniorb/debian/omniorb-doc.docs
Propchange: trunk/omniorb/debian/
------------------------------------------------------------------------------
--- svn-bp:origUrl (original)
+++ svn-bp:origUrl Mon Jul 26 21:14:56 2010
@@ -1,1 +1,1 @@
-http://pkg-corba.alioth.debian.org/tarballs/omniorb-dfsg_4.1.3.orig.tar.gz
+http://pkg-corba.alioth.debian.org/tarballs/omniorb-dfsg_4.1.4.orig.tar.gz
Modified: trunk/omniorb/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/changelog?rev=213&op=diff
==============================================================================
--- trunk/omniorb/debian/changelog (original)
+++ trunk/omniorb/debian/changelog Mon Jul 26 21:14:56 2010
@@ -1,3 +1,11 @@
+omniorb-dfsg (4.1.4-1) UNRELEASED; urgency=low
+
+ * New upstream version (closes: #570422).
+ * Switch to dpkg-source 3.0 (quilt) format.
+ * No longer include postscript docs, it is no longer shipped by upstream.
+
+ -- Floris Bruynooghe <floris.bruynooghe at gmail.com> Wed, 14 Jul 2010 23:14:47 +0100
+
omniorb-dfsg (4.1.3-1) unstable; urgency=low
[ Floris Bruynooghe ]
Modified: trunk/omniorb/debian/omniorb-doc.docs
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/omniorb-doc.docs?rev=213&op=diff
==============================================================================
--- trunk/omniorb/debian/omniorb-doc.docs (original)
+++ trunk/omniorb/debian/omniorb-doc.docs Mon Jul 26 21:14:56 2010
@@ -1,4 +1,3 @@
doc/*.html
doc/omniORB/
doc/omniORB.pdf
-doc/omniORB.ps
Added: trunk/omniorb/debian/patches/buildsys
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/buildsys?rev=213&op=file
==============================================================================
--- trunk/omniorb/debian/patches/buildsys (added)
+++ trunk/omniorb/debian/patches/buildsys Mon Jul 26 21:14:56 2010
@@ -1,0 +1,43 @@
+--- a/mk/beforeauto.mk.in
++++ b/mk/beforeauto.mk.in
+@@ -675,17 +675,16 @@
+ CC = @CC@
+ CXX = @CXX@
+ RANLIB = @RANLIB@
+-MKDIRHIER = $(BASE_OMNI_TREE)/bin/scripts/omkdirhier
++MKDIRHIER = mkdir -p
+ INSTLIBFLAGS = -m 0644
+ INSTEXEFLAGS = -m 0755
+ CP = cp
+ MV = mv -f
+ CPP = @CPP@
+-OMKDEPEND = $(TOOLBINDIR)/omkdepend
+ RMDIRHIER = $(RM) -rf
+
+-CXXMAKEDEPEND = $(OMKDEPEND) -D__cplusplus
+-CMAKEDEPEND = $(OMKDEPEND)
++CXXMAKEDEPEND = @CXX@ -M -MD -MG
++CMAKEDEPEND = @CC@ -M -MD -MG
+
+
+ #
+@@ -737,8 +736,6 @@
+ #
+
+ ifdef Compiler_GCC
+-CMAKEDEPEND += -D__GNUC__
+-CXXMAKEDEPEND += -D__GNUG__ -D__GNUC__
+ CXXOPTIONS = -Wall -Wno-unused -fexceptions @EXTRA_GCC_CXXFLAGS@
+ EgcsMajorVersion = 1
+ EgcsMinorVersion = 1
+--- a/src/tool/dir.mk
++++ b/src/tool/dir.mk
+@@ -7,7 +7,7 @@
+ endif
+
+ ifdef UnixPlatform
+-SUBDIRS = omkdepend omniidl
++SUBDIRS = omniidl
+ endif
+
+ ifdef Win32Platform
Added: trunk/omniorb/debian/patches/configfile
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/configfile?rev=213&op=file
==============================================================================
--- trunk/omniorb/debian/patches/configfile (added)
+++ trunk/omniorb/debian/patches/configfile Mon Jul 26 21:14:56 2010
@@ -1,0 +1,11 @@
+--- a/sample.cfg
++++ b/sample.cfg
+@@ -367,7 +367,7 @@
+ # A call to resolve_initial_references("MyService") will return the object
+ # reference denoted by `corbaloc::myhost.example.com/MyService'.
+ #
+-# The default is empty.
++DefaultInitRef = corbaloc::
+
+
+ ############################################################################
Added: trunk/omniorb/debian/patches/cos_stubs
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/cos_stubs?rev=213&op=file
==============================================================================
--- trunk/omniorb/debian/patches/cos_stubs (added)
+++ trunk/omniorb/debian/patches/cos_stubs Mon Jul 26 21:14:56 2010
@@ -1,0 +1,14 @@
+--- a/src/services/mklib/libdefs.mk
++++ b/src/services/mklib/libdefs.mk
+@@ -1,9 +1,9 @@
+ # Edit COS_INTERFACES to select which COS idl to build into the stub library.
+ #
+ # All the interfaces:
+-#COS_INTERFACES = $(COS_ALL_INT)
++COS_INTERFACES = $(COS_ALL_INT)
+ # Or just the Notification interfaces:
+-COS_INTERFACES = $(TIMEBASE_INT) $(COS_EVT_INT) $(COS_NFY_INT) $(COS_LCB_INT)
++#COS_INTERFACES = $(TIMEBASE_INT) $(COS_EVT_INT) $(COS_NFY_INT) $(COS_LCB_INT)
+ # Or pick your own subset
+ # COS_INTERFACES = <pick you own subset from cosinterfaces.mk>
+
Added: trunk/omniorb/debian/patches/revert_abi_breakage
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/revert_abi_breakage?rev=213&op=file
==============================================================================
--- trunk/omniorb/debian/patches/revert_abi_breakage (added)
+++ trunk/omniorb/debian/patches/revert_abi_breakage Mon Jul 26 21:14:56 2010
@@ -1,0 +1,75 @@
+--- a/include/omniORB4/sslContext.h
++++ b/include/omniORB4/sslContext.h
+@@ -163,7 +163,6 @@
+ const char* pd_password;
+ SSL_CTX* pd_ctx;
+ omni_tracedmutex* pd_locks;
+- CORBA::Boolean pd_ssl_owner;
+ };
+
+ #undef _core_attr
+--- a/src/lib/omniORB/orbcore/ssl/sslContext.cc
++++ b/src/lib/omniORB/orbcore/ssl/sslContext.cc
+@@ -125,19 +125,42 @@
+
+ sslContext* sslContext::singleton = 0;
+
++static sslContext* ssl_owner = 0;
++
++static bool become_ssl_owner(sslContext* context) {
++ bool become_owner = false;
++
++ if (ssl_owner == 0 && CRYPTO_get_locking_callback() == 0) {
++ ssl_owner = context;
++ become_owner = true;
++ }
++
++ return become_owner;
++}
++
++static bool was_ssl_owner(sslContext* context) {
++ bool was_owner = false;
++
++ if (ssl_owner != 0 && ssl_owner == context) {
++ was_owner = true;
++ ssl_owner = 0;
++ }
++
++ return was_owner;
++}
+
+ /////////////////////////////////////////////////////////////////////////
+ sslContext::sslContext(const char* cafile,
+ const char* keyfile,
+ const char* password) :
+ pd_cafile(cafile), pd_keyfile(keyfile), pd_password(password), pd_ctx(0),
+- pd_locks(0), pd_ssl_owner(0) {}
++ pd_locks(0) {}
+
+
+ /////////////////////////////////////////////////////////////////////////
+ sslContext::sslContext() :
+ pd_cafile(0), pd_keyfile(0), pd_password(0), pd_ctx(0),
+- pd_locks(0), pd_ssl_owner(0) {
++ pd_locks(0) {
+ }
+
+ /////////////////////////////////////////////////////////////////////////
+@@ -147,7 +170,7 @@
+ if (pd_ctx) return;
+
+ // Assume we own the ssl if no locking callback yet.
+- pd_ssl_owner = CRYPTO_get_locking_callback() == 0;
++ bool pd_ssl_owner = become_ssl_owner(this);
+
+ if (pd_ssl_owner) {
+ SSL_library_init();
+@@ -192,7 +215,7 @@
+ if (pd_ctx) {
+ SSL_CTX_free(pd_ctx);
+ }
+- if (pd_ssl_owner)
++ if (was_ssl_owner(this))
+ thread_cleanup();
+ }
+
Added: trunk/omniorb/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/series?rev=213&op=file
==============================================================================
--- trunk/omniorb/debian/patches/series (added)
+++ trunk/omniorb/debian/patches/series Mon Jul 26 21:14:56 2010
@@ -1,0 +1,4 @@
+configfile
+revert_abi_breakage
+buildsys
+cos_stubs
Added: trunk/omniorb/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/source/format?rev=213&op=file
==============================================================================
--- trunk/omniorb/debian/source/format (added)
+++ trunk/omniorb/debian/source/format Mon Jul 26 21:14:56 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the Pkg-corba-commits
mailing list