tags 493468 + patch
tags 493468 + pending
thanks
Dear maintainer,
I've prepared an NMU for orbit2 (versioned as 1:2.14.19-0.3) and
uploaded it to DELAYED/3. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru orbit2-2.14.19/debian/changelog orbit2-2.14.19/debian/changelog
--- orbit2-2.14.19/debian/changelog 2013-11-17 19:29:29.000000000 +0100
+++ orbit2-2.14.19/debian/changelog 2013-11-17 19:07:27.000000000 +0100
@@ -1,3 +1,23 @@
+orbit2 (1:2.14.19-0.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Move orbit-idl-2 to orbit2, update dependencies accordingly.
+ * orbit2-config-multiarch.patch: new patch. Remove useless lines from
+ orbit2-config that break the MA-same expectation.
+ * All of this allows us to make liborbit2-dev Multi-Arch: same.
+ * Drop useless Everything_module.a.
+ * Move libORBit-2 and libORBitCosNaming-2 to a new liborbit-2-0
+ package. This will avoid pulling libidl0 and its cpp dependency on
+ machines that need liborbit.
+ * Bump standards version.
+ * Convert to 3.0 quilt format.
+ * Remove m68k patch, we don’t ship this architecture anymore.
+ * Update package descriptions. Closes: #493468.
+ * Correctly cleanup built documentation.
+ * Rename the lintian override file to the correct name.
+
+ -- Josselin Mouette <j...@debian.org> Sun, 17 Nov 2013 18:49:42 +0100
+
orbit2 (1:2.14.19-0.2) unstable; urgency=low
[Balint Reczey]
diff -Nru orbit2-2.14.19/debian/control orbit2-2.14.19/debian/control
--- orbit2-2.14.19/debian/control 2013-11-17 19:29:29.000000000 +0100
+++ orbit2-2.14.19/debian/control 2013-11-17 19:18:41.000000000 +0100
@@ -2,42 +2,63 @@
Section: net
Priority: optional
Maintainer: Sebastian Rittau <srit...@debian.org>
-Standards-Version: 3.8.3
+Standards-Version: 3.9.5
Build-Depends: libglib2.0-dev (>= 2.8.0), libidl-dev (>= 0.8.10), pkg-config (>= 0.20), cdbs (>= 0.4.93), debhelper (>= 8.1.3), docbook-xsl, gtk-doc-tools (>= 1.6-2), autotools-dev, dh-autoreconf
-Package: liborbit2
+Package: liborbit-2-0
Architecture: any
Multi-Arch: same
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: liborbit2 (<< 1:2.14.19-0.3)
+Replaces: liborbit2 (<< 1:2.14.19-0.3)
+Description: high-performance CORBA implementation - common libraries
+ CORBA (Common Object Request Broker Architecture) is an architecture
+ that enables program objects to communicate, sending requests and
+ receiving replies, between different applications, regardless of their
+ programming language, operating system or network location.
+ .
+ This package contains the run-time libraries needed by applications
+ that communicate with each other using the ORBit2 implementation of
+ CORBA.
+
+Package: liborbit2
+Architecture: any
+Multi-Arch: same
+Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ liborbit-2-0 (= ${binary:Version})
Replaces: liborbit2-dev (<< 2.8.1-1)
Conflicts: liborbit2-dev (<< 2.8.1-1), liblinc1 (<< 1.0.3-4), libbonobo-activation4 (<< 1:2.4.0)
-Description: libraries for ORBit2 - a CORBA ORB
- ORBit2 is a high-performance CORBA (Common Object Request Broker
- Architecture) ORB (Object Request Broker). It allows programs to send
- requests and receive replies from other programs, regardless of the
- locations of the two programs. CORBA is an architecture that enables
- communication between program objects, regardless of the programming
- language they're written in or the operating system they run on.
+Description: high-performance CORBA implementation - extra libraries
+ CORBA (Common Object Request Broker Architecture) is an architecture
+ that enables program objects to communicate, sending requests and
+ receiving replies, between different applications, regardless of their
+ programming language, operating system or network location.
.
- This package contains the run-time libraries used by ORBit2-based
- applications.
+ This package contains extra run-time libraries needed by some
+ applications that communicate with each other using the ORBit2
+ implementation of CORBA.
Package: orbit2
Architecture: any
Section: devel
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: liborbit2-dev (<< 1:2.14.19-0.3)
+Breaks: liborbit2-dev (<< 1:2.14.19-0.3)
Multi-Arch: foreign
-Description: a CORBA ORB
- ORBit2 is a high-performance CORBA (Common Object Request Broker
- Architecture) ORB (Object Request Broker). It allows programs to send
- requests and receive replies from other programs, regardless of the
- locations of the two programs. CORBA is an architecture that enables
- communication between program objects, regardless of the programming
- language they're written in or the operating system they run on.
+Description: high-performance CORBA implementation - Object Request Broker
+ CORBA (Common Object Request Broker Architecture) is an architecture
+ that enables program objects to communicate, sending requests and
+ receiving replies, between different applications, regardless of their
+ programming language, operating system or network location.
.
- This package contains the command-line utilities ior-decode-2 and
+ This package contains support programs for the ORBit2 implementation of
+ CORBA: the IDL compiler needed to import objects definitions into your
+ C programs, and the command-line utilities ior-decode-2 and
typelib-dump.
Package: orbit2-nameserver
@@ -45,30 +66,33 @@
Section: devel
Depends: ${shlibs:Depends}, ${misc:Depends}
Multi-Arch: foreign
-Description: a CORBA name server
- ORBit2 is a high-performance CORBA (Common Object Request Broker
- Architecture) ORB (Object Request Broker). It allows programs to send
- requests and receive replies from other programs, regardless of the
- locations of the two programs. CORBA is an architecture that enables
- communication between program objects, regardless of the programming
- language they're written in or the operating system they run on.
+Description: high-performance CORBA implementation - name server
+ CORBA (Common Object Request Broker Architecture) is an architecture
+ that enables program objects to communicate, sending requests and
+ receiving replies, between different applications, regardless of their
+ programming language, operating system or network location.
.
- This package includes the CORBA nameserver and a utility client program.
+ This package contains the CORBA nameserver provided by the ORBit2
+ implementation of CORBA, and a utility client program.
Package: liborbit2-dev
Architecture: any
+Multi-Arch: foreign
Section: libdevel
-Depends: liborbit2 (= ${binary:Version}), libidl-dev (>= 0.8.6-1), libglib2.0-dev, pkg-config, ${shlibs:Depends}, ${misc:Depends}
-Recommends: orbit2
+Depends: liborbit2 (= ${binary:Version}),
+ libidl-dev (>= 0.8.6-1),
+ libglib2.0-dev,
+ pkg-config,
+ orbit2 (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
Conflicts: liblinc-dev
-Description: development files for ORBit2 - a CORBA ORB
- ORBit2 is a high-performance CORBA (Common Object Request Broker
- Architecture) ORB (Object Request Broker). It allows programs to send
- requests and receive replies from other programs, regardless of the
- locations of the two programs. CORBA is an architecture that enables
- communication between program objects, regardless of the programming
- language they're written in or the operating system they run on.
+Description: high-performance CORBA implementation - development
+ CORBA (Common Object Request Broker Architecture) is an architecture
+ that enables program objects to communicate, sending requests and
+ receiving replies, between different applications, regardless of their
+ programming language, operating system or network location.
.
- This package contains the header files and static libraries used for
- developing ORBit2-based applications. It also contains the IDL compiler
- needed to import object definitions into your C programs.
+ This package contains the header files and static libraries used for
+ developing applications that communicate with each other using the
+ ORBit2 implementation of CORBA.
diff -Nru orbit2-2.14.19/debian/liborbit-2-0.docs orbit2-2.14.19/debian/liborbit-2-0.docs
--- orbit2-2.14.19/debian/liborbit-2-0.docs 1970-01-01 01:00:00.000000000 +0100
+++ orbit2-2.14.19/debian/liborbit-2-0.docs 2013-11-15 15:44:52.000000000 +0100
@@ -0,0 +1 @@
+README NEWS AUTHORS
diff -Nru orbit2-2.14.19/debian/liborbit-2-0.install orbit2-2.14.19/debian/liborbit-2-0.install
--- orbit2-2.14.19/debian/liborbit-2-0.install 1970-01-01 01:00:00.000000000 +0100
+++ orbit2-2.14.19/debian/liborbit-2-0.install 2013-11-15 17:08:07.000000000 +0100
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/*/libORBitCosNaming-2.so.*
+debian/tmp/usr/lib/*/libORBit-2.so.*
+debian/tmp/usr/lib/*/orbit-2.0/Everything_module.so
diff -Nru orbit2-2.14.19/debian/liborbit2-dev.install orbit2-2.14.19/debian/liborbit2-dev.install
--- orbit2-2.14.19/debian/liborbit2-dev.install 2013-11-17 19:29:29.000000000 +0100
+++ orbit2-2.14.19/debian/liborbit2-dev.install 2013-11-15 17:06:21.000000000 +0100
@@ -4,7 +4,5 @@
debian/tmp/usr/share/doc/liborbit2-dev/ORBit2
debian/tmp/usr/lib/*/*.so
debian/tmp/usr/lib/*/*.a
-debian/tmp/usr/lib/*/orbit-2.0/Everything_module.a
debian/tmp/usr/lib/*/pkgconfig
debian/tmp/usr/bin/orbit2-config
-debian/tmp/usr/bin/orbit-idl-2
diff -Nru orbit2-2.14.19/debian/liborbit2-dev.manpages orbit2-2.14.19/debian/liborbit2-dev.manpages
--- orbit2-2.14.19/debian/liborbit2-dev.manpages 2013-11-17 19:29:29.000000000 +0100
+++ orbit2-2.14.19/debian/liborbit2-dev.manpages 2013-11-15 16:58:31.000000000 +0100
@@ -1,2 +1 @@
debian/orbit2-config.1
-debian/orbit-idl-2.1
diff -Nru orbit2-2.14.19/debian/liborbit2.docs orbit2-2.14.19/debian/liborbit2.docs
--- orbit2-2.14.19/debian/liborbit2.docs 2013-11-17 19:29:29.000000000 +0100
+++ orbit2-2.14.19/debian/liborbit2.docs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-README NEWS AUTHORS
diff -Nru orbit2-2.14.19/debian/liborbit2.install orbit2-2.14.19/debian/liborbit2.install
--- orbit2-2.14.19/debian/liborbit2.install 2013-11-17 19:29:29.000000000 +0100
+++ orbit2-2.14.19/debian/liborbit2.install 2013-11-15 17:07:39.000000000 +0100
@@ -1,2 +1 @@
-debian/tmp/usr/lib/*/lib*.so.*
-debian/tmp/usr/lib/*/orbit-2.0/Everything_module.so
+debian/tmp/usr/lib/*/libORBit-imodule-2.so.*
diff -Nru orbit2-2.14.19/debian/liborbit2.lintian-overrides orbit2-2.14.19/debian/liborbit2.lintian-overrides
--- orbit2-2.14.19/debian/liborbit2.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ orbit2-2.14.19/debian/liborbit2.lintian-overrides 2013-11-17 19:20:32.000000000 +0100
@@ -0,0 +1 @@
+liborbit2: package-name-doesnt-match-sonames libORBit-imodule-2-0
diff -Nru orbit2-2.14.19/debian/liborbit2.lintian.overrides orbit2-2.14.19/debian/liborbit2.lintian.overrides
--- orbit2-2.14.19/debian/liborbit2.lintian.overrides 2013-11-17 19:29:29.000000000 +0100
+++ orbit2-2.14.19/debian/liborbit2.lintian.overrides 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-liborbit2 binary: package-name-doesnt-match-sonames
diff -Nru orbit2-2.14.19/debian/orbit2.install orbit2-2.14.19/debian/orbit2.install
--- orbit2-2.14.19/debian/orbit2.install 2013-11-17 19:29:29.000000000 +0100
+++ orbit2-2.14.19/debian/orbit2.install 2013-11-15 16:47:45.000000000 +0100
@@ -1,3 +1,4 @@
debian/tmp/usr/bin/ior-decode-2
debian/tmp/usr/bin/linc-cleanup-sockets
debian/tmp/usr/bin/typelib-dump
+debian/tmp/usr/bin/orbit-idl-2
diff -Nru orbit2-2.14.19/debian/orbit2.manpages orbit2-2.14.19/debian/orbit2.manpages
--- orbit2-2.14.19/debian/orbit2.manpages 2013-11-17 19:29:29.000000000 +0100
+++ orbit2-2.14.19/debian/orbit2.manpages 2013-11-15 16:58:19.000000000 +0100
@@ -1,3 +1,4 @@
debian/ior-decode-2.1
debian/linc-cleanup-sockets.1
debian/typelib-dump.1
+debian/orbit-idl-2.1
diff -Nru orbit2-2.14.19/debian/patches/m68k/10-aligment-misc-fixes.patch orbit2-2.14.19/debian/patches/m68k/10-aligment-misc-fixes.patch
--- orbit2-2.14.19/debian/patches/m68k/10-aligment-misc-fixes.patch 2013-11-17 19:29:29.000000000 +0100
+++ orbit2-2.14.19/debian/patches/m68k/10-aligment-misc-fixes.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,61 +0,0 @@
-- The code treats GIOPMsgRequest_1_0 and GIOPMsgRequest_1_1 as equal,
- but they aren't on m68k, a simple fix is to add the padding to
- GIOPMsgRequest_1_0 as well. The more complex solution, would be to
- duplicate the code dealing with these two structures.
-- giop-recv-buffer.c expects a buffer to be aligned at 4 bytes, but
- giop_recv_buffer_use_encaps() doesn't check for this.
-- The assert in CORBA_ORB_init() triggers during startup, because the
- alignment is 2 and since only the lowest bit is used, this should be
- sufficient.
-
-
-diff -ur orbit2-2.14.0.org/include/orbit/GIOP/giop-types.h orbit2-2.14.0/include/orbit/GIOP/giop-types.h
---- orbit2-2.14.0.org/include/orbit/GIOP/giop-types.h 2003-10-27 17:14:12.000000000 +0100
-+++ orbit2-2.14.0/include/orbit/GIOP/giop-types.h 2006-10-01 02:17:46.000000000 +0200
-@@ -104,6 +104,7 @@
- IOP_ServiceContextList service_context;
- CORBA_unsigned_long request_id;
- CORBA_boolean response_expected;
-+ CORBA_char reserved[3];
- CORBA_sequence_CORBA_octet object_key;
- CORBA_char *operation;
- CORBA_Principal requesting_principal;
-diff -ur orbit2-2.14.0.org/src/orb/GIOP/giop-recv-buffer.c orbit2-2.14.0/src/orb/GIOP/giop-recv-buffer.c
---- orbit2-2.14.0.org/src/orb/GIOP/giop-recv-buffer.c 2006-03-08 13:03:54.000000000 +0100
-+++ orbit2-2.14.0/src/orb/GIOP/giop-recv-buffer.c 2006-09-30 14:35:14.000000000 +0200
-@@ -423,6 +423,14 @@
- giop_recv_buffer_use_encaps (guchar *mem, gulong len)
- {
- GIOPRecvBuffer *buf = giop_recv_buffer_use_buf (NULL);
-+ gboolean free_body = FALSE;
-+
-+ if (ALIGN_ADDRESS (mem, 4) != mem) {
-+ guchar *mem2 = g_malloc (len);
-+ memcpy (mem2, mem, len);
-+ mem = mem2;
-+ free_body = TRUE;
-+ }
-
- buf->cur = buf->message_body = mem;
- buf->end = buf->cur + len;
-@@ -431,7 +439,7 @@
- buf->giop_version = GIOP_LATEST;
- buf->left_to_read = 0;
- buf->state = GIOP_MSG_READY;
-- buf->free_body = FALSE;
-+ buf->free_body = free_body;
-
- return buf;
- }
-diff -ur orbit2-2.14.0.org/src/orb/orb-core/corba-orb.c orbit2-2.14.0/src/orb/orb-core/corba-orb.c
---- orbit2-2.14.0.org/src/orb/orb-core/corba-orb.c 2005-11-17 15:41:55.000000000 +0100
-+++ orbit2-2.14.0/src/orb/orb-core/corba-orb.c 2006-09-29 14:16:52.000000000 +0200
-@@ -392,7 +392,7 @@
- return ORBit_RootObject_duplicate (retval);
-
- /* the allocation code uses the bottom bit of any pointer */
-- g_assert (ORBIT_ALIGNOF_CORBA_DOUBLE > 2);
-+ g_assert (ORBIT_ALIGNOF_CORBA_DOUBLE >= 2);
-
- if (orb_identifier &&
- strstr (orb_identifier, "orbit-local-non-threaded-orb") != NULL)
diff -Nru orbit2-2.14.19/debian/patches/orbit2-config-multiarch.patch orbit2-2.14.19/debian/patches/orbit2-config-multiarch.patch
--- orbit2-2.14.19/debian/patches/orbit2-config-multiarch.patch 1970-01-01 01:00:00.000000000 +0100
+++ orbit2-2.14.19/debian/patches/orbit2-config-multiarch.patch 2013-11-15 16:49:41.000000000 +0100
@@ -0,0 +1,11 @@
+--- orbit2-2.14.19/orbit2-config.in.orig 2013-11-15 16:48:58.772020228 +0100
++++ orbit2-2.14.19/orbit2-config.in 2013-11-15 16:49:06.263732801 +0100
+@@ -3,8 +3,6 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ exec_prefix_set=no
+-includedir=@includedir@
+-libdir=@libdir@
+ [ -z "$PKG_CONFIG" ] && PKG_CONFIG="pkg-config"
+
+ usage()
diff -Nru orbit2-2.14.19/debian/patches/series orbit2-2.14.19/debian/patches/series
--- orbit2-2.14.19/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ orbit2-2.14.19/debian/patches/series 2013-11-15 17:19:19.000000000 +0100
@@ -0,0 +1,6 @@
+001-dont-use-atexit-handlers.patch
+100-compile-name-server.patch
+git_new_autotools_build.patch
+glib_no_deprecations.patch
+orbit2-config-multiarch.patch
+pre-multiarch-compatibility.patch
diff -Nru orbit2-2.14.19/debian/rules orbit2-2.14.19/debian/rules
--- orbit2-2.14.19/debian/rules 2013-11-17 19:29:29.000000000 +0100
+++ orbit2-2.14.19/debian/rules 2013-11-17 18:55:33.000000000 +0100
@@ -2,16 +2,12 @@
shlibver = (>= 1:2.14.10)
-ifeq ($(DEB_HOST_ARCH),m68k)
-DEB_PATCHDIRS = debian/patches debian/patches/$(DEB_HOST_ARCH)
-endif
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
DEB_DH_MAKESHLIBS_ARGS_liborbit2 := -V 'liborbit2 $(shlibver)'
+DEB_DH_MAKESHLIBS_ARGS_liborbit-2-0 := -V 'liborbit-2-0 $(shlibver)'
DEB_CONFIGURE_EXTRA_FLAGS := --enable-purify --enable-gtk-doc --with-html-dir=/usr/share/doc/liborbit2-dev --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
@@ -28,6 +24,7 @@
clean::
echo $(DEB_PATCHDIRS)
rm -f debian/name-client-2.1 debian/orbit-name-server-2.1
+ rm -f docs/api/html/*
install/liborbit2-dev::
rm `find debian/tmp -name '*.la'`
diff -Nru orbit2-2.14.19/debian/source/format orbit2-2.14.19/debian/source/format
--- orbit2-2.14.19/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ orbit2-2.14.19/debian/source/format 2013-11-15 17:18:26.000000000 +0100
@@ -0,0 +1 @@
+3.0 (quilt)
