--- zeroc-icee-1.2.0.orig/debian/changelog +++ zeroc-icee-1.2.0/debian/changelog @@ -0,0 +1,127 @@ +zeroc-icee (1.2.0-6) unstable; urgency=low + + * Fixed versioned dependency of zeroc-icee on libicee-java to match + icee-translators instead of libicee-dev (Closes: #496493). + + -- Francisco Moya Mon, 25 Aug 2008 12:15:25 +0200 + +zeroc-icee (1.2.0-5) unstable; urgency=low + + * Reorganization to reduce the packaging overhead. A single package for + runtime libraries + * Remove the unsatisfiable build dependency on icecpp (Closes: #487038) + + -- Francisco Moya Thu, 07 Aug 2008 22:23:40 +0200 + +zeroc-icee (1.2.0-4) unstable; urgency=low + + * Added missing includes to fix FTBFS with gcc4.3 (Closes: #455338) + + -- Francisco Moya Thu, 13 Dec 2007 14:17:05 +0100 + +zeroc-icee (1.2.0-3) unstable; urgency=low + + * Honor previous DEB_BUILD_OPTIONS contents (Closes: #438373) + + -- Francisco Moya Thu, 16 Aug 2007 16:26:58 +0200 + +zeroc-icee (1.2.0-2) unstable; urgency=low + + * Fixed FTBS if built twice in a row (Closes: #424079) + + -- Francisco Moya Wed, 16 May 2007 11:31:35 +0200 + +zeroc-icee (1.2.0-1) unstable; urgency=low + + * New upstream release + + -- Francisco Moya Sat, 12 May 2007 22:15:18 +0200 + +zeroc-icee (1.1.0-11) unstable; urgency=low + + * Added missing hunk from Martin Michlmayr patch (Closes: #417787) + + -- Francisco.Moya Wed, 11 Apr 2007 11:36:35 +0200 + +zeroc-icee (1.1.0-10) unstable; urgency=low + + * Fixed FTBS bug with gcc 4.3 by Martin Michlmayr (Closes: #417787) + + -- Francisco Moya Sun, 8 Apr 2007 20:46:33 +0200 + +zeroc-icee (1.1.0-9) unstable; urgency=low + + * Fixed FTBS bug due to missing compilation flags (Closes: #415886) + + -- Francisco Moya Thu, 22 Mar 2007 19:30:39 +0100 + +zeroc-icee (1.1.0-8) unstable; urgency=low + + * Trying hack to compile on GNU/kFreeBSD and GNU + + -- Francisco Moya Thu, 22 Mar 2007 01:57:07 +0100 + +zeroc-icee (1.1.0-7) unstable; urgency=low + + * Removed unneeded dependency on sparc inline code (Closes: #400916). + + -- Francisco Moya Sun, 03 Dec 2006 23:24:07 +0100 + +zeroc-icee (1.1.0-6) unstable; urgency=low + + * Removed dependency on libicee-midp (Closes: #393798). + + -- Francisco Moya Fri, 20 Oct 2006 12:46:13 +0200 + +zeroc-icee (1.1.0-5) unstable; urgency=low + + * Packaging improvements (watch file). + * Fixed intallation directory on AMD64 (Closes: #388472). + + -- Francisco Moya Mon, 25 Sep 2006 05:36:32 +0200 + +zeroc-icee (1.1.0-4) unstable; urgency=low + + * Fixed packaging bugs for IceE 1.1. + + -- Francisco Moya Fri, 14 Apr 2006 12:48:12 +0200 + +zeroc-icee (1.1.0-3) unstable; urgency=low + + * Compilation fixes for GNU g++ 4.1 (Closes: #361335). + + -- Francisco Moya Thu, 13 Apr 2006 14:01:52 +0200 + +zeroc-icee (1.1.0-2) unstable; urgency=low + + * Included patch by LaMont Jones to support all + linux/glibc architectures (Closes: #361595) (Closes: #361194). + + -- Francisco Moya Thu, 13 Apr 2006 12:59:30 +0200 + +zeroc-icee (1.1.0-1) unstable; urgency=low + + * New upstream release + + -- Francisco Moya Tue, 14 Mar 2006 10:41:27 +0100 + +zeroc-icee (1.0.0-3) unstable; urgency=low + + * Corrected some Debian policy violations + + -- Francisco Moya Mon, 9 Jan 2006 19:33:23 +0100 + +zeroc-icee (1.0.0-2) unstable; urgency=low + + * Corrected slice installation directory + + -- Francisco Moya Wed, 28 Dec 2005 18:50:25 +0100 + +zeroc-icee (1.0.0-1) unstable; urgency=low + + * Initial release + + * Upload sponsored by Jose M. Moya (closes #343827) + + -- Francisco Moya Sat, 19 Nov 2005 23:39:12 +0100 + --- zeroc-icee-1.2.0.orig/debian/compat +++ zeroc-icee-1.2.0/debian/compat @@ -0,0 +1 @@ +4 --- zeroc-icee-1.2.0.orig/debian/copyright +++ zeroc-icee-1.2.0/debian/copyright @@ -0,0 +1,42 @@ +This package was debianized by Paco Moya on Sat, 6 +Aug 2005 10:49:04 +0200. + +It was downloaded from http://www.zeroc.com/ + +ZeroC IceE package is distributed as a whole under the GPL version 2 +with a special exception to allow linking against Orca. + +--- ICEE_LICENSE --------------------------------------------------------- + +Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. + +This copy of Ice-E is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 2 +as published by the Free Software Foundation. + +Ice-E 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. + +The GNU General Public License is often shipped with GNU software, and +is generally kept in a file called COPYING or LICENSE. If you do not +have a copy of the license, write to the Free Software Foundation, 51 +Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +In addition, as a special exception, ZeroC, Inc. gives permission to +link Ice-E with any Orca library (http://orca-robotics.sourceforge.net/) +licensed under the GNU Lesser General Public License (LGPL), version +2.1 (http://www.gnu.org/licenses/lgpl.html) and distribute linked +combinations of Ice with any of these libraries. + +You must obey the GNU General Public License version 2 in all respects +for all of the code used other than these libraries. If you modify +this copy of Ice-E, you may extend this exception to your version of +Ice, but you are not obligated to do so. If you do not wish to do so, +delete this exception statement from your version. + +--- end of ICE_LICENSE -------------------------------------------------- + +On Debian systems, the complete text of the GNU General +Public License can be found in /usr/share/common-licenses/GPL-2. --- zeroc-icee-1.2.0.orig/debian/icee-slice.install +++ zeroc-icee-1.2.0/debian/icee-slice.install @@ -0,0 +1,2 @@ +usr/share/slice + --- zeroc-icee-1.2.0.orig/debian/libicee-dev.install +++ zeroc-icee-1.2.0/debian/libicee-dev.install @@ -0,0 +1,4 @@ +usr/include/*/* +usr/lib/*.a +usr/lib/*.so + --- zeroc-icee-1.2.0.orig/debian/libicee12.install +++ zeroc-icee-1.2.0/debian/libicee12.install @@ -0,0 +1,3 @@ +usr/lib/libIceE.so.* +usr/lib/libIceEC.so.* + --- zeroc-icee-1.2.0.orig/debian/rules +++ zeroc-icee-1.2.0/debian/rules @@ -0,0 +1,28 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +DEB_MAKE_CLEAN_TARGET := clean +DEB_MAKE_BUILD_TARGET := all prefix=/usr +DEB_MAKE_INSTALL_TARGET := install prefix=$(CURDIR)/debian/tmp/usr install_slicedir=$(CURDIR)/debian/tmp/usr/share/slice +DEB_MAKE_CHECK_TARGET := +DEB_BUILD_OPTIONS += nocheck +DEB_DH_INSTALL_SOURCEDIR := debian/tmp + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/makefile.mk + +DEB_MAKE_INVOKE := $(DEB_MAKE_ENVVARS) make OPTIMIZE_SPEED=yes LDPLATFORMFLAGS= LP64=yes lp64suffix= UNAME=$(shell uname | tr '/' '_') + +pre-build:: + -mkdir -p debian/tmp/usr/share lib bin + ln -sf Make.rules.Linux config/Make.rules.GNU_kFreeBSD + ln -sf Make.rules.Linux config/Make.rules.GNU + +binary-install/icee-slice:: + chmod a-x debian/icee-slice/usr/share/slice/*/*.ice + +clean:: + $(RM) config/Make.rules.GNU + $(RM) config/Make.rules.GNU_kFreeBSD + --- zeroc-icee-1.2.0.orig/debian/watch +++ zeroc-icee-1.2.0/debian/watch @@ -0,0 +1,3 @@ +# watch file for uscan +version=2 +http://www.zeroc.com/icee/download.html#src (?:.*/)?IceE-?_?([\w+\d+\.]+|\d+)(?:\.tar|\.tgz)(?:\.gz|\.bz2|) debian uupdate --- zeroc-icee-1.2.0.orig/debian/control +++ zeroc-icee-1.2.0/debian/control @@ -0,0 +1,47 @@ +Source: zeroc-icee +Section: libs +Priority: optional +Maintainer: Francisco Moya +Build-Depends: cdbs (>= 0.4.43), debhelper (>= 4.2.0), + icee-translators (>= 1.2.0) +Standards-Version: 3.8.0 +Homepage: http://www.zeroc.com/ + +Package: zeroc-icee +Architecture: all +Section: devel +Depends: libicee-dev (>= ${binary:Version}), libicee-java (>= + 1.2.0), icee-slice (>= ${binary:Version}), + icee-translators (>= 1.2.0) +Description: Embedded edition of the ZeroC Ice + ZeroC Ice is a CORBA-like middleware solution. IceE is a subset of + Ice used in embedded systems. This is a dummy package that depends + on the full set of IceE packages. + +Package: libicee12 +Architecture: any +Section: libs +Replaces: libiceec12 +Conflicts: libiceec12 +Depends: ${shlibs:Depends} +Description: ZeroC IceE for C++ server runtime libraries + ZeroC Ice is a CORBA-like middleware solution. IceE is a subset of + Ice used in embedded systems. This package installs the runtime + libraries needed for IceE C++ programs. + +Package: libicee-dev +Architecture: any +Section: libdevel +Depends: libicee12 (= ${binary:Version}), ${shlibs:Depends} +Description: ZeroC IceE for C++ development libraries + ZeroC Ice is a CORBA-like middleware solution. IceE is a subset of + Ice used in embedded systems. This package installs the development + libraries and include files needed for IceE C++ development. + +Package: icee-slice +Architecture: all +Section: devel +Description: Slice definitions for ZeroC IceE services + ZeroC Ice is a CORBA-like middleware solution. IceE is a subset of + Ice used in embedded systems. This package installs the Slice + definitions of standard IceE services on /usr/share/slice. --- zeroc-icee-1.2.0.orig/debian/patches/10-add-common-flags.patch +++ zeroc-icee-1.2.0/debian/patches/10-add-common-flags.patch @@ -0,0 +1,36 @@ +diff -Nur zeroc-icee-1.2.0/config/Make.rules.GNU zeroc-icee-1.2.0.new/config/Make.rules.GNU +--- zeroc-icee-1.2.0/config/Make.rules.GNU 2007-05-08 21:54:16.000000000 +0200 ++++ zeroc-icee-1.2.0.new/config/Make.rules.GNU 2007-05-12 23:43:57.000000000 +0200 +@@ -65,7 +65,7 @@ + lp64suffix = 64 + endif + +-CXXFLAGS = $(CXXARCHFLAGS) -ftemplate-depth-128 -Wall -D_REENTRANT ++CXXFLAGS = $(CXXARCHFLAGS) -ftemplate-depth-128 -Wall -D_REENTRANT -DHAVE_ENDIAN_H -DHAVE_LIMITS_H + + ifeq ($(STATICLIBS),) + CXXFLAGS += -fPIC +diff -Nur zeroc-icee-1.2.0/config/Make.rules.GNU_kFreeBSD zeroc-icee-1.2.0.new/config/Make.rules.GNU_kFreeBSD +--- zeroc-icee-1.2.0/config/Make.rules.GNU_kFreeBSD 2007-05-08 21:54:16.000000000 +0200 ++++ zeroc-icee-1.2.0.new/config/Make.rules.GNU_kFreeBSD 2007-05-12 23:43:57.000000000 +0200 +@@ -65,7 +65,7 @@ + lp64suffix = 64 + endif + +-CXXFLAGS = $(CXXARCHFLAGS) -ftemplate-depth-128 -Wall -D_REENTRANT ++CXXFLAGS = $(CXXARCHFLAGS) -ftemplate-depth-128 -Wall -D_REENTRANT -DHAVE_ENDIAN_H -DHAVE_LIMITS_H + + ifeq ($(STATICLIBS),) + CXXFLAGS += -fPIC +diff -Nur zeroc-icee-1.2.0/config/Make.rules.Linux zeroc-icee-1.2.0.new/config/Make.rules.Linux +--- zeroc-icee-1.2.0/config/Make.rules.Linux 2007-05-08 21:54:16.000000000 +0200 ++++ zeroc-icee-1.2.0.new/config/Make.rules.Linux 2007-05-12 23:43:57.000000000 +0200 +@@ -65,7 +65,7 @@ + lp64suffix = 64 + endif + +-CXXFLAGS = $(CXXARCHFLAGS) -ftemplate-depth-128 -Wall -D_REENTRANT ++CXXFLAGS = $(CXXARCHFLAGS) -ftemplate-depth-128 -Wall -D_REENTRANT -DHAVE_ENDIAN_H -DHAVE_LIMITS_H + + ifeq ($(STATICLIBS),) + CXXFLAGS += -fPIC --- zeroc-icee-1.2.0.orig/debian/patches/10-endian-limits.patch +++ zeroc-icee-1.2.0/debian/patches/10-endian-limits.patch @@ -0,0 +1,37 @@ +diff -Nur zeroc-icee-1.2.0/include/IceE/Config.h zeroc-icee-1.2.0.new/include/IceE/Config.h +--- zeroc-icee-1.2.0/include/IceE/Config.h 2007-05-10 01:39:59.000000000 +0200 ++++ zeroc-icee-1.2.0.new/include/IceE/Config.h 2007-05-12 23:38:57.000000000 +0200 +@@ -96,7 +96,16 @@ + // Most CPUs support only one endianness, with the notable exceptions + // of Itanium (IA64) and MIPS. + // +-#if defined(__i386) || defined(_M_IX86) || defined (__x86_64) || \ ++#if defined(HAVE_ENDIAN_H) ++# include ++# if __BYTE_ORDER==__LITTLE_ENDIAN ++# define ICE_LITTLE_ENDIAN ++# elif __BYTE_ORDER==__BIG_ENDIAN ++# define ICE_BIG_ENDIAN ++# else ++# error "Unknown endian type" ++# endif ++#elif defined(__i386) || defined(_M_IX86) || defined (__x86_64) || \ + defined (_M_ARM) || defined(__MIPSEL__) || defined (__ARMEL__) + # define ICE_LITTLE_ENDIAN + #elif defined(__sparc) || defined(__sparc__) || defined(__hppa) || \ +@@ -109,7 +118,14 @@ + // + // 32 or 64 bit mode? + // +-#if defined(__linux) && defined(__sparc__) ++#if defined(HAVE_LIMITS_H) ++# include ++# if __WORDSIZE == 64 ++# define ICE_64 ++# else ++# define ICE_32 ++# endif ++#elif defined(__linux) && defined(__sparc__) + // + // We are a linux sparc, which forces 32 bit usr land, no matter the architecture + // --- zeroc-icee-1.2.0.orig/debian/patches/10-gcc4.3-compilation.patch +++ zeroc-icee-1.2.0/debian/patches/10-gcc4.3-compilation.patch @@ -0,0 +1,24 @@ +diff --git a/include/IceE/Connection.h b/include/IceE/Connection.h +index 85556b3..120bc47 100755 +--- a/include/IceE/Connection.h ++++ b/include/IceE/Connection.h +@@ -31,6 +31,7 @@ + #include // For ThreadPerConnection. + #include + #include ++#include + + namespace IceInternal + { +diff --git a/include/IceE/Outgoing.h b/include/IceE/Outgoing.h +index 6b7242f..4996ffb 100644 +--- a/include/IceE/Outgoing.h ++++ b/include/IceE/Outgoing.h +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + namespace Ice + {