[Pkg-corba-commits] r306 - in /trunk/omniorb/debian: changelog control patches/buildsys patches/revert_abi_breakage patches/series

[flub-guest at users.alioth.debian.org]

Author: flub-guest
Date: Mon Mar 31 00:03:44 2014
New Revision: 306

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=306
Log:
Initial refresh

* Refresh patches
* Remove obsolte DM-Upload-Allowed control field
* Mention bug fixes

This builds, but needs a lot more work.

Modified:
    trunk/omniorb/debian/changelog
    trunk/omniorb/debian/control
    trunk/omniorb/debian/patches/buildsys
    trunk/omniorb/debian/patches/revert_abi_breakage
    trunk/omniorb/debian/patches/series

Modified: trunk/omniorb/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/changelog?rev=306&op=diff
==============================================================================
--- trunk/omniorb/debian/changelog	(original)
+++ trunk/omniorb/debian/changelog	Mon Mar 31 00:03:44 2014
@@ -1,8 +1,9 @@
 omniorb-dfsg (4.1.7-1) UNRELEASED; urgency=medium
 
-  * New upstream release
+  * New upstream release (Closes: #737948)
   * Update debian/watch and debian/README.source for .bz2 filenames.
   * Update svn-bp:origUrl for new version.
+  * Remove obsolte DM-Upload-Allowed fielf from debian/control.
 
  -- Floris Bruynooghe <flub at laurie.devork.be>  Mon, 31 Mar 2014 00:12:49 +0100
 

Modified: trunk/omniorb/debian/control
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/control?rev=306&op=diff
==============================================================================
--- trunk/omniorb/debian/control	(original)
+++ trunk/omniorb/debian/control	Mon Mar 31 00:03:44 2014
@@ -3,7 +3,6 @@
 Priority: optional
 Maintainer: Debian CORBA Team <pkg-corba-devel at lists.alioth.debian.org>
 Uploaders: Floris Bruynooghe <flub at devork.be>, Thomas Girard <thomas.g.girard at free.fr>
-DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 6.0.0), python-dev (>= 2.6.6-3~), libssl-dev, autotools-dev, pkg-config
 Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-corba/trunk/omniorb

Modified: trunk/omniorb/debian/patches/buildsys
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/buildsys?rev=306&op=diff
==============================================================================
--- trunk/omniorb/debian/patches/buildsys	(original)
+++ trunk/omniorb/debian/patches/buildsys	Mon Mar 31 00:03:44 2014
@@ -8,7 +8,7 @@
 
 --- a/mk/beforeauto.mk.in
 +++ b/mk/beforeauto.mk.in
-@@ -675,17 +675,16 @@
+@@ -681,17 +681,16 @@
  CC              = @CC@
  CXX             = @CXX@
  RANLIB		= @RANLIB@
@@ -29,7 +29,7 @@
  
  
  #
-@@ -746,8 +745,6 @@
+@@ -756,8 +755,6 @@
  #
  
  ifdef Compiler_GCC

Modified: trunk/omniorb/debian/patches/revert_abi_breakage
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/revert_abi_breakage?rev=306&op=diff
==============================================================================
--- trunk/omniorb/debian/patches/revert_abi_breakage	(original)
+++ trunk/omniorb/debian/patches/revert_abi_breakage	Mon Mar 31 00:03:44 2014
@@ -10,7 +10,7 @@
 
 --- a/include/omniORB4/sslContext.h
 +++ b/include/omniORB4/sslContext.h
-@@ -160,7 +160,6 @@
+@@ -169,7 +169,6 @@
    const char* 	    pd_password;
    SSL_CTX*    	    pd_ctx;
    omni_tracedmutex* pd_locks;
@@ -20,7 +20,7 @@
  #undef _core_attr
 --- a/src/lib/omniORB/orbcore/ssl/sslContext.cc
 +++ b/src/lib/omniORB/orbcore/ssl/sslContext.cc
-@@ -122,19 +122,42 @@
+@@ -124,19 +124,42 @@
  
  sslContext* sslContext::singleton = 0;
  
@@ -65,7 +65,7 @@
  }
  
  /////////////////////////////////////////////////////////////////////////
-@@ -144,7 +167,7 @@
+@@ -146,7 +169,7 @@
    if (pd_ctx) return;
  
    // Assume we own the ssl if no locking callback yet.
@@ -74,7 +74,7 @@
  
    if (pd_ssl_owner) {
      SSL_library_init();
-@@ -189,7 +212,7 @@
+@@ -194,7 +217,7 @@
    if (pd_ctx) {
      SSL_CTX_free(pd_ctx);
    }

Modified: trunk/omniorb/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/series?rev=306&op=diff
==============================================================================
--- trunk/omniorb/debian/patches/series	(original)
+++ trunk/omniorb/debian/patches/series	Mon Mar 31 00:03:44 2014
@@ -2,9 +2,8 @@
 revert_abi_breakage
 buildsys
 cos_stubs
-#useless_linking
 private_pythondir
 spurious_hashbang
 set_ipv6_v6only_to_0
 catior_manpage
-hurd
+#hurd