--- omnievents-2.6.2.orig/src/Servant.cc +++ omnievents-2.6.2/src/Servant.cc @@ -35,6 +35,7 @@ #endif #include // sprintf +#include #include #ifdef HAVE_IOSTREAM --- omnievents-2.6.2.orig/src/daemon_unix.cc +++ omnievents-2.6.2/src/daemon_unix.cc @@ -285,7 +285,7 @@ } } // Send the message. - ::syslog(priority,message); + ::syslog(priority,"%s",message); #ifndef LOG_PERROR // If we don't have LOG_PERROR, then we'll have to manually send // log messages to stderr. --- omnievents-2.6.2.orig/src/main.cc +++ omnievents-2.6.2/src/main.cc @@ -60,6 +60,7 @@ # include #endif +#include #include // for sprintf int main(int argc, char** argv) --- omnievents-2.6.2.orig/src/PersistNode.cc +++ omnievents-2.6.2/src/PersistNode.cc @@ -25,6 +25,7 @@ #include #include +#include namespace OmniEvents { --- omnievents-2.6.2.orig/tools/eventc.cc +++ omnievents-2.6.2/tools/eventc.cc @@ -184,6 +184,8 @@ # include #endif +#include + #include "omniEvents.hh" #include "naming.h" --- omnievents-2.6.2.orig/tools/eventf.cc +++ omnievents-2.6.2/tools/eventf.cc @@ -46,6 +46,8 @@ # include #endif +#include + #ifdef HAVE_STD_IOSTREAM using namespace std; #endif --- omnievents-2.6.2.orig/tools/rmeventc.cc +++ omnievents-2.6.2/tools/rmeventc.cc @@ -46,6 +46,8 @@ # include #endif +#include + #ifdef HAVE_STD_IOSTREAM using namespace std; #endif --- omnievents-2.6.2.orig/doc/rc/doxygen.conf +++ omnievents-2.6.2/doc/rc/doxygen.conf @@ -30,7 +30,7 @@ # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = +OUTPUT_DIRECTORY = dox # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this --- omnievents-2.6.2.orig/examples/pushcons.cc +++ omnievents-2.6.2/examples/pushcons.cc @@ -159,6 +159,8 @@ # include #endif +#include + #include "CosEventComm.hh" #include "CosEventChannelAdmin.hh" #include "naming.h" --- omnievents-2.6.2.orig/examples/pushsupp.cc +++ omnievents-2.6.2/examples/pushsupp.cc @@ -152,6 +152,8 @@ # include #endif +#include + #include "CosEventComm.hh" #include "CosEventChannelAdmin.hh" #include "naming.h" --- omnievents-2.6.2.orig/examples/pullsupp.cc +++ omnievents-2.6.2/examples/pullsupp.cc @@ -144,6 +144,8 @@ # include #endif +#include + #include "CosEventComm.hh" #include "CosEventChannelAdmin.hh" #include "naming.h" --- omnievents-2.6.2.orig/examples/pullcons.cc +++ omnievents-2.6.2/examples/pullcons.cc @@ -148,6 +148,8 @@ # include #endif +#include + #include "CosEventComm.hh" #include "CosEventChannelAdmin.hh" #include "naming.h" --- omnievents-2.6.2.orig/etc/init.d/omniorb-eventservice.in +++ omnievents-2.6.2/etc/init.d/omniorb-eventservice.in @@ -14,10 +14,10 @@ ### BEGIN INIT INFO # Provides: omniorb-eventservice -# Required-Start: $syslog $network -# Required-Stop: $syslog -# Default-Start: 3 4 5 -# Default-Stop: 0 1 2 6 +# Required-Start: $network $remote_fs $syslog +# Required-Stop: $network $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 # Short-Description: CORBA event service # Description: CORBA event service. http://www.omnievents.org/ ### END INIT INFO --- omnievents-2.6.2.orig/debian/omnievents.postinst +++ omnievents-2.6.2/debian/omnievents.postinst @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +# Those using dependency based boot sequencing with sysv-rc and +# installing omniorb-eventservice using version 1:2.6.2-1 and earlier +# would have the wrong runlevel symlinks. Recover from this. +if [ "$1" = "configure" ] && dpkg --compare-versions "$2" le "1:2.6.2-1" \ + && [ -f /etc/rc3.d/S[0-9][0-9]omniorb-eventservice ] && [ ! -f /etc/rc2.d/S[0-9][0-9]omniorb-eventservice ] +then + update-rc.d -f omniorb-eventservice remove +fi + +#DEBHELPER# --- omnievents-2.6.2.orig/debian/copyright +++ omnievents-2.6.2/debian/copyright @@ -0,0 +1,32 @@ +This package was debianised by W. Borgert on +Sat, 2004-11-20 17:53:19 +0000. + +It was downloaded from http://omnievents.sourceforge.net/ + +Upstream Authors: Alex Tingle + Bjorn Rohde Jensen + Paul Nader + +Copyright: Copyright (C) 2003-2005 Alex Tingle + Copyright (C) 1998-1999 Paul Nader + Copyright (C) 1996-2000 AT&T Laboratories Cambridge + +License: + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + + +On Debian GNU/Linux systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. --- omnievents-2.6.2.orig/debian/control +++ omnievents-2.6.2/debian/control @@ -0,0 +1,63 @@ +Source: omnievents +Section: net +Priority: optional +Maintainer: Debian CORBA Team +Uploaders: W. Borgert , Thomas Girard +Build-Depends: debhelper (>= 7), cdbs, libomniorb4-dev (>= 4.1.1), pkg-config, omniidl, libcos4-dev (>= 4.1.1), omniorb-idl, doxygen, graphviz, xsltproc, docbook-xsl, autotools-dev +Standards-Version: 3.9.2 +Homepage: http://www.omnievents.org +Vcs-Svn: svn://svn.debian.org/svn/pkg-corba/trunk/omnievents +Vcs-Browser: http://svn.debian.org/wsvn/pkg-corba/trunk/omnievents + +Package: omnievents +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: omnievents-doc +Description: omniORB event service + omniEvents enables CORBA applications to communicate through + asynchronous broadcast channels rather than direct method calls. It + is a small, efficient implementation of the Object Management Group's + Event Service specification designed to work with omniORB. + . + This package contains the CORBA Event Service daemon as a standalone + executable, and the associated tools. + +Package: libomnievents2 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: omniORB event service shared library + This package contains omniEvents shared library. + . + For more information on omniEvents see the omnievents package. + +Package: libomnievents-dev +Architecture: any +Section: libdevel +Depends: libomnievents2 (= ${binary:Version}), ${misc:Depends} +Recommends: pkg-config +Suggests: omnievents-doc +Description: omniORB event service development files + This package contains header files, static library and idl source files + for omniEvents. + . + For more information on omniEvents see the omnievents package. + +Package: omnievents-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Description: omniORB event service documentation + This package contains omniEvents manual and doxygen generated documentation. + . + For more information on omniEvents see the omnievents package. + +Package: libomnievents-dbg +Architecture: any +Section: debug +Priority: extra +Depends: libomnievents2 (= ${binary:Version}), ${misc:Depends} +Description: omniORB event service debugging symbols + This package contains omniEvents debugging symbols. + . + For more information on omniEvents see the omnievents package. --- omnievents-2.6.2.orig/debian/libomnievents-dev.install +++ omnievents-2.6.2/debian/libomnievents-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/include/ +debian/tmp/usr/lib/*.a +debian/tmp/usr/lib/*.so +debian/tmp/usr/lib/pkgconfig/ +debian/tmp/usr/share/ --- omnievents-2.6.2.orig/debian/libomnievents2.install +++ omnievents-2.6.2/debian/libomnievents2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/*.so.* --- omnievents-2.6.2.orig/debian/changelog +++ omnievents-2.6.2/debian/changelog @@ -0,0 +1,118 @@ +omnievents (1:2.6.2-2) unstable; urgency=low + + [ Floris Bruynooghe ] + * Build-depend on new omniorb packages. + + [ Thomas Girard ] + * Add watch file. + * Fix typo in omnievents package description. Thanks to Pascal De Vuyst + for the report. Closes: #557829. + * Acknowledge NMU patch for #541249. Thanks to Petter Reinholdtsen for the + patch. Closes: #547545. + * Acknowledge NMU patch for #504864. Thanks, David Paleino! + * Bump Standards-Version: to 3.8.3. + * Switch debhelper level to 7. + * Add ${misc:Depends} where appropriate. + * Bump Standards-Version: to 3.9.2. + * Integrate patch from Ubuntu, thanks Stefan Wehner. Addresses: LP#705020. + * Drop obsolete Conflicts:/Replaces: + + -- Thomas Girard Mon, 02 May 2011 23:37:51 +0200 + +omnievents (1:2.6.2-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with GCC 4.4, added missing #includes, thanks to Martin + Michlmayr (Closes: #504864) + + -- David Paleino Mon, 21 Dec 2009 17:05:30 +0100 + +omnievents (1:2.6.2-1.1) unstable; urgency=low + + * Non-maintainer upload to fix release goal. + * Correct init.d script header runlevel list and dependencies. Add code + in postinst to recover systems affected by the bug (Closes: #541249). + * Correct section for libomnievents-dbg to 'debug', based on tip from + lintian. + * Add code to clean target of debian/rules to remove generated + config.log and config.status, based on tip from lintian. + + -- Petter Reinholdtsen Sun, 20 Sep 2009 17:00:14 +0200 + +omnievents (1:2.6.2-1) unstable; urgency=low + + * Package taken over by the CORBA team. + * Add myself to the Uploaders: field, and move W. Martin Borgert here. + * New upstream release; bump the epoch. + * Rename libomnieventsc2a to libomnievents2, and handle the transition. + * New package, omnievents-doc, containing manual and doxygen documentation. + * Bump debhelper level to 5, and adapt dh_strip invocation accordingly. + * Bump Standards-Version: to 3.7.3. + * Fix a typo in debian/rules binary-post-install rule. + * Fix typos on package names in Conflicts: and Replaces: fields. + * Replace ${Source-Version} with ${binary:Version}. + * Remove ${shlibs:Depends} and ${misc:Depends} from libomnievents-dev + dependencies. Add libomnieventsc2a dependency. + * Build-depend on omniorb4 >= 4.1.1. + * Rework descriptions. + * Add autotools-dev build-dependency to have cdbs copy new config.* files. + * Remove useless libomniEvents.so.2.6 symlink. + * Change libomnievents-dbg Priority: to extra. + * Fix FTBFS with g++-4.3. Thanks to Martin Michlmayr for reporting this and + providing a patch. Closes: #417459. + * Remove bashism from debian/rules. Closes: #459168. Thanks to Lucas + Nussbaum for reporting this, and to W. Martin Borgert for providing a fix. + * Generate doxygen documentation in a different directory and invoke clean: + target rather than disclean: to fix FTBFS when built twice. + Closes: #424376. Thanks to Lucas Nussbaum for reporting this. + + -- Thomas Girard Sun, 13 Jan 2008 12:39:25 +0000 + +omnievents (2.6.2.pre2-1.2) unstable; urgency=low + + * Non-maintainer upload. + * C++ allocation transition (closes: #339236) + + -- Bastian Blank Sat, 31 Dec 2005 12:22:42 +0100 + +omnievents (2.6.2.pre2-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * C++ ABI transition (closes: #332896). + + -- Luk Claes Sun, 9 Oct 2005 12:58:02 +0200 + +omnievents (2.6.2.pre2-1) unstable; urgency=medium + + * New upstream pre-release (improved stability, less crashes, + fixed race, therefore urgency=medium for sarge). + * Documentation now build from source. + * Add debug library package, as requested by users. + + -- W. Borgert Sun, 1 May 2005 11:12:02 +0000 + +omnievents (2.6.1-4) unstable; urgency=low + + * Add build dependency on omniorb4-idl (closes: #285285). + I should use pbuilder. + * Fixed a lintian error and a lintian warning. + + -- W. Borgert Mon, 13 Dec 2004 19:23:58 +0000 + +omnievents (2.6.1-3) unstable; urgency=low + + * Add build dependency on omniidl4 (closes: #284950). + + -- W. Borgert Fri, 10 Dec 2004 09:26:01 +0000 + +omnievents (2.6.1-2) unstable; urgency=low + + * Bug fix: Use upstream init and defaults file. + + -- W. Borgert Sat, 27 Nov 2004 15:57:32 +0000 + +omnievents (2.6.1-1) unstable; urgency=low + + * Initial Release (closes: #268813). + + -- W. Borgert Sat, 20 Nov 2004 17:53:19 +0000 --- omnievents-2.6.2.orig/debian/omnievents.install +++ omnievents-2.6.2/debian/omnievents.install @@ -0,0 +1,2 @@ +debian/tmp/usr/bin/ +debian/tmp/usr/sbin/ --- omnievents-2.6.2.orig/debian/compat +++ omnievents-2.6.2/debian/compat @@ -0,0 +1 @@ +5 --- omnievents-2.6.2.orig/debian/rules +++ omnievents-2.6.2/debian/rules @@ -0,0 +1,44 @@ +#!/usr/bin/make -f + +DEB_FIXPERMS_EXCLUDE=omniEvents.pc +DEB_INSTALL_DOCS_omnievents-doc=doc/omnievents.docbook.css doc/*.html dox/doc/doxygen +DEB_INSTALL_MANPAGES_omnievents=doc/man/omniEvents.8 doc/man/*.1 +DEB_DH_INSTALLINIT_ARGS="--name=omniorb-eventservice" +DEB_UPDATE_RCD_PARAMS_omnievents="defaults 90 10" +DOCBOOK=/usr/share/xml/docbook/stylesheet/nwalsh + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk + +DEB_MAKE_CLEAN_TARGET = clean + +DEB_CONFIGURE_EXTRA_FLAGS := --enable-unloadable-stubs +DEB_DH_MAKESHLIBS_ARGS := -V +DEB_DH_STRIP_ARGS := --dbg-package=libomnievents-dbg + +build/omnievents-doc:: + mkdir -p $(CURDIR)/dox/doc/doxygen + $(MAKE) -f meta.mk doc DOCBOOK=$(DOCBOOK) + +build/omnievents:: + $(MAKE) -C src oelite + cp etc/default/omniorb-eventservice \ + $(CURDIR)/debian/omnievents.omniorb-eventservice.default + cp etc/init.d/omniorb-eventservice \ + $(CURDIR)/debian/omnievents.omniorb-eventservice.init + +binary-post-install/omnievents:: + cp -f src/oelite $(CURDIR)/debian/omnievents/usr/sbin/omniEvents + +binary-post-install/libomnievents2:: + cd $(CURDIR)/debian/libomnievents2/usr/lib/ && \ + rm -f libomniEvents.so.2.6 && \ + ln -sf libomniEvents.so.2.6.2 libomniEvents.so.2 + +binary-post-install/libomnievents-dev:: + rm -f $(CURDIR)/debian/libomnievents-dev/usr/include/*.h + rm -f $(CURDIR)/debian/libomnievents-dev/usr/include/*.hh + chmod 644 $(CURDIR)/debian/libomnievents-dev/usr/lib/pkgconfig/*.pc + +clean:: + rm -Rf $(CURDIR)/dox --- omnievents-2.6.2.orig/debian/watch +++ omnievents-2.6.2/debian/watch @@ -0,0 +1,5 @@ +# Watch file for omnievents, see uscan(1) for details. + +version=3 + +opts="uversionmangle=s/_/./g" http://www.omnievents.org/download/omniEvents-([\d_]+)-src\.tar\.gz