libsoup r1209 - branches/gnome-2-24

[danw svn gnome org]

Author: danw
Date: Mon Nov 24 20:02:37 2008
New Revision: 1209
URL: http://svn.gnome.org/viewvc/libsoup?rev=1209&view=rev

Log:
	* configure.in: 2.24.2

	* NEWS: update


Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/NEWS
   branches/gnome-2-24/configure.in
   branches/gnome-2-24/gtk-doc.make

Modified: branches/gnome-2-24/NEWS
==============================================================================
--- branches/gnome-2-24/NEWS	(original)
+++ branches/gnome-2-24/NEWS	Mon Nov 24 20:02:37 2008
@@ -1,3 +1,12 @@
+Changes in libsoup from 2.24.1 to 2.24.2:
+
+	* Fixed two bugs and a memory leak in cookie handling
+
+	* Added G_BEGIN_DECLS/G_END_DECLS to those public headers that
+          were missing them
+
+	* Minor updates to gtk-docs
+
 Changes in libsoup from 2.24.0.1 to 2.24.1:
 
 	* Fixed a crash when unreffing the session from a

Modified: branches/gnome-2-24/configure.in
==============================================================================
--- branches/gnome-2-24/configure.in	(original)
+++ branches/gnome-2-24/configure.in	Mon Nov 24 20:02:37 2008
@@ -3,7 +3,7 @@
 dnl *******************************************
 
 AC_PREREQ(2.53)
-AC_INIT(libsoup, 2.24.1)
+AC_INIT(libsoup, 2.24.2)
 AC_CONFIG_SRCDIR(libsoup.pc.in)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 

Modified: branches/gnome-2-24/gtk-doc.make
==============================================================================
--- branches/gnome-2-24/gtk-doc.make	(original)
+++ branches/gnome-2-24/gtk-doc.make	Mon Nov 24 20:02:37 2008
@@ -5,11 +5,11 @@
 ####################################
 
 if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 endif
 
 # We set GPATH here; this gives us semantics for GNU make
@@ -128,7 +128,7 @@
 	cd $(srcdir) && rm -rf xml html
 
 install-data-local:
-	installfiles=`echo $(srcdir)/html/*`; \
+	-installfiles=`echo $(srcdir)/html/*`; \
 	if test "$$installfiles" = '$(srcdir)/html/*'; \
 	then echo '-- Nothing to install' ; \
 	else \
@@ -139,8 +139,8 @@
 	  done; \
 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
-	  (which gtkdoc-rebase >& /dev/null && \
-            gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || : ; \
+	  which gtkdoc-rebase >/dev/null && \
+	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
 	fi
 	
 
@@ -165,8 +165,8 @@
 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
 	-cp $(srcdir)/xml/*.xml $(distdir)/xml
 	cp $(srcdir)/html/* $(distdir)/html
-	cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-	cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
 	cd $(distdir) && rm -f $(DISTCLEANFILES)
 	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html