[Pkg-samba-maint] r2961 - in trunk/openchange: . debian

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2009-07-18 14:56:08 +0000 (Sat, 18 Jul 2009)
New Revision: 2961

Added:
   trunk/openchange/debian/libmapi++-dev.examples
   trunk/openchange/debian/libmapi-dev.examples
   trunk/openchange/debian/libocpf0.examples
Modified:
   trunk/openchange/Makefile
   trunk/openchange/configure.ac
   trunk/openchange/debian/rules
Log:
merge new upstream release, install examples.

Modified: trunk/openchange/Makefile
===================================================================
--- trunk/openchange/Makefile	2009-07-18 14:56:00 UTC (rev 2960)
+++ trunk/openchange/Makefile	2009-07-18 14:56:08 UTC (rev 2961)
@@ -841,6 +841,7 @@
 							mapiproxy/libmapiserver/libmapiserver_oxcmsg.po		\
 							mapiproxy/libmapiserver/libmapiserver_oxcnotif.po	\
 							mapiproxy/libmapiserver/libmapiserver_oxorule.po	 \
+							ndr_mapi.po				\
 							gen_ndr/ndr_exchange.po
 	@$(CC) -o $@ $(DSOOPT) -Wl,-soname,libmapiserver.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ $(LIBS)
 

Added: trunk/openchange/debian/libmapi++-dev.examples
===================================================================
--- trunk/openchange/debian/libmapi++-dev.examples	                        (rev 0)
+++ trunk/openchange/debian/libmapi++-dev.examples	2009-07-18 14:56:08 UTC (rev 2961)
@@ -0,0 +1 @@
+libmapi++/examples/*.cpp

Added: trunk/openchange/debian/libmapi-dev.examples
===================================================================
--- trunk/openchange/debian/libmapi-dev.examples	                        (rev 0)
+++ trunk/openchange/debian/libmapi-dev.examples	2009-07-18 14:56:08 UTC (rev 2961)
@@ -0,0 +1 @@
+doc/examples/*

Added: trunk/openchange/debian/libocpf0.examples
===================================================================
--- trunk/openchange/debian/libocpf0.examples	                        (rev 0)
+++ trunk/openchange/debian/libocpf0.examples	2009-07-18 14:56:08 UTC (rev 2961)
@@ -0,0 +1 @@
+libocpf/examples/*.ocpf

Modified: trunk/openchange/debian/rules
===================================================================
--- trunk/openchange/debian/rules	2009-07-18 14:56:00 UTC (rev 2960)
+++ trunk/openchange/debian/rules	2009-07-18 14:56:08 UTC (rev 2961)
@@ -1,10 +1,12 @@
 #!/usr/bin/make -f
 # By Jelmer Vernooij <jelmer at samba.org>
+#
+LDFLAGS = -Wl,--as-needed
 
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	BOOST_LIB_SUFFIX=-mt ./configure --with-fhs \
+	BOOST_LIB_SUFFIX=-mt ./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--with-modulesdir=/usr/lib/openchange \
@@ -14,7 +16,7 @@
 build: build-stamp
 build-stamp: configure
 	dh_testdir
-	$(MAKE) datadir=/usr/share/openchange all
+	$(MAKE) datadir=/usr/share/openchange LDFLAGS="$(LDFLAGS)" all
 	touch $@
 
 clean:
@@ -27,6 +29,7 @@
 
 binary-indep: build install
 	dh_installdocs -i
+	dh_installexamples -i
 	dh_installchangelogs -i
 	dh_compress -i
 	dh_fixperms -i
@@ -58,6 +61,7 @@
 
 binary-arch: build install
 	dh_installdocs -a 
+	dh_installexamples -a
 	dh_installchangelogs -a
 	dh_strip -a
 	dh_link -a