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

[Maarten Hekkelman]

Author: mhekkel-guest
Date: 2012-05-07 09:15:54 +0000 (Mon, 07 May 2012)
New Revision: 10719

Modified:
   trunk/packages/libzeep/trunk/control
   trunk/packages/libzeep/trunk/patches/makefile.diff
Log:
update

Modified: trunk/packages/libzeep/trunk/control
===================================================================
--- trunk/packages/libzeep/trunk/control	2012-05-07 08:57:59 UTC (rev 10718)
+++ trunk/packages/libzeep/trunk/control	2012-05-07 09:15:54 UTC (rev 10719)
@@ -2,16 +2,12 @@
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7.0.50~),
-               libboost1.46-dev (>= 1.46.1),
+               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),
-               doxygen,
-               xsltproc,
-               docbook-xsl,
-               docbook-xml
+               libboost-thread-dev (>= 1.46.1)
 Standards-Version: 3.9.3
 Section: libs
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/libzeep/trunk/

Modified: trunk/packages/libzeep/trunk/patches/makefile.diff
===================================================================
--- trunk/packages/libzeep/trunk/patches/makefile.diff	2012-05-07 08:57:59 UTC (rev 10718)
+++ trunk/packages/libzeep/trunk/patches/makefile.diff	2012-05-07 09:15:54 UTC (rev 10719)
@@ -1,7 +1,7 @@
 Changes in makefile for distribution as a .deb
 --- a/makefile
 +++ b/makefile
-@@ -4,18 +4,10 @@
+@@ -4,19 +4,11 @@
  # 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)
@@ -10,21 +10,23 @@
 -# makefile to match your current installation.
 -
 -#BOOST_LIB_SUFFIX	= 				# e.g. '-mt'
--BOOST_LIB_DIR		= $(HOME)/projects/boost/lib
--BOOST_INC_DIR		= $(HOME)/projects/boost/include
+-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
++DOCDIR				= $(DESTDIR)/usr/share/doc/libzeep-dev
  
  BOOST_LIBS			= system thread filesystem regex math_c99 math_c99f
  BOOST_LIBS			:= $(BOOST_LIBS:%=boost_%$(BOOST_LIB_SUFFIX))
-@@ -55,7 +47,7 @@
+@@ -56,7 +48,7 @@
  	obj/xpath.o \
  	obj/writer.o
  
@@ -33,10 +35,10 @@
  
  libzeep.a: $(OBJECTS)
  	ld -r -o $@ $(OBJECTS)
-@@ -105,8 +97,6 @@
- 	install zeep/exception.hpp $(INCDIR)/zeep/exception.hpp
- 	install zeep/server.hpp $(INCDIR)/zeep/server.hpp
- 	install doc/libzeep.3 $(MANDIR)/libzeep.3
+@@ -109,8 +101,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;
 -	install ./libzeep.a $(LIBDIR)/libzeep.a
 -	strip -SX $(LIBDIR)/libzeep.a
  	ln -Tfs $(LIB_NAME) $(LIBDIR)/libzeep.so