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

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2009-07-01 12:08:47 +0000 (Wed, 01 Jul 2009)
New Revision: 2927

Modified:
   trunk/openchange/ChangeLog
   trunk/openchange/Makefile
   trunk/openchange/config.mk.in
   trunk/openchange/debian/changelog
Log:
New upstream snapshot.

Modified: trunk/openchange/ChangeLog
===================================================================
--- trunk/openchange/ChangeLog	2009-06-30 21:00:34 UTC (rev 2926)
+++ trunk/openchange/ChangeLog	2009-07-01 12:08:47 UTC (rev 2927)
@@ -1,3 +1,12 @@
+2009-06-21
+    jelmer
+	[r1365]
+		Fix typo in Python variable name.
+	[r1364]
+		Keep separate flags for libraries around in config.mk.
+	[r1362]
+		Link libmapiserver against all libraries.
+
 2009-06-18
     jkerihuel
 	[r1357]

Modified: trunk/openchange/Makefile
===================================================================
--- trunk/openchange/Makefile	2009-06-30 21:00:34 UTC (rev 2926)
+++ trunk/openchange/Makefile	2009-07-01 12:08:47 UTC (rev 2927)
@@ -841,7 +841,7 @@
 							mapiproxy/libmapiserver/libmapiserver_oxcmsg.po		\
 							mapiproxy/libmapiserver/libmapiserver_oxcnotif.po	\
 							mapiproxy/libmapiserver/libmapiserver_oxorule.po	
-	@$(CC) -o $@ $(DSOOPT) -Wl,-soname,libmapiserver.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^
+	@$(CC) -o $@ $(DSOOPT) -Wl,-soname,libmapiserver.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ $(LIBS)
 
 mapiproxy/libmapiserver.$(SHLIBEXT).$(LIBMAPISERVER_SO_VERSION): libmapiserver.$(SHLIBEXT).$(PACKAGE_VERSION)
 	ln -fs $< $@

Modified: trunk/openchange/config.mk.in
===================================================================
--- trunk/openchange/config.mk.in	2009-06-30 21:00:34 UTC (rev 2926)
+++ trunk/openchange/config.mk.in	2009-07-01 12:08:47 UTC (rev 2927)
@@ -10,7 +10,7 @@
 PERL=@PERL@
 DOXYGEN=@DOXYGEN@
 INSTALL=@INSTALL@
-PYTHON=@PYTON@
+PYTHON=@PYTHON@
 PYTHON_CONFIG=@PYTHON_CONFIG@
 SMBTORTURE=@SMBTORTURE@
 
@@ -42,12 +42,21 @@
 # Portability hack...
 CFLAGS+=-Duint_t="unsigned int" 
 
-CFLAGS+=@SAMBA_CFLAGS@ @LDB_CFLAGS@ @TALLOC_CFLAGS@
-LIBS+=@SAMBA_LIBS@ @LDB_LIBS@ @TALLOC_LIBS@
+SAMBA_CFLAGS=@SAMBA_CFLAGS@
+SAMBA_LIBS=@SAMBA_LIBS@
+
+LDB_CFLAGS=@LDB_CFLAGS@
+LDB_LIBS=@LDB_LIBS@
+
+TALLOC_CFLAGS=@TALLOC_CFLAGS@
+TALLOC_LIBS=@TALLOC_LIBS@
+
+CFLAGS+=$(SAMBA_CFLAGS) $(LDB_CFLAGS) $(TALLOC_CFLAGS)
+LIBS+=$(SAMBA_LIBS) $(LDB_LIBS) $(TALLOC_LIBS)
 LDFLAGS+=@LDFLAGS@
 
 # Assign CFLAGS to CXXFLAGS
-CXXFLAGS=@CFLAGS@ -I. @SAMBA_CFLAGS@ @LDB_CFLAGS@ @TALLOC_CFLAGS@
+CXXFLAGS=@CFLAGS@ -I. $(SAMbA_CFLAGS) $(LDB_CFLAGS) $(TALLOC_CFLAGS)
 
 # OPENCHANGE LIBRARIES
 OC_IDL=@OC_IDL@

Modified: trunk/openchange/debian/changelog
===================================================================
--- trunk/openchange/debian/changelog	2009-06-30 21:00:34 UTC (rev 2926)
+++ trunk/openchange/debian/changelog	2009-07-01 12:08:47 UTC (rev 2927)
@@ -1,4 +1,4 @@
-openchange (1:0.8.2+svn1358-1) experimental; urgency=low
+openchange (1:0.8.2+svn1366-1) experimental; urgency=low
 
   * New upstream snapshot.
   * Build exchange2ical.