[Pkg-corba-commits] r231 - in /trunk/omniorb/debian: ./ changelog control omniidl.install patches/buildsys patches/configfile patches/revert_abi_breakage patches/series rules

flub-guest at users.alioth.debian.org flub-guest at users.alioth.debian.org
Mon Mar 14 23:40:18 UTC 2011 

Author: flub-guest
Date: Mon Mar 14 23:40:12 2011
New Revision: 231

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=231
Log:
Upgrade to upstream's 4.1.5 release

This also disables the useless_linking patch for now as that breaks
things for this release.  A fix for this patch should follow.

Modified:
    trunk/omniorb/debian/   (props changed)
    trunk/omniorb/debian/changelog
    trunk/omniorb/debian/control
    trunk/omniorb/debian/omniidl.install
    trunk/omniorb/debian/patches/buildsys
    trunk/omniorb/debian/patches/configfile
    trunk/omniorb/debian/patches/revert_abi_breakage
    trunk/omniorb/debian/patches/series
    trunk/omniorb/debian/rules

Propchange: trunk/omniorb/debian/
------------------------------------------------------------------------------
--- svn-bp:origUrl (original)
+++ svn-bp:origUrl Mon Mar 14 23:40:12 2011
@@ -1,1 +1,1 @@
-http://pkg-corba.alioth.debian.org/tarballs/omniorb-dfsg_4.1.4.orig.tar.gz
+http://pkg-corba.alioth.debian.org/tarballs/omniorb-dfsg_4.1.5.orig.tar.gz

