--- orbit2-2.14.19.orig/debian/orbit-name-server-2.dbk +++ orbit2-2.14.19/debian/orbit-name-server-2.dbk @@ -0,0 +1,122 @@ + + + + + + + 2003 + W. Borgert + + 2003-12-12 + + + W. + Borgert + debacle@debian.org + + + + + 1 + 2003-12-12 + WB + initial version + + + + + + orbit-name-server-2 + + 1 + + + + orbit-name-server-2 + + CORBA Naming Server + + + + + orbit-name-server-2 + + + + + + + + + + + + + Description + + orbit-name-server-2 is an ORBit2 based + implementation of the OMG's COS Naming Service + Specification. + + When orbit-name-server-2 starts up + successfully it writes the stringified object reference for its + root context on standard output. + + + + Options + + orbit-name-server-2 accepts the following + options: + + + + + + Respond to corbaloc requests with this object key. + + + + + + + Show a help message. + + + + + + Display a brief usage message. + + + + + + + Files + + On startup, orbit-name-server-2 tries to + read the files /etc/orbitrc and + $HOME/.orbitrc. The format of these files is + not yet documented in Debian. + + + + See Also + + ORBit2 web pages: GNOME, SourceForge + + + + + Authors + + This manual was written by W. + Borgert + debacle@debian.org for Debian + GNU/Linux. + + --- orbit2-2.14.19.orig/debian/ior-decode-2.1 +++ orbit2-2.14.19/debian/ior-decode-2.1 @@ -0,0 +1,30 @@ +.\" created for ior-decode-2 by Chris Waters, for Debian GNU/Linux +.\" +.TH IOR-DECODE-2 1 "23 March 2002" "Version 0.5.15" + +.SH NAME +ior\-decode\-2 \- print human-readable info from IOR string + +.SH SYNOPSIS +.HP +.BI ior\-decode\-2 " IOR" + +.SH DESCRIPTION +An IOR string is a string of characters that defines an "InterOrb +Reference". These strings are used to locate and identify remote +objects. The \fBior\-decode\-2\fP program displays the information +encoded in the IOR string in a human\-readable format. This is +primarily useful for debugging. + +.SH OPTIONS +None. + +.SH SEE ALSO +http://www.omg.org, http://orbit-resource.sourceforge.net + +.SH AUTHOR +Copyright \(co 2001 Dick Porter and Elliot Lee + + +This manual was originally written for ior\-decode\-2 by Chris Waters + for Debian GNU/Linux. --- orbit2-2.14.19.orig/debian/liborbit2-dev.manpages +++ orbit2-2.14.19/debian/liborbit2-dev.manpages @@ -0,0 +1,2 @@ +debian/orbit2-config.1 +debian/orbit-idl-2.1 --- orbit2-2.14.19.orig/debian/orbit2-config.1 +++ orbit2-2.14.19/debian/orbit2-config.1 @@ -0,0 +1,80 @@ +.\" created for orbit2-config by Chris Waters, for Debian GNU/Linux +.\" +.TH ORBIT2-CONFIG 1 "18 December 2001" "Version 2.3.100" + +.SH NAME +orbit2\-config \- helper script for building with ORBit2 +.SH SYNOPSIS +.HP +.B orbit2\-config +.RB "[ " \-\-libs " ] [ " \-\-cflags " ]" +[ +.BI \-\-prefix =dir +] [ +.BI \-\-exec\-prefix =dir +] [ +.BI \-\-use\-service =service +] +.RB "[ " client " | " server " ]" +.HP +.B orbit2\-config +.RB "[ " \-\-version " ] [ " \-\-help " ]" + +.SH DESCRIPTION +.B orbit2-config +is a tool that is used to determine the compiler and linker flags that +should be used to compile and link programs that use the \fIorbit2\fP +library. It is also used internally by the .m4 macros for GNU autoconf +that are included with \fIorbit2\fP. + +The argument \fBclient\fP is used for compiling an orbit2 client, and +\fBserver\fP for compiling an orbit2 server. In most cases, you will +use one (or both) of the options \fB\-\-cflags\fP or \fB\-\-libs\fP +(depending on whether you are compiling or linking. + +.SH OPTIONS +.B orbit2-config +accepts the following options: +.TP +.B \-\-version +Print the currently installed version of \fIlibrary\fP on the standard output. +.TP +.B \-\-help +Print a usage summary. +.TP +.B \-\-cflags +Print the compiler flags that are necessary to compile a program using +the specified \fIlibrary\fP. +.TP +.B \-\-libs +Print the linker flags that are necessary to link with the specified +\fIlibrary\fP. +.TP +.BI \-\-prefix =PREFIX +If specified, use PREFIX instead of the installation prefix that \fIlibrary\fP +was built with when computing the output for the \-\-cflags and +\-\-libs options. This option is also used for the exec prefix +if \-\-exec\-prefix was not specified. This option must be specified +before any \-\-libs or \-\-cflags options. +.TP +.BI \-\-exec\-prefix =PREFIX +If specified, use PREFIX instead of the installation exec prefix that +\fIlibrary\fP was built with when computing the output for the \-\-cflags +and \-\-libs options. This option must be specified before any +\-\-libs or \-\-cflags options. +.TP +.BI \-\-use-service= SERVICE +If specified, provide additional flags (if any) for using the +specified service. Known values for SERVICE are: module CosNaming, +interfaces LNameComponent, LName. + +.SH SEE ALSO +orbit-idl-2(1), /usr/share/doc/liborbit2-dev, +http://orbit-resource.sourceforge.net, http://www.omg.org. + +.SH AUTHOR +Copyright \(co 2001, 2002 Dick Porter and Elliot Lee + + +This manual was originally written for orbit2-config by Chris Waters + for Debian GNU/Linux. --- orbit2-2.14.19.orig/debian/liborbit2-dev.install +++ orbit2-2.14.19/debian/liborbit2-dev.install @@ -0,0 +1,10 @@ +debian/tmp/usr/include/orbit-2.0 +debian/tmp/usr/share/aclocal/ORBit2.m4 +debian/tmp/usr/share/idl/orbit-2.0 +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 --- orbit2-2.14.19.orig/debian/copyright +++ orbit2-2.14.19/debian/copyright @@ -0,0 +1,50 @@ +This package was originally debianized by Chris Waters . +Current maintainer is Sebastian Rittau . + +It was downloaded from . + +Copyright (C) 1998, 1999, 2000, 2001 Richard H. Porter, Elliot Lee, + Michael Meeks, Mark McLoughlin, Red Hat, Inc., Ximian Inc. and others. +Copyright 2001 Ximian, Inc., Red Hat, Inc., Sun Microsystems, Inc., + Elliot Lee, Michael Meeks, Mark McLoughlin, and others + +The IDL compiler and utility programs are released under the terms of the +GNU General Public License: + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301, USA +The full license text can be found in the file /usr/share/common-licenses/GPL +on a Debian system. + +The Linc and ORBit libraries are released under the terms of the GNU Library +General Public License: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301, USA + +The full license text can be found in the file /usr/share/common-licenses/LGPL +on a Debian system. --- orbit2-2.14.19.orig/debian/changelog +++ orbit2-2.14.19/debian/changelog @@ -0,0 +1,630 @@ +orbit2 (1:2.14.19-0.1ubuntu2) raring; urgency=low + + * debian/patches/glib_no_deprecations.patch: turn off glib deprecations, + to fix the build with the current version + + -- Sebastien Bacher Tue, 02 Apr 2013 16:54:54 +0200 + +orbit2 (1:2.14.19-0.1ubuntu1) precise-proposed; urgency=low + + [ Riku Voipio ] + * Multiarchize. Closes: #641615. + + [ Steve Langasek ] + * Remove .la files from the package, as they're no longer needed. + * debian/patches/pre-multiarch-compatibility.patch: Support pre- + multiarch directory as a compatibility fallback. Closes: #641615, + LP: #977966. + + -- Steve Langasek Fri, 20 Apr 2012 23:34:47 +0000 + +orbit2 (1:2.14.19-0.1) unstable; urgency=low + + * Non-maintainer upload, for the GNOME 3 transition. + * New upstream release. + * Update watch file. + * Use dh-autoreconf: + - Drop debian/patches/700-autoreconf.patch. + - Add Build-Depends on dh-autoreconf. + - Add autoreconf.mk include. + * debian/rules: + - Don't include autotools.mk as we already include gnome.mk. + * debian/patches/001-dont-use-atexit-handlers.patch: + - Don't use atexit handlers, as they cause gnome-settings-daemon to crash. + Use a GNU C extension instead. Patch by Rodrigo Moya. + (LP: #788710, Closes: #645704) + + -- Michael Biebl Tue, 18 Oct 2011 01:09:32 +0200 + +orbit2 (1:2.14.18-0.2) unstable; urgency=low + + * Non-maintainer upload. + * Remove references to other libraries from dependency_libs field + (Closes: #619205). + + -- Luk Claes Sun, 29 May 2011 22:49:43 +0200 + +orbit2 (1:2.14.18-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream bugfix release, one API addition: + + debian/patches/700-autoreconf.patch: + - Regenerated for the new version. + + -- Sebastian Dröge Thu, 08 Apr 2010 12:27:40 +0200 + +orbit2 (1:2.14.17-2) unstable; urgency=low + + * debian/control: Added minimum version to debhelper and pkg-config + build-depends. + * debian/liborbit2.lintian-overrides: Ignore that the package name does + not match the .so names. This has historic reason and is not going to + change. + * debian/control: Fixed a typo in orbit2-nameserver's description. + + Closes: #557830 "Typo in package description: "This packages"" + + -- Sebastian Rittau Tue, 24 Nov 2009 21:42:44 +0100 + +orbit2 (1:2.14.17-1) unstable; urgency=low + + * Acknowledge NMUs. Thanks, people! + + Closes: #460403 "diff for NMU version 1:2.14.10-0.1" + + Closes: #471275 "diff for NMU 2.14.12-0.1" + * Update Standards-Version to 3.8.3, no additional changes needed. + * Bump debhelper compatibility level to 7. + + -- Sebastian Rittau Sun, 04 Oct 2009 17:36:55 +0200 + +orbit2 (1:2.14.17-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream bugfix release. No API changes. + * Update Standards-Version to 3.8.0, no additional changes needed. + * Build depend on autotools-dev to get config.{sub,guess} updated. + + -- Sebastian Dröge Fri, 06 Mar 2009 18:40:04 +0100 + +orbit2 (1:2.14.16-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream bugfix release. No API changes. + + -- Josselin Mouette Fri, 14 Nov 2008 22:46:49 +0100 + +orbit2 (1:2.14.13-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream bugfix release: + + Robustness fixes. + + Locking fixes in linc. + + Fixes for handling of local requests. + + -- Sebastian Dröge Tue, 03 Jun 2008 10:40:06 +0200 + +orbit2 (1:2.14.12-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream bugfix release: + + Fixes build with glib 2.16 (Closes: #464525). + + 700-autoreconf.patch: Regenerated for the new version. + + Build depend on libidl-dev (>= 0.8.10). + + -- Sebastian Dröge Mon, 17 Mar 2008 02:39:46 +0100 + +orbit2 (1:2.14.10-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream release with API additions. + * Increase shlibs version to 2.14.10. + * Use ${binary:Version}. + * Standards version can be 3.7.3. + * Fix FSF address in copyright. + + -- Josselin Mouette Sat, 12 Jan 2008 13:09:44 +0100 + +orbit2 (1:2.14.7-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream releases; no API or ABI change. + + -- Loic Minier Thu, 05 Apr 2007 17:12:25 +0200 + +orbit2 (1:2.14.5-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream stable release; no ABI change, one small backward-compatible + API change: it's not necessary to define ORBIT2_EXTENSIONS before using + ORBit_get_giop_recv_limit() or ORBit_proto_use(); closes: #417907. + + -- Loic Minier Thu, 05 Apr 2007 16:08:04 +0200 + +orbit2 (1:2.14.4-1) unstable; urgency=low + + * New upstream release. + * Acknowledge NMU. (Thanks, Loic!) + + Closes: #395050 "Diff for 2.14.3-0.1 NMU" + * debian/patches/700-autoreconf.patch: Updated. + * debian/SSL.Debian: Removed, since SSL support was removed upstream. + * debian/TODO: Removed; all todo items are outdated. + * debian/liborbit2.docs: Removed SSL.Debian and TODO. + + -- Sebastian Rittau Mon, 18 Dec 2006 20:11:59 +0100 + +orbit2 (1:2.14.3-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream releases, with API addition; closes: #386410. + - Bump up shlibs to >= 1:2.14.1. + - Bump up libglib2.0-dev build-dep to >= 2.8.0. + - Drop build-dep and dep on libpopt-dev. + - Split patch 100-compile-name-server with a new 700_autoreconf patch + which holds the generated files; I'm afraid it's ~ 2 MB, but I don't + have automake1.6 around to properly minimize the diff. + * Include debian/patches/m68k when building for m68k. + * New m68k patch, 10-aligment-misc-fixes, to properly align memory on m68k; + thanks Roman Zippel; closes: #390516. + * Add watch file. + + -- Loic Minier Tue, 24 Oct 2006 16:08:59 +0200 + +orbit2 (1:2.14.0-2) unstable; urgency=low + + * Acknowledge NMU. (Thanks, Steinar!) + + Closes: #371847 "diff for 1:2.14.0-1.1 NMU" + * debian/control: Bump build dependency on gtk-doc-tools to >= 1.6-2. + Removed build dependency on xsltproc (since gtk-doc-tools depends on it). + + Closes: #362791 "orbit2 should declare a versioned dependency on + gtk-doc-tools" + * debian/copyright: Updated copyright text with (L)GPL boilerplate. + * debian/control: Bump standards version to 3.7.2 (no changes required). + + -- Sebastian Rittau Fri, 23 Jun 2006 11:54:14 +0200 + +orbit2 (1:2.14.0-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Make liborbit2-dev depend on at least version 0.8.6-1 of libidl-dev. + (Closes: #369685) + + -- Steinar H. Gunderson Wed, 7 Jun 2006 22:45:41 +0200 + +orbit2 (1:2.14.0-1) unstable; urgency=low + + * New upstream release. + + -- Sebastian Rittau Thu, 16 Mar 2006 21:14:34 +0100 + +orbit2 (1:2.12.2-3) unstable; urgency=low + + * debian/control: Added gtk-doc-tools to build dependencies. + (Closes: #318783, #318584) + + -- Sebastian Rittau Thu, 21 Jul 2005 22:41:25 +0200 + +orbit2 (1:2.12.2-2) unstable; urgency=low + + * debian/control: Updated standards-version to 3.6.2 (no changes). + * Reenable shipping of API documentation. (Closes: #317352) + + debian/rules: Add --enable-gtk-doc option to build API documentation. + + debian/liborbit2-dev.install: Added usr/share/doc/liborbit2-dev/ORBit2 + + -- Sebastian Rittau Fri, 8 Jul 2005 17:19:23 +0200 + +orbit2 (1:2.12.2-1) unstable; urgency=low + + * New upstream version. + + debian/patches/100-compile-name-server.patch: Updated. + * debian/liborbit2-dev.install: Removed + debian/tmp/usr/share/doc/liborbit2-dev/ORBit2. + + -- Sebastian Rittau Tue, 19 Apr 2005 16:01:06 +0200 + +orbit2 (1:2.12.1-1) unstable; urgency=low + + * New upstream version. + * Acknowledge NMUs. (Thanks, Sebastien!) + + Closes: #258454 "nautilus: crashes with usb key entry in fstab" + * debian/control: Remove dependencies on indent, they aren't needed anymore. + + Closes: #292801 "depends on indent" + * debian/patches/000-relibtoolize.patch: Removed. + * debian/orbit-idl-2.1: Removed description of deprecated + --c-output-formatter option. + + -- Sebastian Rittau Tue, 15 Mar 2005 11:53:19 +0100 + +orbit2 (1:2.10.5-0.1) unstable; urgency=low + + * NMU with the maintainer approval. + * New upstream release: + - fix a nautilus crash on 64 bits platforms (Closes: #258454). + * debian/patches/005-pc-file-fix.patch: + - removed, the fix is in the new version. + + -- Sebastien Bacher Tue, 8 Feb 2005 16:23:53 +0100 + +orbit2 (1:2.10.2-1.1) unstable; urgency=low + + * NMU for Gnome 2.6. + * Upload in unstable. + + -- Sebastien Bacher Mon, 24 May 2004 19:31:42 +0200 + +orbit2 (1:2.10.2-1) experimental; urgency=low + + * Acknowledges NMUs. (Thanks Ross and Gustavo!) + + Closes: #240022, #249291 + + Bug fixed in NMU: Closes: #242943 + * debian/rules: Update shlibver to >= 1:2.10.0. (Closes: #218287) + * Fix pkg-config file not to include unnecessary libraries. + + debian/patches/005-pc-file-fix.patch: New file. + + Closes: #236094 "pkg-config --libs lists to many libraries" + * debian/control: Correct dependency of liborbit2-dev on libidl-dev instead + of libidl2-dev. + + -- Sebastian Rittau Sun, 16 May 2004 19:14:42 +0200 + +orbit2 (1:2.10.2-0.1) experimental; urgency=low + + * NMU + * New upstream release + * debian/control: + - liborbit2-dev now depends on libidl-dev (Closes: #242943) + * patches/000-relibtoolize.patch: + - add patch to relibtoolize + * patches/100-compile-name-server.patch: + - reworked patch to work with the above one + + -- Gustavo Noronha Silva Sun, 16 May 2004 01:24:36 -0300 + +orbit2 (1:2.10.0-0.1) experimental; urgency=low + + * NMU for GNOME 2.6 packaging + * New upstream release + + -- Ross Burton Thu, 25 Mar 2004 09:48:19 +0000 + +orbit2 (1:2.8.3-2) unstable; urgency=low + + * Enable orbit-name-service. [Thanks to W. Borgert for patch and manual + pages.] + + debian/control: Build-depend on xsltproc and docbook-xsl (for generating + the manual pages from Docbook source). + + debian/control: Added a new package: orbit2-nameserver. + + debian/patches/100-compile-name-server.patch: Patch to enable + compilation of the ORBit name server. + + debian/name-client-2.dbk: + + debian/orbit-name-server-2.dbk: Man pages. + + debian/rules: Auto-generate man pages from Docbook source. + + debian/orbit2-nameserver.install: + + debian/orbit2-nameserver.manpages: Files to install in package + orbit2-nameserver. + + Closes: #223789 "desperately missing orbit2 naming server" + * debian/control: Start all short description with lowercase letters. + + -- Sebastian Rittau Sat, 13 Dec 2003 23:06:11 +0100 + +orbit2 (1:2.8.3-1) unstable; urgency=low + + * New upstream version. + + debian/patches/crashfix.patch: Removed as this is now included + upstream. (Thanks, Sebastien for the temporary patch and NMU!) + + Closes: #219391 "Involved in gnumeric crash when a11y is enabled" + + -- Sebastian Rittau Sat, 13 Dec 2003 22:05:32 +0100 + +orbit2 (1:2.8.2-1.1) unstable; urgency=high + + * NMU to fix some crash with a11y before the entry in testing + (Closes: #219391). + * Urgency = high because it's a small fix and we don't want to delay + GNOME 2.4 entry in testing. + + -- Sebastien Bacher Sun, 16 Nov 2003 21:35:11 +0100 + +orbit2 (1:2.8.2-1) unstable; urgency=low + + * New upstream version. + + Closes: #218026 "new version available which fixes deadlock" + + -- Sebastian Rittau Wed, 29 Oct 2003 15:15:49 +0100 + +orbit2 (1:2.8.1-5) unstable; urgency=low + + * debian/control: liborbit2-dev now conflicts with liblinc-dev so that + newly compiled packages are not linked against linc anymore. [Suggestion + by Christian Marillat] + + Closes: #216842 "liborbit2-dev should conflict with liblinc-dev" + * Added manpage for linc-cleanup-sockets (from Linc Debian package, updated + slightly). + + debian/linc-cleanup-sockets.1: Manpage. + + debian/orbit2.manpages: Added linc-cleanup-sockets.1. + + -- Sebastian Rittau Tue, 21 Oct 2003 17:51:52 +0200 + +orbit2 (1:2.8.1-4) unstable; urgency=low + + * Upload to unstable. + + -- Sebastian Rittau Thu, 16 Oct 2003 16:35:42 +0200 + +orbit2 (1:2.8.1-3) experimental; urgency=low + + * debian/control: Removed dependency on liblinc-dev from liborbit2-dev. + * debian/control: Changed conflicts with libbonobo-activation4 to a + versioned conflict. + + -- Sebastian Rittau Thu, 16 Oct 2003 00:37:56 +0200 + +orbit2 (1:2.8.1-2) experimental; urgency=low + + * debian/control: liborbit2 conflicts with liblinc1 (<< 1.0.3-4). This + version of Linc contains a workaround for a problem with newer ORBit + versions: Since these versions have internalized Linc, they don't call + linc_set_tmpdir() anymore. Thatswhy some packages that relied on ORBit + setting the tmpdir would fail. + + -- Sebastian Rittau Wed, 8 Oct 2003 11:30:45 +0200 + +orbit2 (1:2.8.1-1) experimental; urgency=low + + * New upstream version. + + Closes: #200847 "giop1.2 protocol implementation not compliant" + + debian/rules: Updated shlibs version to >= 2.8.0. + + debian/liborbit2-dev.install: Made paths more explicit. + + debian/liborbit2-dev.install: Added IDL files. + + debian/control: liborbit2 does now conflict and replace older versions + of liborbit2-dev, since Everything_module.so moved. + * ORBit does now include Linc: + + debian/control: Remove build-dependency on liblinc-dev. + + debian/control: Conflict with libbonobo-activation4. + + debian/TODO: Added note that Linc is built with SSL disabled. + + debian/SSL.Debian: New file (from Linc source package, slightly + modified). + + debian/liborbit2.docs: Added debian/SSL.Debian. + + debian/orbit2.install: Added linc-cleanup-sockets. + * Added HTML documentation: + + debian/rules: Added --with-html-dir configure option. + + debian/liborbit2-dev.install: Install HTML documentation. + + debian/liborbit2-dev.links: Added link to gtk-doc documentation. + * debian/copyright: Corrected download location, added copyright notices + from Linc. + * debian/control: Standards version 3.6.1 (no changes required). + + -- Sebastian Rittau Wed, 1 Oct 2003 20:18:56 +0200 + +orbit2 (1:2.6.3-2) unstable; urgency=low + + * Rerun libtool, automake, autoconf. + + Closes: #205734 "configure built from broken libtool.m4" + + -- Sebastian Rittau Sun, 17 Aug 2003 14:32:32 +0200 + +orbit2 (1:2.6.3-1) unstable; urgency=low + + * New upstream release. + * Removed debug package, since it didn't provide anything that the -dev + package did not. + + debian/control: Removed liborbit2-dbg. + + debian/liborbit2-dbg.dirs: Removed. + * Use cdbs: + + debian/control: Build-depend on cdbs and debhelper >= 4.1.0. + + debian/rules: Rewrote. + + debian/orbit2.install: + + debian/liborbit2.install: + + debian/liborbit2-dev.install: Added debian/tmp/ prefix for all files. + * debian/control: Standards version 3.6.0 (no changes required). + + -- Sebastian Rittau Sat, 16 Aug 2003 13:28:26 +0200 + +orbit2 (1:2.6.2-1) unstable; urgency=low + + * New upstream release. + + -- Sebastian Rittau Sun, 25 May 2003 20:44:56 +0200 + +orbit2 (1:2.6.1-2) unstable; urgency=low + + * Typo in package description fixed. + * Changed section of packages liborbit2-dev and liborbit2-dbg to libdevel. + * Complies with Debian Policy, version 3.5.10. + * Use src/services/imodule/Makefile.am from CVS HEAD to fix inter-library + dependency information. + + Closes: #193454 "Shared library dependency information" + + -- Sebastian Rittau Sun, 18 May 2003 20:09:49 +0200 + +orbit2 (1:2.6.1-1) unstable; urgency=low + + * New upstream release. + * Conforms to Debian policy 3.5.9. + * Updated the package descriptions. + * Compile with --enable-purify. This should only result in a neglectable + performance hit, but is the right thing to do, IMO. This also eases + debugging with memory debuggers like Valgrind. (Closes: #159794) + * User debian/compat instead of DH_COMPAT. Also, use compatibility level 4; + build-depend on debhelper >= 4.0.0. + * Added ${misc:Depends} to dependencies, added ${shlib:Depends} to + dependencies of liborbit2-dbg. + * Use dh_install instead of dh_movefiles. + + -- Sebastian Rittau Tue, 25 Mar 2003 02:52:04 +0100 + +orbit2 (1:2.6.0-2) unstable; urgency=low + + * New maintainer. + * Removed links to undocumented(7). + * Wrote typelib-dump(1). (Closes: #119803) + + -- Sebastian Rittau Sat, 22 Feb 2003 19:32:47 +0100 + +orbit2 (1:2.6.0-1) unstable; urgency=low + + * New upstream release, finally jumping ahead to the new release + series. + + -- Chris Waters Sat, 18 Jan 2003 17:19:41 -0800 + +orbit2 (1:2.4.4-1) unstable; urgency=low + + * New upstream release. Actually, a slightly older upstream release, + but it's new to us. Upstream version downgraded because the 2.5.0 + release is for Gnome 2.2, which is still beta (closes: #170398). + + -- Chris Waters Thu, 28 Nov 2002 03:35:31 -0800 + +orbit2 (2.5.0-1) unstable; urgency=low + + * New upstream release. + + -- Chris Waters Mon, 28 Oct 2002 13:58:13 -0800 + +orbit2 (2.4.3-2) unstable; urgency=low + + * Re-ran libtoolize, autoheader, aclocal, autoconf and automake to work + around a problem with MIPSEL (closes: #160063). + + -- Chris Waters Thu, 17 Oct 2002 02:02:55 -0700 + +orbit2 (2.4.3-1) unstable; urgency=low + + * New upstream release. + * Fixed download location in copyright file. + * Updated standards-version in debian/control. + * Updated debian/TODO a little. + + -- Chris Waters Fri, 6 Sep 2002 15:34:57 -0700 + +orbit2 (2.4.1-1) unstable; urgency=low + + * New upstream release. + * Added missing dependency on libpopt-dev to liborbit2-dev + (closes: #155679). + * upstream removed name-client-2 and orbit-name-server-2, so I adjusted + the docs and descriptions accordingly. + + -- Chris Waters Wed, 7 Aug 2002 12:09:41 -0700 + +orbit2 (2.4.0-1) unstable; urgency=low + + * New upstream release. + + -- Chris Waters Thu, 6 Jun 2002 16:00:38 -0700 + +orbit2 (2.3.110-1) unstable; urgency=low + + * New upstream release. + + -- Chris Waters Tue, 21 May 2002 23:01:37 -0700 + +orbit2 (2.3.109-1) unstable; urgency=low + + * New upstream release. + + -- Chris Waters Thu, 16 May 2002 12:14:05 -0700 + +orbit2 (2.3.108-1) unstable; urgency=low + + * New upstream release. + + -- Chris Waters Wed, 17 Apr 2002 02:46:17 -0700 + +orbit2 (2.3.107-1) unstable; urgency=low + + * New upstream release. + * Added man page for orbit-idl-2 (closes:#119804). + * Added a couple of man pages for orbit2 binary package. + + -- Chris Waters Mon, 25 Mar 2002 17:24:03 -0800 + +orbit2 (2.3.106-2) unstable; urgency=low + + * Rebuilt against glibc 2.0, updated dependencies. + + -- Chris Waters Thu, 21 Mar 2002 21:18:57 -0800 + +orbit2 (2.3.106-1) unstable; urgency=low + + * New upstream release. + + -- Chris Waters Wed, 6 Mar 2002 01:02:05 -0800 + +orbit2 (2.3.105-2) unstable; urgency=low + + * Rebuilt against new glib; updated dependencies. + + -- Chris Waters Tue, 26 Feb 2002 14:33:51 -0800 + +orbit2 (2.3.105-1) unstable; urgency=low + + * New upstream release. + + -- Chris Waters Wed, 13 Feb 2002 13:12:10 -0800 + +orbit2 (2.3.104-1) unstable; urgency=low + + * New upstream release. + + -- Chris Waters Fri, 8 Feb 2002 01:24:01 -0800 + +orbit2 (2.3.102-2) unstable; urgency=low + + * Added missing dependency on indent (closes:#131426) + + -- Chris Waters Tue, 29 Jan 2002 14:38:50 -0800 + +orbit2 (2.3.102-1) unstable; urgency=low + + * New upstream release. + * New (hopefully better) patch for the recurring libtool problems with + the Everything module. (closes:#128476) + + -- Chris Waters Sat, 12 Jan 2002 21:45:02 -0800 + +orbit2 (2.3.101-2) unstable; urgency=low + + * Updated versioned build-depends on linc (closes:#127970). + + -- Chris Waters Mon, 7 Jan 2002 13:40:13 -0800 + +orbit2 (2.3.101-1) unstable; urgency=low + + * New upstream release. + + -- Chris Waters Sat, 5 Jan 2002 02:38:18 -0800 + +orbit2 (2.3.100-1) unstable; urgency=low + + * New upstream release. Includes fix for build problems with Everything + module (closes:#122546). + + -- Chris Waters Tue, 18 Dec 2001 16:42:59 -0800 + +orbit2 (2.3.99-2) unstable; urgency=low + + * Was installing Everything .so module in wrong place (although links + and .a were going to the right place). Yeesh. + + -- Chris Waters Fri, 7 Dec 2001 13:46:30 -0800 + +orbit2 (2.3.99-1) unstable; urgency=low + + * New upstream release (closes:#121748). + * Added some more versioned depends (closes:#119484,#121751) + + -- Chris Waters Sat, 1 Dec 2001 13:42:55 -0800 + +orbit2 (2.3.97-1) unstable; urgency=low + + * New upstream release. + * Added versioned build-depends on libglib1.3. + + -- Chris Waters Mon, 5 Nov 2001 12:32:05 -0800 + +orbit2 (2.3.95-1) unstable; urgency=low + + * Initial packaging for Debian. + * Created manual page for orbit2-config. + * Patched orbit2-config to actually work. + + -- Chris Waters Tue, 23 Oct 2001 23:34:14 -0700 + --- orbit2-2.14.19.orig/debian/rules +++ orbit2-2.14.19/debian/rules @@ -0,0 +1,33 @@ +#!/usr/bin/make -f + +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_CONFIGURE_EXTRA_FLAGS := --enable-purify --enable-gtk-doc --with-html-dir=/usr/share/doc/liborbit2-dev --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) + +# +# Man page generation (from Docbook source) +# + +DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl + +common-build-arch:: + xsltproc --nonet --novalid -o debian/name-client-2.1 $(DB2MAN) debian/name-client-2.dbk + xsltproc --nonet --novalid -o debian/orbit-name-server-2.1 $(DB2MAN) debian/orbit-name-server-2.dbk + +clean:: + echo $(DEB_PATCHDIRS) + rm -f debian/name-client-2.1 debian/orbit-name-server-2.1 + +install/liborbit2-dev:: + rm `find debian/tmp -name '*.la'` --- orbit2-2.14.19.orig/debian/linc-cleanup-sockets.1 +++ orbit2-2.14.19/debian/linc-cleanup-sockets.1 @@ -0,0 +1,26 @@ +.\" created for linc-cleanup-sockets by Chris Waters, for Debian GNU/Linux +.\" +.TH LINC-CLEANUP-SOCKETS 1 "21 October 2003" "Version 2.8.1" + +.SH NAME +linc\-cleanup-sockets \- removes leftover ORBit files from /tmp + +.SH SYNOPSIS +.HP +.B linc\-cleanup\-sockets + +.SH DESCRIPTION +.B linc\-cleanup\-sockets +is a tool used internally by GNOME to cleanup any leftover sockets for +a user that may be left behind in /tmp. It examines any sockets found +in the directory /tmp/orbit-\fIusername\fP. You may run it yourself +when needed or desired. It prints a brief status message when done. + +.SH OPTIONS +none + +.SH AUTHOR +Copyright \(co 2002, Michael Meeks + +This manual was originally written for linc\-cleanup\-sockets by Chris +Waters for Debian GNU/Linux. --- orbit2-2.14.19.orig/debian/liborbit2-dev.links +++ orbit2-2.14.19/debian/liborbit2-dev.links @@ -0,0 +1 @@ +usr/share/doc/liborbit2-dev/ORBit2 usr/share/gtk-doc/html/ORBit2 --- orbit2-2.14.19.orig/debian/orbit2.install +++ orbit2-2.14.19/debian/orbit2.install @@ -0,0 +1,3 @@ +debian/tmp/usr/bin/ior-decode-2 +debian/tmp/usr/bin/linc-cleanup-sockets +debian/tmp/usr/bin/typelib-dump --- orbit2-2.14.19.orig/debian/orbit2.manpages +++ orbit2-2.14.19/debian/orbit2.manpages @@ -0,0 +1,3 @@ +debian/ior-decode-2.1 +debian/linc-cleanup-sockets.1 +debian/typelib-dump.1 --- orbit2-2.14.19.orig/debian/control +++ orbit2-2.14.19/debian/control @@ -0,0 +1,75 @@ +Source: orbit2 +Section: net +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Sebastian Rittau +Standards-Version: 3.8.3 +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 +Architecture: any +Multi-Arch: same +Section: libs +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +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. + . + This package contains the run-time libraries used by ORBit2-based + applications. + +Package: orbit2 +Architecture: any +Section: devel +Depends: ${shlibs:Depends}, ${misc:Depends} +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. + . + This package contains the command-line utilities ior-decode-2 and + typelib-dump. + +Package: orbit2-nameserver +Architecture: any +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. + . + This package includes the CORBA nameserver and a utility client program. + +Package: liborbit2-dev +Architecture: any +Section: libdevel +Depends: liborbit2 (= ${binary:Version}), libidl-dev (>= 0.8.6-1), libglib2.0-dev, pkg-config, ${shlibs:Depends}, ${misc:Depends} +Recommends: orbit2 +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. + . + 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. --- orbit2-2.14.19.orig/debian/orbit-idl-2.1 +++ orbit2-2.14.19/debian/orbit-idl-2.1 @@ -0,0 +1,153 @@ +.\" created for orbit-idl-2 by Chris Waters, for Debian GNU/Linux +.\" +.TH ORBIT-IDL-2 1 "18 March 2002" "Version 0.5.15" + +.SH NAME +orbit\-idl\-2 \- IDL compiler for ORBit2 + +.SH SYNOPSIS +.HP +.B orbit\-idl\-2 +.RI "[ " options " ] " file... + +.SH DESCRIPTION +.B orbit\-idl\-2 +converts object interface descriptions written in CORBA IDL (Interface +Definition Language) into C code that you can compile and link into +your programs. + +.SH OPTIONS +.B orbit\-idl\-2 +accepts the following options: +.P +.BI "\-d " ARG +.RS 0 +.BI \-\-debug= ARG +.RS +Set the debug level. Supported levels are 0 to 4, default is 2. +.RE +.TP +.BI \-\-idlwarnlevel= INT +Set the warning level for compiler warnings. Supported levels are 0 +to 4, default is 2. +.TP +.B \-\-showcpperrors +Show errors from cpp(1). +.TP +.B \-\-small +Optimize for size instead of speed. +.TP +.B \-\-oldstyle +Use the old style IDL compiler (not generally recommended). +.TP +.B \-\-skeleton\-impl +Generate a \fIskeleton-impl\fP file. +.TP +.B \-\-nostubs +Do not create the \fIstubs\fP file. +.TP +.B \-\-noskels +Do not create the \fIskels\fP file. +.TP +.B \-\-nocommon +Do not create the \fIcommon\fP file. +.TP +.B \-\-noheaders +Do not create the \fIheaders\fP file. +.TP +.B \-\-noidata +Don't generate Interface type data. +.P +.B \-i +.RS 0 +.B \-\-imodule +.RS +Generate only an imodule file (no skels, stubs, etc.). +.RE +.TP +.B \-\-add\-imodule +Generate an imodule file (as well as other files generated by default +or by other options). +.TP +.B \-\-onlytop +Inhibit file includes. +.TP +.B \-\-pidl +Treat source as pseudo-IDL. +.P +.BI "\-D " ARG +.RS 0 +.BI \-\-define= ARG +.RS +Define name for preprocessor. +.RE +.P +.BI "\-I " PATH +.RS 0 +.BI \-\-include= PATH +.RS +Add search path for include files. +.RE +.TP +.BI \-\-deps= FILENAME +Generate dependency information, suitable for inclusion in a Makefile. +.P +.BI "\-l " ARG +.RS 0 +.BI \-\-lang= ARG +.RS +Specify the output language. The default is C. Support for languages +other than C requires the installation of a backend for that language. +.RE +.TP +.BI "\-\-backenddir=" DIR +Specify the directory where a language backend is stored (not +necessary if backend is stored in the default directory). +.TP +.B "\-\-usage" +Print a very brief usage summary. +.P +.B \-? +.RS 0 +.B \-\-help +.RS +Print a slightly more detailed usage summary. +.RE +.P +.B \-v +.RS 0 +.B \-\-version +.RS +Print version number and serial. +.RE + +.SH COMPILING +The IDL file(s) compiled by \fBorbit\-idl\-2\fP define the interfaces +to network-transparent objects. These files are first passed to +cpp(1), the C Preprocessor, then the result is parsed, and the C code +is generated. +.P + By default, \fBorbit\-idl\-2\fP generates four files, the \fIstubs\fP, +\fIskels\fP, \fIcommon\fP, and \fIheader\fP files. If your input file +is named \fBsample.idl\fP, then the output files will be named, +respectively, \fBsample-stubs.c\fP, \fBsample-skels.c\fP, +\fBsample-common.c\fP, and \fBsample.h\fP. You can optionally also +generate a \fIskeleton-impl\fP file (which would be named +\fBsample-skelimpl.c\fP in our example), or an \fIimodule\fP file +(e.g. \fBsample-imodule.c\fP). These files require manual +editing to be useful, and is therefore not generated by default. +.P +The generated C files are formatting ("pretty-printed") using +indent(1). You can use another program for this if you prefer, with +the \-\-c-output-formatter argument. + +.SH SEE ALSO +orbit2-config(1), cpp(1), indent(1), /usr/share/doc/liborbit2-dev, +http://orbit-resource.sourceforge.net, http://www.omg.org. + +.SH AUTHOR +Copyright \(co 2001, 2002 Dick Porter and Elliot Lee + + +This manual was originally written for orbit-idl by Chris Waters + for Debian GNU/Linux. --- orbit2-2.14.19.orig/debian/liborbit2.install +++ orbit2-2.14.19/debian/liborbit2.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/*/lib*.so.* +debian/tmp/usr/lib/*/orbit-2.0/Everything_module.so --- orbit2-2.14.19.orig/debian/orbit2-nameserver.manpages +++ orbit2-2.14.19/debian/orbit2-nameserver.manpages @@ -0,0 +1,2 @@ +debian/name-client-2.1 +debian/orbit-name-server-2.1 --- orbit2-2.14.19.orig/debian/liborbit2.lintian.overrides +++ orbit2-2.14.19/debian/liborbit2.lintian.overrides @@ -0,0 +1 @@ +liborbit2 binary: package-name-doesnt-match-sonames --- orbit2-2.14.19.orig/debian/compat +++ orbit2-2.14.19/debian/compat @@ -0,0 +1 @@ +7 --- orbit2-2.14.19.orig/debian/watch +++ orbit2-2.14.19/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnome.org/pub/gnome/sources/ORBit2/([\d\.]+[02468])/ORBit2-([\d\.]+)\.tar\.gz --- orbit2-2.14.19.orig/debian/orbit2-nameserver.install +++ orbit2-2.14.19/debian/orbit2-nameserver.install @@ -0,0 +1,2 @@ +debian/tmp/usr/bin/name-client-2 +debian/tmp/usr/bin/orbit-name-server-2 --- orbit2-2.14.19.orig/debian/name-client-2.dbk +++ orbit2-2.14.19/debian/name-client-2.dbk @@ -0,0 +1,184 @@ + + + + + + + 2003 + W. Borgert + + 2003-12-12 + + + W. + Borgert + debacle@debian.org + + + + + 1 + 2003-12-12 + WB + initial version + + + + + + name-client-2 + + 1 + + + + name-client-2 + + CORBA Naming Service client + + + + + name-client-2 + + root + bind rebind + bind_context rebind_context + name + object-id + + + + name-client-2 + + root + resolve unbind + bind_new_context list + destroy + name + + + + name-client-2 + + root + + + + + + Description + + name-client-2 is used to query or control + a CORBA Name Service, such as the + orbit-name-server-2. + + + + Options + + name-client-2 accepts the following + arguments: + + + + + + root + + + + name object-id + + + + Binds or rebinds an object or naming context to name. + + + + + + root + + + + name + + + + Resolves, unbinds, lists, or destroys name or binds + name to a new context. + + + + + + root + + + + + Creates a new naming context and writes its IOR to + standard output. + + + + + Components of name are delimited by + / (slash). + + id and kind of + those components are delimited by . + (dot). + + root denotes the IOR of the root naming + context, it is either: + + + + the IOR itself + + + + : the IOR is read from + stdin. + + + + : the GNOME Name Server is + used. + + + + object-id is the IOR of an + object. + + + + Files + + On startup, name-client-2 tries to read + the files /etc/orbitrc and + $HOME/.orbitrc. The format of these files is + not yet documented in Debian. + + + + See Also + + ORBit2 web pages: GNOME, SourceForge + + + + + Authors + + This manual was written by W. + Borgert + debacle@debian.org for Debian + GNU/Linux. + + --- orbit2-2.14.19.orig/debian/liborbit2.docs +++ orbit2-2.14.19/debian/liborbit2.docs @@ -0,0 +1 @@ +README NEWS AUTHORS --- orbit2-2.14.19.orig/debian/typelib-dump.1 +++ orbit2-2.14.19/debian/typelib-dump.1 @@ -0,0 +1,33 @@ +.\" created for typelib-dump by Sebastian Rittau, for Debian GNU/Linux +.\" based on orbit2-config by Chris Waters +.\" +.TH TYPELIB-DUMP 1 "22 February 2003" "Version 2.6.0" + +.SH NAME +typelib\-dump \- show ORBit2 type library modules + +.SH SYNOPSIS +.HP +.B typelib\-dump +.RI "[ " module " ]" + +.SH DESCRIPTION +If +.B typelib-dump +is called without any arguments, it lists all \fIORBit2\fP typelib paths +and the typelib modules in them. Otherwise the argument \fBmodule\fP +is taken as the name of a typelib module. This module gets inspected +and all types and interfaces of the module as well as all interface methods +are dumped to the screen. + +.SH SEE ALSO +orbit-idl-2(1), /usr/share/doc/orbit2, +http://orbit-resource.sourceforge.net/, http://www.omg.org/. + +.SH AUTHOR +Copyright \(co 2001, 2002 Dick Porter and Elliot Lee + + +This manual page was originally written for typelib-dump by Sebastian Rittau + for Debian GNU/Linux and is based on the manual page +for orbit2-config by Chris Waters . --- orbit2-2.14.19.orig/debian/patches/glib_no_deprecations.patch +++ orbit2-2.14.19/debian/patches/glib_no_deprecations.patch @@ -0,0 +1,13 @@ +diff -Nur orbit2-2.14.19/linc2/src/Makefile.am orbit2-2.14.19.build/linc2/src/Makefile.am +--- orbit2-2.14.19/linc2/src/Makefile.am 2010-02-09 13:05:35.000000000 +0100 ++++ orbit2-2.14.19.build/linc2/src/Makefile.am 2013-04-02 16:51:33.434373357 +0200 +@@ -12,8 +12,7 @@ + -I$(top_builddir)/linc2/include \ + -I$(top_srcdir)/linc2/include \ + $(LINC_CFLAGS) \ +- $(WARN_CFLAGS) \ +- -DG_DISABLE_DEPRECATED ++ $(WARN_CFLAGS) + + if OS_WIN32 + else --- orbit2-2.14.19.orig/debian/patches/pre-multiarch-compatibility.patch +++ orbit2-2.14.19/debian/patches/pre-multiarch-compatibility.patch @@ -0,0 +1,16 @@ +Author: Steve Langasek +Description: Support pre-multiarch directory as a compatibility fallback +Bug-Debian: http://bugs.debian.org/641615 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/977966 + +diff -Nur -x '*.orig' -x '*~' trunk/src/orb/orb-core/orbit-typelib.c trunk.new/src/orb/orb-core/orbit-typelib.c +--- trunk/src/orb/orb-core/orbit-typelib.c 2012-04-18 20:39:57.000000000 +0000 ++++ trunk.new/src/orb/orb-core/orbit-typelib.c 2012-04-20 23:27:57.969753251 +0000 +@@ -218,6 +218,7 @@ + paths = g_ptr_array_sized_new (8); + + g_ptr_array_add (paths, g_strdup (ORBIT_TYPELIB_DIR)); ++ g_ptr_array_add (paths, g_strdup ("/usr/lib/orbit-2.0")); + + if ((path = g_getenv ("ORBIT_TYPELIB_PATH"))) { + char **strv; --- orbit2-2.14.19.orig/debian/patches/100-compile-name-server.patch +++ orbit2-2.14.19/debian/patches/100-compile-name-server.patch @@ -0,0 +1,12 @@ +diff -Nur orbit2-2.14.3/src/services/name/Makefile.am orbit2-2.14.3.new/src/services/name/Makefile.am +--- orbit2-2.14.3/src/services/name/Makefile.am 2006-08-30 00:33:12.000000000 +0200 ++++ orbit2-2.14.3.new/src/services/name/Makefile.am 2006-10-24 15:58:44.000000000 +0200 +@@ -8,7 +8,7 @@ + + lib_LTLIBRARIES=libORBitCosNaming-2.la + +-noinst_PROGRAMS = name-client-2 orbit-name-server-2 ++bin_PROGRAMS = name-client-2 orbit-name-server-2 + + lib_LIBRARIES = libname-server-2.a + --- orbit2-2.14.19.orig/debian/patches/001-dont-use-atexit-handlers.patch +++ orbit2-2.14.19/debian/patches/001-dont-use-atexit-handlers.patch @@ -0,0 +1,35 @@ +Description: Don't use atexit handlers + gnome-settings-daemon crashes due to the atexit installed in ORBit, + which is unloaded as soon as the gconf g-s-d plugin is unloaded. + So when main() quits, the atexit function from ORBit is not available + anymore +Author: Rodrigo Moya +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=645704 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/orbit2/+bug/788710 +diff --git a/src/orb/orb-core/corba-orb.c b/src/orb/orb-core/corba-orb.c +index 2b2229a..4979a89 100644 +--- a/src/orb/orb-core/corba-orb.c ++++ b/src/orb/orb-core/corba-orb.c +@@ -289,7 +289,11 @@ static gboolean atexit_shutdown = FALSE; + * This is neccessary to clean up any remaining UDS + * and to flush any remaining oneway traffic in buffers. + */ ++#ifdef __GNUC__ ++void __attribute__ ((destructor)) ++#else + static void ++#endif + shutdown_orb (void) + { + CORBA_ORB orb; +@@ -459,8 +463,10 @@ CORBA_ORB_init (int *argc, char **argv, + * tried to contact them when Evolution was started the next + * time, causing it to hang, too. + */ ++#ifndef __GNUC__ + g_atexit (shutdown_orb); + #endif ++#endif + + retval->default_giop_version = GIOP_LATEST; + --- orbit2-2.14.19.orig/debian/patches/m68k/10-aligment-misc-fixes.patch +++ orbit2-2.14.19/debian/patches/m68k/10-aligment-misc-fixes.patch @@ -0,0 +1,61 @@ +- 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)