[med-svn] r13761 - in trunk/packages/libzeep/trunk/debian: . patches

[Maarten Hekkelman]

Author: mhekkel-guest
Date: 2013-05-30 06:10:49 +0000 (Thu, 30 May 2013)
New Revision: 13761

Modified:
   trunk/packages/libzeep/trunk/debian/changelog
   trunk/packages/libzeep/trunk/debian/control
   trunk/packages/libzeep/trunk/debian/patches/makefile.diff
Log:
fixes

Modified: trunk/packages/libzeep/trunk/debian/changelog
===================================================================
--- trunk/packages/libzeep/trunk/debian/changelog	2013-05-29 22:46:28 UTC (rev 13760)
+++ trunk/packages/libzeep/trunk/debian/changelog	2013-05-30 06:10:49 UTC (rev 13761)
@@ -1,4 +1,4 @@
-libzeep (3.0.0-0) unstable; urgency=low
+libzeep (3.0.0-1) unstable; urgency=low
 
   * New upstream release
 

Modified: trunk/packages/libzeep/trunk/debian/control
===================================================================
--- trunk/packages/libzeep/trunk/debian/control	2013-05-29 22:46:28 UTC (rev 13760)
+++ trunk/packages/libzeep/trunk/debian/control	2013-05-30 06:10:49 UTC (rev 13761)
@@ -8,8 +8,7 @@
                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)
+               libboost-thread-dev (>= 1.49.0)
 Standards-Version: 3.9.3
 Section: libs
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/libzeep/trunk/
@@ -25,8 +24,7 @@
          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)
+         libboost-thread-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

Modified: trunk/packages/libzeep/trunk/debian/patches/makefile.diff
===================================================================
--- trunk/packages/libzeep/trunk/debian/patches/makefile.diff	2013-05-29 22:46:28 UTC (rev 13760)
+++ trunk/packages/libzeep/trunk/debian/patches/makefile.diff	2013-05-30 06:10:49 UTC (rev 13761)
@@ -1,6 +1,6 @@
 --- a/makefile
 +++ b/makefile
-@@ -8,16 +8,13 @@
+@@ -8,16 +8,14 @@
  # You may have to edit the first three defines on top of this
  # makefile to match your current installation.
  
@@ -20,11 +20,12 @@
 +DOCDIR				= $(DESTDIR)/usr/share/doc/libzeep-dev
 +
 +CXXFLAGS            := $(shell dpkg-buildflags --get CXXFLAGS)
++CXXFLAGS            += $(shell dpkg-buildflags --get CPPFLAGS)
 +LDFLAGS             := $(shell dpkg-buildflags --get LDFLAGS)
  
  BOOST_LIBS			= system thread filesystem regex math_c99
  BOOST_LIBS			:= $(BOOST_LIBS:%=boost_%$(BOOST_LIB_SUFFIX))
-@@ -32,10 +29,8 @@
+@@ -32,10 +30,8 @@
  LIB_NAME			= $(SO_NAME).$(VERSION_MINOR)
  
  CXX					?= c++
@@ -37,7 +38,7 @@
  
  VPATH += src
  
-@@ -59,7 +54,7 @@
+@@ -59,7 +55,7 @@
  	obj/xpath.o \
  	obj/writer.o
  
@@ -46,7 +47,7 @@
  
  libzeep.a: $(OBJECTS)
  	ld -r -o $@ $(OBJECTS)
-@@ -112,8 +107,6 @@
+@@ -112,8 +108,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;
@@ -55,7 +56,7 @@
  	ln -Tfs $(LIB_NAME) $(LIBDIR)/libzeep.so
  
  install: install-libs install-dev
-@@ -128,7 +121,7 @@
+@@ -128,7 +122,7 @@
  	cp $(DIST_NAME).tgz ../ppa/libzeep_$(VERSION).orig.tar.gz
  
  obj/%.o: %.cpp | obj
@@ -64,3 +65,12 @@
  
  obj:
  	mkdir -p obj
+@@ -137,8 +131,5 @@
+ 
+ $(OBJECTS:.o=.d):
+ 
+-test: libzeep.a
+-	make -C tests
+-
+ clean:
+ 	rm -rf obj/* libzeep.a libzeep.so* zeep-test $(DIST_NAME) $(DIST_NAME).tgz