Modified: trunk/omniorb/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/changelog?rev=231&op=diff
==============================================================================
--- trunk/omniorb/debian/changelog (original)
+++ trunk/omniorb/debian/changelog Mon Mar 14 23:40:12 2011
@@ -1,21 +1,17 @@
-omniorb-dfsg (4.1.4-1) UNRELEASED; urgency=low
-
-  * New upstream version (closes: #570422).
+omniorb-dfsg (4.1.5-1) UNRELEASED; urgency=low
+
+  * New upstream version (closes: #570422, #585260, #558942).
   * Switch to dpkg-source 3.0 (quilt) format.
   * No longer include postscript docs, it is no longer shipped by upstream.
   * Bump Standards-Version to 3.9.1, no changes needed.
-  * Add the word "dummy" to the package description of transitional
-    packages to silence lintian.
+  * Drop transitional packages, there has been a release now.
   * Add $remote_fs to Required-{Start|Stop} in nameserver initscript.
-  * Change string exceptions into AssertionError (closes: #585260).
-  * debian/patches/missing_cos_linking: link COS libs against all
-    used omniorb libs to make GOLD linker happy (closes: #558942).
   * debian/omniorb-doc.doc-base: add PDF documentation.
-  * Add fix for a bad commit which removed an else clause.
   * Fix useless linking of shared libs with the utils reported
-    by dpkg-shlibs (Matej Kenda).
-
- -- Floris Bruynooghe <floris.bruynooghe at gmail.com>  Wed, 14 Jul 2010 23:14:47 +0100
+    by dpkg-shlibs (thanks Matej Kenda).
+  * Use bzip2 instead of gzip for .orig tarball.
+
+ -- Floris Bruynooghe <floris.bruynooghe at gmail.com>  Wed, 16 Feb 2011 22:47:36 +0000
 
 omniorb-dfsg (4.1.3-1) unstable; urgency=low
 

Modified: trunk/omniorb/debian/control
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/control?rev=231&op=diff
==============================================================================
--- trunk/omniorb/debian/control (original)
+++ trunk/omniorb/debian/control Mon Mar 14 23:40:12 2011
@@ -22,14 +22,6 @@
  protocol and should be interoperable with any other
  CORBA 2.6 compliant ORB.
 
-Package: omniorb4
-Architecture: all
-Depends: omniorb (>= 4.1.3-1), ${misc:Depends}
-Description: Transitional package for omniORB
- This dummy package depends on omniorb to handle the transition.
- .
- It can be safely removed after installation.
-
 Package: omniorb-idl
 Architecture: all
 Depends: ${misc:Depends}
@@ -44,14 +36,6 @@
  .
  This includes the idl files.
 
-Package: omniorb4-idl
-Architecture: all
-Depends: omniorb-idl (>= 4.1.3-1), ${misc:Depends}
-Description: Transitional package for the omniORB IDL files
- This dummy package depends on omniorb-idl to handle the transition.
- .
- It can be safely removed after installation.
-
 Package: omniorb-nameserver
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -65,14 +49,6 @@
  CORBA 2.6 compliant ORB.
  .
  This includes the CORBA nameserver.
-
-Package: omniorb4-nameserver
-Architecture: all
-Depends: omniorb-nameserver (>= 4.1.3-1), ${misc:Depends}
-Description: Transitional package for the omniORB naming service
- This dummy package depends on omniorb-nameserver to handle the transition.
- .
- It can be safely removed after installation.
 
 Package: omniorb-doc
 Architecture: all
@@ -89,15 +65,6 @@
  .
  This includes the documentation.
 
-Package: omniorb4-doc
-Architecture: all
-Section: doc
-Depends: omniorb-doc (>= 4.1.3-1), ${misc:Depends}
-Description: Transitional package for the omniORB documenation
- This dummy package depends on omniorb-doc to handle the transition.
- .
- It can be safely removed after installation.
-
 Package: libcos4-1
 Architecture: any
 Section: libs
@@ -236,11 +203,3 @@
  CORBA 2.6 compliant ORB.
  .
  This includes the idl compiler.
-
-Package: omniidl4
-Architecture: all
-Depends: omniidl (>= 4.1.3-1), ${misc:Depends}
-Description: Transition package for the omniORB IDL to C++ and Python compiler
- This dummy package depdends on omniidl to handle the transition.
- .
- It can be safely removed after installation.

Modified: trunk/omniorb/debian/omniidl.install
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/omniidl.install?rev=231&op=diff
==============================================================================
--- trunk/omniorb/debian/omniidl.install (original)
+++ trunk/omniorb/debian/omniidl.install Mon Mar 14 23:40:12 2011
@@ -1,3 +1,3 @@
 usr/bin/omnicpp
 usr/bin/omniidl
-usr/lib/python*.*/site-packages/
+usr/lib/python*.*/

Modified: trunk/omniorb/debian/patches/buildsys
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/buildsys?rev=231&op=diff
==============================================================================
--- trunk/omniorb/debian/patches/buildsys (original)
+++ trunk/omniorb/debian/patches/buildsys Mon Mar 14 23:40:12 2011
@@ -29,7 +29,7 @@
  
  
  #
-@@ -737,8 +736,6 @@
+@@ -746,8 +745,6 @@
  #
  
  ifdef Compiler_GCC

Modified: trunk/omniorb/debian/patches/configfile
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/configfile?rev=231&op=diff
==============================================================================
--- trunk/omniorb/debian/patches/configfile (original)
+++ trunk/omniorb/debian/patches/configfile Mon Mar 14 23:40:12 2011
@@ -7,7 +7,7 @@
 
 --- a/sample.cfg
 +++ b/sample.cfg
-@@ -367,7 +367,7 @@
+@@ -374,7 +374,7 @@
  #   A call to resolve_initial_references("MyService") will return the object
  #   reference denoted by `corbaloc::myhost.example.com/MyService'.
  #

Modified: trunk/omniorb/debian/patches/revert_abi_breakage
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/revert_abi_breakage?rev=231&op=diff
==============================================================================
--- trunk/omniorb/debian/patches/revert_abi_breakage (original)
+++ trunk/omniorb/debian/patches/revert_abi_breakage Mon Mar 14 23:40:12 2011
@@ -10,7 +10,7 @@
 
 --- a/include/omniORB4/sslContext.h
 +++ b/include/omniORB4/sslContext.h
-@@ -163,7 +163,6 @@
+@@ -160,7 +160,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
-@@ -125,19 +125,42 @@
+@@ -122,19 +122,42 @@
  
  sslContext* sslContext::singleton = 0;
  
@@ -65,7 +65,7 @@
  }
  
  /////////////////////////////////////////////////////////////////////////
-@@ -147,7 +170,7 @@
+@@ -144,7 +167,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();
-@@ -192,7 +215,7 @@
+@@ -189,7 +212,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=231&op=diff
==============================================================================
--- trunk/omniorb/debian/patches/series (original)
+++ trunk/omniorb/debian/patches/series Mon Mar 14 23:40:12 2011
@@ -2,7 +2,4 @@
 revert_abi_breakage
 buildsys
 cos_stubs
-string_exceptions
-missing_cos_linking
-klotz
-useless_linking
+#useless_linking

Modified: trunk/omniorb/debian/rules
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/rules?rev=231&op=diff
==============================================================================
--- trunk/omniorb/debian/rules (original)
+++ trunk/omniorb/debian/rules Mon Mar 14 23:40:12 2011
@@ -60,7 +60,7 @@
 	$(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp
 	-find debian/tmp -name "*.pyc" -exec rm {} \;
 	dh_install --sourcedir=debian/tmp --list-missing
-	sed -i '1d' debian/omniidl/usr/lib/python2.*/site-packages/omniidl/main.py
+	sed -i '1d' debian/omniidl/usr/lib/python2.*/*-packages/omniidl/main.py
 
 # Build architecture-independent files here.
 binary-indep: build install

More information about the Pkg-corba-commits mailing list