Author: mhekkel-guest Date: 2013-05-29 09:32:53 +0000 (Wed, 29 May 2013) New Revision: 13734
Removed: trunk/packages/libzeep/trunk/debian/patches/s390-patch Modified: trunk/packages/libzeep/trunk/debian/changelog trunk/packages/libzeep/trunk/debian/control trunk/packages/libzeep/trunk/debian/patches/hurd-patch trunk/packages/libzeep/trunk/debian/patches/makefile.diff trunk/packages/libzeep/trunk/debian/patches/series trunk/packages/libzeep/trunk/debian/rules Log: updated for 3.0.0 Modified: trunk/packages/libzeep/trunk/debian/changelog =================================================================== --- trunk/packages/libzeep/trunk/debian/changelog 2013-05-28 15:03:38 UTC (rev 13733) +++ trunk/packages/libzeep/trunk/debian/changelog 2013-05-29 09:32:53 UTC (rev 13734) @@ -1,3 +1,9 @@ +libzeep (3.0.0-0) unstable; urgency=low + + * New upstream release + + -- Maarten L. Hekkelman <[email protected]> Wed, 29 May 2013 10:00:00 +0200 + libzeep (2.9.0-2) unstable; urgency=low * Work arounds for compilation failures on i386-hurd and s390 Modified: trunk/packages/libzeep/trunk/debian/control =================================================================== --- trunk/packages/libzeep/trunk/debian/control 2013-05-28 15:03:38 UTC (rev 13733) +++ trunk/packages/libzeep/trunk/debian/control 2013-05-29 09:32:53 UTC (rev 13734) @@ -3,12 +3,13 @@ Maintainer: Debian Med Packaging Team <[email protected]> Uploaders: Maarten L. Hekkelman <[email protected]>, Build-Depends: debhelper (>= 7.0.50~), - libboost-dev (>= 1.46.1), - libboost-filesystem-dev (>= 1.46.1), - libboost-system-dev (>= 1.46.1), - libboost-regex-dev (>= 1.46.1), - libboost-math-dev (>= 1.46.1), - libboost-thread-dev (>= 1.46.1) + libboost-dev (>= 1.49.0), + libboost-filesystem-dev (>= 1.49.0), + libboost-system-dev (>= 1.49.0), + libboost-regex-dev (>= 1.49.0), + libboost-math-dev (>= 1.49.0), + libboost-thread-dev (>= 1.49.0), + libboost-math-dev (>= 1.49.0) Standards-Version: 3.9.3 Section: libs Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/libzeep/trunk/ @@ -19,12 +20,13 @@ Package: libzeep-dev Section: libdevel Architecture: any -Depends: ${misc:Depends}, libzeep2.9 (= ${binary:Version}), - libboost-dev (>= 1.46.1), - libboost-filesystem-dev (>= 1.46.1), - libboost-system-dev (>= 1.46.1), - libboost-regex-dev (>= 1.46.1), - libboost-thread-dev (>= 1.46.1) +Depends: ${misc:Depends}, libzeep3.0 (= ${binary:Version}), + libboost-dev (>= 1.49.0), + libboost-filesystem-dev (>= 1.49.0), + libboost-system-dev (>= 1.49.0), + libboost-regex-dev (>= 1.49.0), + libboost-thread-dev (>= 1.49.0), + libboost-math-dev (>= 1.49.0) Description: Development files for libzeep Libzeep is a C++ library providing a validating XML parser, XML DOM tree implementation, XPath 1.0 support and code to create SOAP/REST servers as @@ -42,7 +44,7 @@ This specific package contains all files needed to develop new software using libzeep. -Package: libzeep2.9 +Package: libzeep3.0 Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Description: Library files for libzeep Modified: trunk/packages/libzeep/trunk/debian/patches/hurd-patch =================================================================== --- trunk/packages/libzeep/trunk/debian/patches/hurd-patch 2013-05-28 15:03:38 UTC (rev 13733) +++ trunk/packages/libzeep/trunk/debian/patches/hurd-patch 2013-05-29 09:32:53 UTC (rev 13734) @@ -7,7 +7,7 @@ Author: Maarten L. Hekkelman <[email protected]> --- a/src/preforked-http-server.cpp +++ b/src/preforked-http-server.cpp -@@ -40,8 +40,11 @@ +@@ -42,8 +42,11 @@ { kill(m_pid, SIGKILL); @@ -21,7 +21,7 @@ } m_io_service.stop(); -@@ -147,7 +150,11 @@ +@@ -149,7 +152,11 @@ while (count-- > 0) { Modified: trunk/packages/libzeep/trunk/debian/patches/makefile.diff =================================================================== --- trunk/packages/libzeep/trunk/debian/patches/makefile.diff 2013-05-28 15:03:38 UTC (rev 13733) +++ trunk/packages/libzeep/trunk/debian/patches/makefile.diff 2013-05-29 09:32:53 UTC (rev 13734) @@ -1,24 +1,19 @@ -Changes in makefile for distribution as a .deb --- a/makefile +++ b/makefile -@@ -4,19 +4,14 @@ - # Distributed under the Boost Software License, Version 1.0. - # (See accompanying file LICENSE_1_0.txt or copy at - # http://www.boost.org/LICENSE_1_0.txt) --# --# You may have to edit the first three defines on top of this --# makefile to match your current installation. +@@ -8,16 +8,13 @@ + # You may have to edit the first three defines on top of this + # makefile to match your current installation. + +-#BOOST_LIB_SUFFIX = # e.g. '-mt' +-#BOOST = $(HOME)/projects/boost +-BOOST_LIB_DIR = $(BOOST:%=%/lib) +-BOOST_INC_DIR = $(BOOST:%=%/include) - --#BOOST_LIB_SUFFIX = # e.g. '-mt' --BOOST_LIB_DIR = $(HOME)/projects/boost-1.48/lib --BOOST_INC_DIR = $(HOME)/projects/boost-1.48/include -- -PREFIX ?= /usr/local -LIBDIR ?= $(PREFIX)/lib -INCDIR ?= $(PREFIX)/include -MANDIR ?= $(PREFIX)/man/man3 -DOCDIR ?= $(PREFIX)/share/libzeep -+ +LIBDIR = $(DESTDIR)/usr/lib +INCDIR = $(DESTDIR)/usr/include +MANDIR = $(DESTDIR)/usr/share/man/man3 @@ -29,22 +24,20 @@ BOOST_LIBS = system thread filesystem regex math_c99 BOOST_LIBS := $(BOOST_LIBS:%=boost_%$(BOOST_LIB_SUFFIX)) -@@ -30,10 +25,10 @@ - SO_NAME = libzeep.so.$(VERSION_MAJOR) +@@ -32,10 +29,8 @@ LIB_NAME = $(SO_NAME).$(VERSION_MINOR) --CC ?= c++ --CFLAGS += -O2 $(BOOST_INC_DIR:%=-I%) -I. -fPIC -pthread -shared # -std=c++0x + CXX ?= c++ +-CFLAGS += -O2 $(BOOST_INC_DIR:%=-I%) -I. -fPIC -pthread -shared -std=c++0x -#CFLAGS += -g $(BOOST_INC_DIR:%=-I%) -I. -fPIC -pthread -shared # -std=c++0x -CFLAGS += -Wall -+CXX ?= c++ -+CXXFLAGS += -O2 $(BOOST_INC_DIR:%=-I%) -I. -fPIC -pthread -shared # -std=c++0x -+#CXXFLAGS += -g $(BOOST_INC_DIR:%=-I%) -I. -fPIC -pthread -shared # -std=c++0x -+CXXFLAGS += -Wall +-CFLAGS += -g ++CXXFLAGS += -O2 -I. -fPIC -pthread -shared -std=c++0x ++CXXFLAGS += -Wall VPATH += src -@@ -56,13 +51,13 @@ +@@ -59,7 +54,7 @@ obj/xpath.o \ obj/writer.o @@ -53,23 +46,7 @@ libzeep.a: $(OBJECTS) ld -r -o $@ $(OBJECTS) - - $(LIB_NAME): $(OBJECTS) -- $(CC) -shared -o $@ -Wl,-soname=$(SO_NAME) $(LDFLAGS) $(OBJECTS) -+ $(CXX) -shared -o $@ -Wl,-soname=$(SO_NAME) $(LDFLAGS) $(OBJECTS) - - $(SO_NAME): $(LIB_NAME) - ln -fs $(LIB_NAME) $@ -@@ -72,7 +67,7 @@ - - # assuming zeep-test is build when install was not done already - zeep-test: zeep-test.cpp libzeep.a -- $(CC) -I$(BOOST_INC_DIR) -o $@ -I. zeep-test.cpp libzeep.a $(LDFLAGS) -+ $(CXX) -I$(BOOST_INC_DIR) -o $@ -I. zeep-test.cpp libzeep.a $(LDFLAGS) - - install-libs: libzeep.so - install -d $(LIBDIR) -@@ -109,8 +104,6 @@ +@@ -112,8 +107,6 @@ for d in . images libzeep zeep zeep/http zeep/http/preforked_server_base zeep/http/el \ zeep/http/el/object zeep/xml zeep/xml/doctype zeep/xml/container zeep/xml/element \ index; do install -d $(DOCDIR)/$$d; install doc/html/$$d/*.* $(DOCDIR)/$$d; done; @@ -78,11 +55,11 @@ ln -Tfs $(LIB_NAME) $(LIBDIR)/libzeep.so install: install-libs install-dev -@@ -125,7 +118,7 @@ +@@ -128,7 +121,7 @@ cp $(DIST_NAME).tgz ../ppa/libzeep_$(VERSION).orig.tar.gz obj/%.o: %.cpp | obj -- $(CC) -MD -c -o $@ $< $(CFLAGS) +- $(CXX) -MD -c -o $@ $< $(CFLAGS) + $(CXX) -MD -c -o $@ $< $(CXXFLAGS) obj: Deleted: trunk/packages/libzeep/trunk/debian/patches/s390-patch =================================================================== --- trunk/packages/libzeep/trunk/debian/patches/s390-patch 2013-05-28 15:03:38 UTC (rev 13733) +++ trunk/packages/libzeep/trunk/debian/patches/s390-patch 2013-05-29 09:32:53 UTC (rev 13734) @@ -1,47 +0,0 @@ -Description: assorted fixes - [Maarten L. Hekkelman <[email protected]>] - * Fixed compilation failure by not returning size_t but uint64. Should - be fixed in upstream by a better solution. - . - Upstream is aware of this patch. -Author: Maarten L. Hekkelman <[email protected]> ---- a/src/webapp-el.cpp -+++ b/src/webapp-el.cpp -@@ -175,7 +175,7 @@ - os << ']'; - } - virtual int compare(object_impl* rhs) const; -- virtual size_t count() const { return m_v.size(); } -+ virtual uint64 count() const { return m_v.size(); } - - virtual detail::object_iterator_impl* - create_iterator(bool begin) const -@@ -619,7 +619,7 @@ - return result; - } - --size_t object::count() const -+uint64 object::count() const - { - if (type() != array_type) - throw exception("count/length is only defined for array types"); ---- a/zeep/http/webapp/el.hpp -+++ b/zeep/http/webapp/el.hpp -@@ -114,7 +114,7 @@ - object& operator[](const char* name); - object& operator[](uint32 ix); - -- size_t count() const; -+ uint64 count() const; - bool empty() const; - - bool operator<(const object& rhs) const; -@@ -331,7 +331,7 @@ - { - public: - -- virtual size_t count() const = 0; -+ virtual uint64 count() const = 0; - - virtual object_iterator_impl* - create_iterator(bool begin) const = 0; Modified: trunk/packages/libzeep/trunk/debian/patches/series =================================================================== --- trunk/packages/libzeep/trunk/debian/patches/series 2013-05-28 15:03:38 UTC (rev 13733) +++ trunk/packages/libzeep/trunk/debian/patches/series 2013-05-29 09:32:53 UTC (rev 13734) @@ -1,3 +1,2 @@ hurd-patch makefile.diff -s390-patch Modified: trunk/packages/libzeep/trunk/debian/rules =================================================================== --- trunk/packages/libzeep/trunk/debian/rules 2013-05-28 15:03:38 UTC (rev 13733) +++ trunk/packages/libzeep/trunk/debian/rules 2013-05-29 09:32:53 UTC (rev 13734) @@ -11,7 +11,7 @@ .PHONY: override_dh_auto_install override_dh_auto_install: - $(MAKE) DESTDIR=$(CURDIR)/debian/libzeep2.9 install-libs + $(MAKE) DESTDIR=$(CURDIR)/debian/libzeep3.0 install-libs $(MAKE) DESTDIR=$(CURDIR)/debian/libzeep-dev install-dev .PHONY: get-orig-source _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
