cleanup old stuff

index bd9389a..e2c6a0c 100644
@@ -1,6 +1,6 @@
 require dbus-glib.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "3f7f117dc7c8d899d9acfdcbf9253fb8"
 SRC_URI[sha256sum] = "297c81d6bb8b1c312e9b0ccfe91eb28ec0672756abb64dfb7bbe2b5f1ae5d111"

deleted file mode 100644
index ee004a9..0000000
@@ -1,203 +0,0 @@
-Update git.mk to the version from Pango which has parallel make fixes.
-http://git.gnome.org/browse/pango/log/git.mk
-commit 6118d5891fee776a087855c335a73c79fdaf036c
-
-RP 16/3/10
-
-Upstream-Status: Pending
-
-Index: git/git.mk
-===================================================================
---- git.orig/git.mk	2010-02-05 14:57:15.000000000 +0000
-+++ git/git.mk	2010-03-16 11:30:23.000000000 +0000
-@@ -82,97 +82,106 @@
- ### .gitignore generation
- 
- $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
--	@echo Generating $@; \
--	GTKDOCGITIGNOREFILES=; \
--	test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x || \
--	GTKDOCGITIGNOREFILES=" \
--		$(DOC_MODULE)-decl-list.txt \
--		$(DOC_MODULE)-decl.txt \
--		tmpl/$(DOC_MODULE)-unused.sgml \
--		tmpl/*.bak \
--		xml html \
--		"; \
--	GNOMEDOCUTILSGITIGNOREFILES=; \
--	test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x || \
--	GNOMEDOCUTILSGITIGNOREFILES=" \
--		$(_DOC_C_DOCS) \
--		$(_DOC_LC_DOCS) \
--		$(_DOC_OMF_ALL) \
--		$(_DOC_DSK_ALL) \
--		$(_DOC_HTML_ALL) \
--		$(_DOC_POFILES) \
--		*/.xml2po.mo \
--		*/*.omf.out \
--		"; \
--	INTLTOOLGITIGNOREFILES=; test -f $(srcdir)/po/Makefile.in.in && \
--	INTLTOOLGITIGNOREFILES=" \
--		po/Makefile.in.in \
--		po/Makefile.in \
--		po/Makefile \
--		po/*.gmo \
--		po/*.mo \
--		po/POTFILES \
--		po/stamp-it \
--		po/.intltool-merge-cache \
--		intltool-extract.in \
--		intltool-merge.in \
--		intltool-update.in \
--		"; \
--	AUTOCONFGITIGNOREFILES=; test -f $(srcdir)/configure && \
--	AUTOCONFGITIGNOREFILES=" \
--		autom4te.cache \
--		configure \
--		config.h \
--		stamp-h1 \
--		libtool \
--		config.lt \
--		"; \
--	for x in \
--		.gitignore \
--		$$GTKDOCGITIGNOREFILES \
--		$$GNOMEDOCUTILSGITIGNOREFILES \
--		$$INTLTOOLGITIGNOREFILES \
--		$$AUTOCONFGITIGNOREFILES \
--		$(GITIGNOREFILES) \
--		$(CLEANFILES) \
--		$(PROGRAMS) \
--		$(EXTRA_PROGRAMS) \
--		$(LTLIBRARIES) \
--		so_locations \
--		.libs _libs \
--		$(MOSTLYCLEANFILES) \
--		"*.$(OBJEXT)" \
--		"*.lo" \
--		$(DISTCLEANFILES) \
--		$(am__CONFIG_DISTCLEAN_FILES) \
--		$(CONFIG_CLEAN_FILES) \
--		TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
--		"*.tab.c" \
--		$(MAINTAINERCLEANFILES) \
--		$(BUILT_SOURCES) \
--		$(DEPDIR) \
--		Makefile \
--		Makefile.in \
--		"*.orig" \
--		"*.rej" \
--		"*.bak" \
--		"*~" \
--		".*.sw[nop]" \
--	; do echo /$$x; done | \
-+	$(AM_V_GEN) \
-+	{ \
-+		if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
-+			for x in \
-+				$(DOC_MODULE)-decl-list.txt \
-+				$(DOC_MODULE)-decl.txt \
-+				tmpl/$(DOC_MODULE)-unused.sgml \
-+				"tmpl/*.bak" \
-+				xml html \
-+			; do echo /$$x; done; \
-+		fi; \
-+		if test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
-+			for x in \
-+				$(_DOC_C_DOCS) \
-+				$(_DOC_LC_DOCS) \
-+				$(_DOC_OMF_ALL) \
-+				$(_DOC_DSK_ALL) \
-+				$(_DOC_HTML_ALL) \
-+				$(_DOC_POFILES) \
-+				"*/.xml2po.mo" \
-+				"*/*.omf.out" \
-+			; do echo /$$x; done; \
-+		fi; \
-+		if test -f $(srcdir)/po/Makefile.in.in; then \
-+			for x in \
-+				po/Makefile.in.in \
-+				po/Makefile.in \
-+				po/Makefile \
-+				po/POTFILES \
-+				po/stamp-it \
-+				po/.intltool-merge-cache \
-+				"po/*.gmo" \
-+				"po/*.mo" \
-+				po/$(GETTEXT_PACKAGE).pot \
-+				intltool-extract.in \
-+				intltool-merge.in \
-+				intltool-update.in \
-+			; do echo /$$x; done; \
-+		fi; \
-+		if test -f $(srcdir)/configure; then \
-+			for x in \
-+				autom4te.cache \
-+				configure \
-+				config.h \
-+				stamp-h1 \
-+				libtool \
-+				config.lt \
-+			; do echo /$$x; done; \
-+		fi; \
-+		for x in \
-+			.gitignore \
-+			$(GITIGNOREFILES) \
-+			$(CLEANFILES) \
-+			$(PROGRAMS) \
-+			$(check_PROGRAMS) \
-+			$(EXTRA_PROGRAMS) \
-+			$(LTLIBRARIES) \
-+			so_locations \
-+			.libs _libs \
-+			$(MOSTLYCLEANFILES) \
-+			"*.$(OBJEXT)" \
-+			"*.lo" \
-+			$(DISTCLEANFILES) \
-+			$(am__CONFIG_DISTCLEAN_FILES) \
-+			$(CONFIG_CLEAN_FILES) \
-+			TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
-+			"*.tab.c" \
-+			$(MAINTAINERCLEANFILES) \
-+			$(BUILT_SOURCES) \
-+			$(DEPDIR) \
-+			Makefile \
-+			Makefile.in \
-+			"*.orig" \
-+			"*.rej" \
-+			"*.bak" \
-+			"*~" \
-+			".*.sw[nop]" \
-+		; do echo /$$x; done; \
-+	} | \
- 	sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
- 	sed 's@/[.]/@/@g' | \
--	LANG=C sort | uniq > [email protected] && \
-+	LC_ALL=C sort | uniq > [email protected] && \
- 	mv [email protected] $@;
- 
--all: $(srcdir)/.gitignore gitignore-recurse
--gitignore-recurse:
-+all: $(srcdir)/.gitignore gitignore-recurse-maybe
-+gitignore-recurse-maybe:
- 	@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
--		list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
--		  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore); \
--		done; \
-+		$(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
- 	fi;
-+gitignore-recurse:
-+	@for subdir in $(DIST_SUBDIRS); do \
-+	  case " $(SUBDIRS) " in \
-+	    *" $$subdir "*) :;; \
-+	    *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
-+	  esac; \
-+	done
-+gitignore: $(srcdir)/.gitignore gitignore-recurse
-+
- maintainer-clean: gitignore-clean
- gitignore-clean:
- 	-rm -f $(srcdir)/.gitignore
--.PHONY: gitignore-clean gitignore-recurse
- 
-+.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe

deleted file mode 100644
index 493b70d..0000000
@@ -1,32 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: trunk/configure.in
-===================================================================
---- trunk.orig/configure.in	2005-09-28 17:34:08.000000000 +0000
-+++ trunk/configure.in	2005-09-28 19:13:22.000000000 +0000
-@@ -254,25 +221,6 @@
- AC_SUBST(ICONV_CFLAGS)
- AC_SUBST(ICONV_LIBS)
- 
--CFLAGS="$CFLAGS -I$srcdir"
--
--AC_MSG_CHECKING(preferred charset formats for system iconv)
--AC_TRY_RUN([
--#define CONFIGURE_IN
--#include "iconv-detect.c"
--],[
--	AC_MSG_RESULT(found)
--],[
--	AC_MSG_RESULT(not found)
--	AC_WARN([
--	*** The iconv-detect program was unable to determine the
--	*** preferred charset formats recognized by your system
--	*** iconv library. It is suggested that you install a
--	*** working iconv library such as the one found at
--	*** ftp://ftp.gnu.org/pub/gnu/libiconv
--	])
--])
--
- CFLAGS="$save_CFLAGS"
- LIBS="$save_LIBS"
- 

201 lines not on this page · raw message

96 lines not on this page · raw message

deleted file mode 100644
index ee0ce8a..0000000
@@ -1,23 +0,0 @@
-DESCRIPTION = "FarSight is an audio/video conferencing framework specifically designed for Instant Messengers."
-HOMEPAGE = "http://farsight.sf.net"
-SRC_URI = "http://farsight.freedesktop.org/releases/farsight2/${BPN}-${PV}.tar.gz"
-LICENSE = "LGPLv2.1"
-DEPENDS = "libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base"
-
-inherit autotools
-
-PR = "r2"
-
-EXTRA_OECONF = " \
-  --disable-debug \
-  --disable-gtk-doc \
-  --disable-python \
-"
-
-FILES_${PN} += "${libdir}/*/*.so"
-FILES_${PN}-dev += "${libdir}/f*/*a ${libdir}/g*/*a"
-FILES_${PN}-dbg += "${libdir}/*/.debug"
-
-
-
-

deleted file mode 100644
index 30cc7a1..0000000
@@ -1,23 +0,0 @@
-SUMMARY = "IETF draft Interactice Connectivity Establishment standard"
-DESCRIPTION = "Libnice is an implementation of the IETF's draft Interactice Connectivity Establishment standard (ICE)."
-HOMEPAGE = "http://nice.freedesktop.org/wiki/"
-SRC_URI = "http://nice.freedesktop.org/releases/libnice-${PV}.tar.gz"
-
-LICENSE = "LGPL/MPL"
-DEPENDS = "glib-2.0 gstreamer"
-
-inherit autotools
-
-FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
-FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*a"
-FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
-
-do_compile_append() {
-        for i in $(find ${S} -name "*.pc") ; do
-            sed -i -e s:${STAGING_DIR_TARGET}::g \
-                   -e s:/${TARGET_SYS}::g \
-                      $i
-        done
-}
-
-

deleted file mode 100644
index 03d8da6..0000000
@@ -1,20 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- configure.ac |    1 +
- 1 file changed, 1 insertion(+)
-
---- libetpan-0.54.orig/configure.ac
-+++ libetpan-0.54/configure.ac
-@@ -104,10 +104,11 @@ if test "$have_w32_system" = yes; then
- fi
- AM_CONDITIONAL(HAVE_MINGW32_SYSTEM, test "$have_w32_system" = yes)
- 
- # Check the C compiler.
- AC_PROG_CC
-+AC_PROG_CXX
- 
- # Compiler flags.
- AC_ARG_ENABLE(debug,   [  --enable-debug          setup flags (gcc) for debugging (default=no)],
- if test "x$GCC" = xyes; then
-   CFLAGS="$CFLAGS -O2 -g"

deleted file mode 100644
index 9b69471..0000000
@@ -1,20 +0,0 @@
-SUMMARY = "Library for communicating with mail and news services"
-DESCRIPTION = "libetpan is a library for communicating with mail and news servers. \
-It supports the protocols SMTP, POP3, IMAP and NNTP."
-HOMEPAGE = "http://www.etpan.org"
-SECTION = "libs"
-DEPENDS = "curl expat gnutls"
-LICENSE = "BSD"
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
-           file://cxx-is-here.patch;patch=1"
-
-inherit autotools pkgconfig gettext binconfig
-
-EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db"
-
-PARALLEL_MAKE = ""
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"

deleted file mode 100644
index b6af11d..0000000
@@ -1,10 +0,0 @@
-SUMMARY = "XMPP/Jabber library"
-DESCRIPTION = "Loudmouth is a lightweight and easy-to-use C library for programming with the XMPP/Jabber protocol."
-HOMEPAGE = "http://www.loudmouth-project.org/"
-LICENSE = "LGPL"
-DEPENDS = "glib-2.0 gnutls libcheck"
-PR = "r2"
-
-SRC_URI = "http://ftp.imendio.com/pub/imendio/${BPN}/src/${BPN}-${PV}.tar.bz2"
-
-inherit autotools pkgconfig

deleted file mode 100644
index ffebf2b..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: openswan-2.4.7/Makefile.inc
-===================================================================
---- openswan-2.4.7.orig/Makefile.inc	2006-12-25 18:05:40.608503250 +0100
-+++ openswan-2.4.7/Makefile.inc	2006-12-25 18:06:39.028154250 +0100
-@@ -158,7 +158,7 @@
- # how backup names are composed.
- # Note that the install procedures will never overwrite an existing config
- # file, which is why -b is not specified for them.
--INSTBINFLAGS=-b --suffix=.old
-+INSTBINFLAGS=
- INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old
- INSTMANFLAGS=
- INSTCONFFLAGS=

deleted file mode 100644
index 92f3547..0000000
@@ -1,28 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---- openswan-2.2.0.orig/programs/Makefile.program	2004-06-03 03:06:27.000000000 +0200
-+++ openswan-2.2.0/programs/Makefile.program	2005-03-05 13:50:19.000000000 +0100
-@@ -30,10 +30,6 @@
- 
- CFLAGS+= ${WERROR}
- 
--ifneq ($(LD_LIBRARY_PATH),)
--LDFLAGS=-L$(LD_LIBRARY_PATH)
--endif
--
- MANDIR8=$(MANTREE)/man8
- MANDIR5=$(MANTREE)/man5
- 
---- openswan-2.2.0.orig/programs/pluto/Makefile	2005-01-03 20:40:45.000000000 +0100
-+++ openswan-2.2.0/programs/pluto/Makefile	2005-03-05 13:51:21.000000000 +0100
-@@ -234,10 +234,6 @@
- LIBSPLUTO+=${CURL_LIBS} 
- LIBSPLUTO+= -lgmp -lresolv # -lefence
- 
--ifneq ($(LD_LIBRARY_PATH),)
--LDFLAGS=-L$(LD_LIBRARY_PATH)
--endif
--
- LIBSADNS = $(OPENSWANLIB)
- LIBSADNS += -lresolv # -lefence
- 

379 lines not on this page · raw message

deleted file mode 100644
index f783a85..0000000
@@ -1,36 +0,0 @@
-SECTION = "console/network"
-SUMMARY = "IPsec implementation"
-DESCRIPTION = "Openswan is an Open Source implementation of IPsec for the \
-Linux operating system."
-HOMEPAGE = "http://www.openswan.org"
-LICENSE = "GPLv2"
-DEPENDS = "gmp flex-native"
-RRECOMMENDS_${PN} = "kernel-module-ipsec"
-PR = "r2"
-
-SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \
-	   file://openswan-2.4.7-gentoo.patch;patch=1 \
-           file://installflags.patch;patch=1 \
-	   file://ld-library-path-breakage.patch;patch=1"
-S = "${WORKDIR}/openswan-${PV}"
-
-PARALLEL_MAKE = ""
-EXTRA_OEMAKE = "DESTDIR=${D} \
-                USERCOMPILE="${CFLAGS}" \
-                FINALCONFDIR=${sysconfdir}/ipsec \
-                INC_RCDEFAULT=${sysconfdir}/init.d \
-                INC_USRLOCAL=${prefix} \
-                INC_MANDIR=share/man WERROR=''"
-
-do_compile () {
-	oe_runmake programs
-}
-
-do_install () {
-	oe_runmake install
-}
-
-FILES_${PN} = "${sysconfdir} ${libdir}/ipsec/* ${sbindir}/* ${libexecdir}/ipsec/*"
-FILES_${PN}-dbg += "${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug"
-
-CONFFILES_${PN} = "${sysconfdir}/ipsec/ipsec.conf"

deleted file mode 100644
index fa61e15..0000000
@@ -1,20 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- cmake/OpenSyncInternal.cmake.in |    1 -
- 1 file changed, 1 deletion(-)
-
---- libopensync-0.36.orig/cmake/OpenSyncInternal.cmake.in
-+++ libopensync-0.36/cmake/OpenSyncInternal.cmake.in
-@@ -5,11 +5,10 @@ INCLUDE( OpenSyncTesting )
- INCLUDE( OpenSyncPackaging )
- INCLUDE( OpenSyncPlugin )
- INCLUDE( OpenSyncPlatforms )
- INCLUDE( MacroEnsureOutOfSourceBuild )
- 
--MACRO_ENSURE_OUT_OF_SOURCE_BUILD("${CMAKE_PROJECT_NAME} doesn't allow to build within the source directory. Please, create a seperate build directory and run 'cmake ${PROJECT_SOURCE_DIR} [options]'!")
- 
- 
- SET( OPENSYNC_PLUGINDIR "@OPENSYNC_PLUGINDIR@" )
- SET( OPENSYNC_FORMATSDIR "@OPENSYNC_FORMATSDIR@" )
- SET( OPENSYNC_PYTHON_PLUGINDIR "@OPENSYNC_PYTHON_PLUGINDIR@" )

deleted file mode 100644
index 20d09cf..0000000
@@ -1,19 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- opensync/CMakeLists.txt |    1 -
- 1 file changed, 1 deletion(-)
-
-Index: libopensync-0.37/opensync/CMakeLists.txt
-===================================================================
---- libopensync-0.37.orig/opensync/CMakeLists.txt	2008-10-15 13:56:45.000000000 +0100
-+++ libopensync-0.37/opensync/CMakeLists.txt	2008-10-15 13:59:03.000000000 +0100
-@@ -67,8 +67,6 @@
- SET_TARGET_PROPERTIES( opensync PROPERTIES VERSION ${OPENSYNC_LIBVERSION_VERSION} )
- SET_TARGET_PROPERTIES( opensync PROPERTIES SOVERSION ${OPENSYNC_LIBVERSION_SOVERSION} )
- 
--SET_TARGET_PROPERTIES( opensync PROPERTIES COMPILE_FLAGS ${SYMBOLS_VISIBILITY} )
--
- IF ( OPENSYNC_UNITTESTS )
- 	ADD_LIBRARY( opensync-testing SHARED ${libopensync_LIB_SRCS} )
- 	TARGET_LINK_LIBRARIES( opensync-testing ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${GMODULE2_LIBRARIES} ${LIBXML2_LIBRARIES}  ${LIBXSLT_LIBRARIES} ${LIBEXSLT_LIBRARIES} ${SQLITE3_LIBRARIES} )

deleted file mode 100644
index d59fddb..0000000
@@ -1,18 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- CMakeLists.txt |    1 -
- 1 file changed, 1 deletion(-)
-
-Index: libopensync-0.37/CMakeLists.txt
-===================================================================
---- libopensync-0.37.orig/CMakeLists.txt	2008-08-18 16:14:24.000000000 +0100
-+++ libopensync-0.37/CMakeLists.txt	2008-10-15 14:00:12.000000000 +0100
-@@ -65,7 +65,6 @@
- FIND_PACKAGE( LibXslt REQUIRED )
- FIND_PACKAGE( LibExslt REQUIRED )
- FIND_PACKAGE( SWIG )	
--FIND_PACKAGE( PythonLibs )
- FIND_PACKAGE( Check )
- 
- ADD_SUBDIRECTORY( opensync )

deleted file mode 100644
index 9ef0353..0000000
@@ -1,25 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: libopensync-plugin-evolution2-0.36/cmake/modules/FindOpenSync.cmake
-===================================================================
---- libopensync-plugin-evolution2-0.36.orig/cmake/modules/FindOpenSync.cmake	2008-10-20 13:07:14.000000000 +0100
-+++ libopensync-plugin-evolution2-0.36/cmake/modules/FindOpenSync.cmake	2008-10-20 13:08:09.000000000 +0100
-@@ -23,15 +23,15 @@
- ENDIF ( OpenSync_FIND_REQUIRED )
- 
- IF ( OPENSYNC_MIN_VERSION )
--	PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} opensync-1.0>=${OPENSYNC_MIN_VERSION} )
-+	PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} libopensync>=${OPENSYNC_MIN_VERSION} )
- ELSE ( OPENSYNC_MIN_VERSION )
--	PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} opensync-1.0 )
-+	PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} libopensync )
- ENDIF ( OPENSYNC_MIN_VERSION )
- 
- FIND_PROGRAM( PKGCONFIG_EXECUTABLE NAMES pkg-config )
- 
- IF ( PKGCONFIG_EXECUTABLE )
--	EXEC_PROGRAM( ${PKGCONFIG_EXECUTABLE} ARGS opensync-1.0 --variable=datadir OUTPUT_VARIABLE _opensync_data_DIR )
-+	EXEC_PROGRAM( ${PKGCONFIG_EXECUTABLE} ARGS libopensync --variable=datadir OUTPUT_VARIABLE _opensync_data_DIR )
- 	STRING( REGEX REPLACE "[\r\n]" " " _opensync_data_DIR "${_opensync_data_DIR}"  )
- ENDIF ( PKGCONFIG_EXECUTABLE )
- 

deleted file mode 100644
index 42dc4dd..0000000
@@ -1,8 +0,0 @@
-require libopensync-plugin_0.36.inc
-LICENSE = "LGPL"
-
-DEPENDS += " evolution-data-server"
-
-SRC_URI += "file://0.37-fixes.patch;patch=1"
-
-PR = "r2"

deleted file mode 100644
index 404c172..0000000
@@ -1,2 +0,0 @@
-require libopensync-plugin_0.36.inc
-LICENSE = "LGPL"

deleted file mode 100644
index dbcb2aa..0000000
@@ -1,2 +0,0 @@
-require libopensync-plugin_0.36.inc
-LICENSE = "GPLv2"

deleted file mode 100644
index cb601f2..0000000
@@ -1,4 +0,0 @@
-require libopensync-plugin_0.36.inc
-LICENSE = "GPLv2"
-
-DEPENDS += "openobex bluez4"

deleted file mode 100644
index 9e7a260..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [others]
-
-Index: libopensync-plugin-syncml-0.38/src/syncml_callbacks.c
-===================================================================
---- libopensync-plugin-syncml-0.38.orig/src/syncml_callbacks.c	2009-07-31 10:30:33.000000000 +0100
-+++ libopensync-plugin-syncml-0.38/src/syncml_callbacks.c	2009-07-31 10:30:39.000000000 +0100
-@@ -405,7 +405,7 @@
- 	} else {
- 		/* This problem should be fixed with the next SLOW-SYNC. */
- 		osync_trace(TRACE_EXIT_ERROR, "%s - unexpected Add or Replace command", __func__);
--		smlErrorSet(error, SML_ERROR_TEMPORARY, "Unwanted Add or Replace command on second OMA DS session.");
-+		smlErrorSet(error, SML_ERROR_GENERIC, "Unwanted Add or Replace command on second OMA DS session.");
- 		return FALSE;
- 	}
- }

deleted file mode 100644
index e33336f..0000000
@@ -1,8 +0,0 @@
-require libopensync-plugin_0.36.inc
-LICENSE = "LGPL"
-
-DEPENDS += " libsyncml (>= 0.4.7)"
-
-SRC_URI += "file://fixerror.patch;patch=1"
-
-PR = "r1"

deleted file mode 100644
index a7d50dc..0000000
@@ -1,4 +0,0 @@
-require libopensync-plugin_0.36.inc
-LICENSE = "LGPL"
-
-DEPENDS += "libcheck"

deleted file mode 100644
index cde4779..0000000
@@ -1,11 +0,0 @@
-DEPENDS = "libopensync (>= 0.36)"
-
-DESCRIPTION ?= "OpenSync plugin"
-
-SRC_URI = "http://opensync.org/download/releases/${PV}/${BPN}-${PV}.tar.bz2"
-
-inherit cmake
-
-FILES_${PN} += "${libdir}/opensync*/plugins/*.so \
-                ${libdir}/opensync*/formats/*.so \
-                ${datadir}/opensync*/defaults/"

deleted file mode 100644
index 437bdd2..0000000
@@ -1,26 +0,0 @@
-LICENSE = "LGPL"
-HOMEPAGE = "http://www.opensync.org/"
-SUMMARY = "Synchronization framwork"
-DESCRIPTION = "The OpenSync project is an ongoing effort to create a synchronization framework that will be a platform independent, general purpose synchronization engine utilizing modular plugins for content formats and different kind of connection types. OpenSync's modularity should allow it to be extended easily to new devices and purposes without radically changing the architecture itself, allowing it to support wide variety of devices used today and in the future."
-DEPENDS = "sqlite3 libxml2 glib-2.0 libcheck zlib libxslt"
-
-PR = "r1"
-
-SRC_URI = "http://opensync.org/download/releases/${PV}/libopensync-${PV}.tar.bz2\
-           file://cmake.patch;patch=1 \
-	   file://build-in-src.patch;patch=1 \
-	   file://no-python-check.patch;patch=1"
-
-inherit cmake pkgconfig
-
-LEAD_SONAME = "libopensync.so"
-
-FILES_${PN} += " ${libdir}/opensync*/formats/*.so \
-                 ${libdir}/opensync*/osplugin \
-                 ${datadir}/opensync*/schemas \
-                 ${datadir}/opensync*/capabilities \
-                 ${datadir}/opensync*/descriptions \
-		 "
-FILES_${PN}-dbg += " ${libdir}/opensync*/formats/.debug/*.so \
-	             ${libdir}/opensync*/.debug/osplugin "
-

deleted file mode 100644
index 4986206..0000000
@@ -1,22 +0,0 @@
-SUMMARY = "GObject-based sync library"
-DESCRIPTION = "LibSync is a GObject-based framework for more convenient use of \
-OpenSync in GLib applications."
-LICENSE = "LGPLv2"
-SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ libglade libopensync avahi"
-RRECOMMENDS_${PN} = "\
-	libopensync-plugin-file \
-	"
-SRCREV = "3f375969d56028505db97cd25ef1679a167cfc59"
-PV = "0.0+gitr${SRCPV}"
-PR = "r2"
-
-SRC_URI = "git://git.yoctoproject.org/sync;protocol=git"
-
-inherit autotools pkgconfig
-
-S = "${WORKDIR}/sync"
-
-PACKAGES += "synctool"
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_synctool = "${bindir} ${datadir}"

deleted file mode 100644
index 9947af0..0000000
@@ -1,21 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- CMakeLists.txt |    4 ----
- 1 file changed, 4 deletions(-)
-
-Index: libsyncml-0.5.4/CMakeLists.txt
-===================================================================
---- libsyncml-0.5.4.orig/CMakeLists.txt	2009-07-31 09:56:16.000000000 +0100
-+++ libsyncml-0.5.4/CMakeLists.txt	2009-07-31 09:57:33.000000000 +0100
-@@ -72,10 +72,6 @@
- CHECK_TYPE_SIZE( uint32_t UINT32_T )
- CHECK_TYPE_SIZE( uint8_t UINT8_T )
- 
--# ensure out od source build
--INCLUDE( MacroEnsureOutOfSourceBuild )
--MACRO_ENSURE_OUT_OF_SOURCE_BUILD("${CMAKE_PROJECT_NAME} doesn't allow to build within the source directory. Please, create a seperate build directory and run 'cmake ${PROJECT_SOURCE_DIR} [options]'!")
--
- # find requirements
- SET ( GLIB2_MIN_VERSION "2.12" )
- SET ( OPENOBEX_MIN_VERSION "1.1" )

deleted file mode 100644
index e96463b..0000000
@@ -1,17 +0,0 @@
-DESCRIPTION = "Libsyncml is a implementation of the SyncML protocol."
-HOMEPAGE = "http://libsyncml.opensync.org/"
-LICENSE = "LGPL"
-DEPENDS = "sed-native wbxml2 libsoup libxml2 bluez4 openobex libcheck"
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libsyncml/0.5.4/libsyncml-0.5.4.tar.bz2 \
-           file://build-in-src.patch;patch=1"
-
-inherit cmake pkgconfig
-
-PACKAGES += "${PN}-tools"
-
-FILES_${PN}-tools = "${bindir}"
-FILES_${PN} = "${libdir}/*.so.*"
-
-export VERBOSE="1"

deleted file mode 100644
index ff86a0b..0000000
@@ -1,20 +0,0 @@
-SUMMARY = "Calendar (and other PIM data) synchronization program"
-DESCRIPTION = "msynctool is a program to synchronize calendars, \
-addressbooks and other PIM data between programs on your computer and \
-other computers, mobile devices, PDAs or cell phones.  It uses the \
-OpenSync plugins when synchronizing data."
-HOMEPAGE = "http://www.opensync.org/"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://tools/msynctool.c;beginline=1;endline=20;md5=0b71ef245b75c74bff7d7ec58b9b4527"
-
-DEPENDS = "libopensync glib-2.0"
-
-SRC_URI = "http://www.opensync.org/download/releases/${PV}/msynctool-${PV}.tar.bz2"
-
-inherit cmake pkgconfig
-
-PR = "r0"
-
-SRC_URI[md5sum] = "495c45d6f12d3523a736864b0ced6ce5"
-SRC_URI[sha256sum] = "4a903d4db05bf2f677a675ec47e9791da9b1752c9feda0026157e82aa97e372b"

41 lines not on this page · raw message

deleted file mode 100644
index f4f8fae..0000000
@@ -1,29 +0,0 @@
-SUMMARY = "a Telepathy based IM client"
-DESCRIPTION = "Instant messaging program supporting text, voice, video, file \
-transfers and interapplication communication over many different protocols, \
-include: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut, \
-Gadu-Gadu, Groupwise, ICQ and QQ."
-HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0"
-LICENSE = "GPL"
-DEPENDS = "libcanberra telepathy-farsight gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade evolution-data-server"
-RDEPENDS_${PN} = "telepathy-mission-control"
-RRECOMMENDS_${PN} = "telepathy-gabble"
-PR = "r4"
-
-inherit gnome
-
-PARALLEL_MAKE = ""
-
-EXTRA_OECONF += "--disable-scrollkeeper"
-
-PACKAGES =+ "empathy-scrollkeeper-junk"
-FILES_empathy-scrollkeeper-junk = "/var/lib/scrollkeeper"
-
-FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \
-        ${datadir}/dbus-1/services/*.service \
-        ${datadir}/telepathy/managers/*.chandler \
-	${datadir}/icons \
-	${libdir}/python*"
-
-FILES_${PN}-dbg += "${libdir}/python*/*/.debug"
-

deleted file mode 100644
index 3ddee8f..0000000
@@ -1,16 +0,0 @@
-SUMMARY = "Telepathy fasrsight"
-DESCRIPTION = "Glue library for telepathy media signalling and the media \
-streaming capabilities of Farsight2."
-HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
-DEPENDS = "glib-2.0 dbus telepathy-glib farsight2"
-LICENSE = "LGPLv2"
-
-SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-farsight/${BPN}-${PV}.tar.gz \
-"
-
-inherit autotools
-
-EXTRA_OECONF = "--disable-python"
-
-FILES_${PN} += "${datadir}/telepathy \
-		${datadir}/dbus-1"

deleted file mode 100644
index 9000cd4..0000000
@@ -1,33 +0,0 @@
-
-[ConnectionManager]
-BusName=org.freedesktop.Telepathy.ConnectionManager.gabble
-ObjectPath=/org/freedesktop/Telepathy/ConnectionManager/gabble
-
-[Protocol jabber]
-param-account=s required register
-param-password=s required register
-param-server=s
-param-resource=s
-param-priority=n
-param-port=q
-param-old-ssl=b
-param-register=b
-param-low-bandwidth=b
-param-https-proxy-server=s
-param-https-proxy-port=q
-param-fallback-conference-server=s
-param-stun-server=s
-param-stun-port=q
-param-ignore-ssl-errors=b
-param-alias=s
-param-mac=s
-param-btid=s
-default-resource=Telepathy
-default-priority=0
-default-port=5222
-default-old-ssl=false
-default-register=false
-default-low-bandwidth=false
-default-https-proxy-port=443
-default-stun-port=3478
-default-ignore-ssl-errors=false

deleted file mode 100644
index 36e9d65..0000000
@@ -1,18 +0,0 @@
-SUMMARY = "Telepathy Jabber/XMPP connection manager"
-DESCRIPTION = "Telepathy implementation of the Jabber/XMPP protocols."
-HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
-DEPENDS = "glib-2.0 dbus loudmouth telepathy-glib dbus-glib"
-LICENSE = "LGPL"
-
-# gabble.manager needs to get regenerated every release, so please don't copy it over blindly
-SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${BPN}-${PV}.tar.gz \
-           file://gabble.manager"
-
-inherit autotools pkgconfig
-
-do_compile_prepend() {
-      cp ${WORKDIR}/gabble.manager ${S}/data/
-}
-
-FILES_${PN} += "${datadir}/telepathy \
-		${datadir}/dbus-1"

deleted file mode 100644
index 1d9ea43..0000000
@@ -1,17 +0,0 @@
-
-Upstream-Status: Inappropriate [configuration]
---- wbxml2-0.9.2/Makefile.am.old	2007-01-03 19:50:24.000000000 +0000
-+++ wbxml2-0.9.2/Makefile.am	2007-01-03 19:50:39.000000000 +0000
-@@ -24,9 +24,9 @@
- 	TODO\
- 	doxygen.h
- 
--install-data-local:
--	$(mkinstalldirs) $(DESTDIR)$(wbxmldocdir)/manual
--	cp -Rp doc/* $(DESTDIR)$(wbxmldocdir)/manual
-+#install-data-local:
-+#	$(mkinstalldirs) $(DESTDIR)$(wbxmldocdir)/manual
-+#	cp -Rp doc/* $(DESTDIR)$(wbxmldocdir)/manual
- 
- dist-bz2: distdir
- 	sed -e "s/tar.gz/tar.bz2/g" $(distdir)/wbxml2.spec > $(distdir)/wbxml2.spec.aux

deleted file mode 100644
index 42655a1..0000000
@@ -1,24 +0,0 @@
-SUMMARY = "Parsing and Encoding of WBXML documents"
-DESCRIPTION = "The WBXML Library (aka libwbxml) contains a library and \
-its associated tools to Parse, Encode and Handle WBXML documents. The \
-WBXML format is a binary representation of XML, defined by the Wap \
-Forum, and used to reduce bandwidth in mobile communications."
-LICENSE = "GPLv2"
-
-DEPENDS = "libxml2 sed-native expat"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/wbxmllib/${BPN}-${PV}.tar.gz \
-	   file://no-doc-install.patch;patch=1"
-
-inherit autotools pkgconfig
-
-do_configure_append() {
-	sed -i s:-I/usr/include::g Makefile
-	sed -i s:-I/usr/include::g */Makefile
-}
-
-PACKAGES += "${PN}-tools"
-
-FILES_${PN}-tools = "${bindir}"
-FILES_${PN} = "${libdir}/*.so.*"
-

64 lines not on this page · raw message

deleted file mode 100644
index 7ee0f86..0000000
@@ -1,12 +0,0 @@
-require abiword-2.5.inc
-
-PR = "r1"
-
-EXTRA_OECONF += "--enable-embedded"
-
-S = "${WORKDIR}/abiword-${PV}"
-
-RCONFLICTS = "abiword"
-RPROVIDES += "abiword"
-
-

64 lines not on this page · raw message

deleted file mode 100644
index c10d761..0000000
@@ -1,5 +0,0 @@
-require abiword-2.5.inc
-
-PR = "r2"
-
-RCONFLICTS_${PN} = "abiword-embedded"

deleted file mode 100644
index a8946a8..0000000
@@ -1,10 +0,0 @@
-require abiword.inc
-
-SRCREV = "21818"
-PV="2.5.2+svnr${SRCPV}"
-PR = "r0"
-
-SRC_URI = "${SVNURI}"
-
-S = "${SVNSRC}"
-

deleted file mode 100644
index 64a9aff..0000000
@@ -1,33 +0,0 @@
----
- Makefile.am           |    2 +-
- gcalctool/Makefile.am |    2 --
- 2 files changed, 1 insertion(+), 3 deletions(-)
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: gcalctool-5.8.17/gcalctool/Makefile.am
-===================================================================
---- gcalctool-5.8.17.orig/gcalctool/Makefile.am	2005-12-19 15:46:57.000000000 +0000
-+++ gcalctool-5.8.17/gcalctool/Makefile.am	2007-05-16 16:03:26.000000000 +0100
-@@ -1,8 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
- INCLUDES = \
--	-I$(includedir) \
--	-DG_DISABLE_DEPRECATED \
- 	-DGDK_PIXBUF_DISABLE_DEPRECATED \
- 	-DGDK_DISABLE_DEPRECATED \
- 	-DGNOME_DISABLE_DEPRECATED \
-Index: gcalctool-5.8.17/Makefile.am
-===================================================================
---- gcalctool-5.8.17.orig/Makefile.am	2007-05-16 15:35:44.000000000 +0100
-+++ gcalctool-5.8.17/Makefile.am	2007-05-16 16:06:46.000000000 +0100
-@@ -29,7 +29,7 @@ DISTCLEANFILES =                \
- 	gnome-doc-utils.make	\
- 	gcalctool.desktop
- 
--SUBDIRS = po gcalctool help
-+SUBDIRS = po gcalctool
- 
- SCHEMAS_FILE = gcalctool.schemas
- 

deleted file mode 100644
index 4b74cf1..0000000
@@ -1,13 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11"
-DEPENDS = "gtk+"
-DESCRIPTION = "gcalctool is a powerful calculator"
-PR = "r2"
-
-SRC_URI = "http://download.gnome.org/sources/${BPN}/5.7/${BPN}-${PV}.tar.gz \
-        file://makefile-fix.diff;patch=1\
-	file://fix-includedir.patch;patch=1"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-gnome"

deleted file mode 100644
index 8854ecf..0000000
@@ -1,12 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11"
-DEPENDS = "gtk+ gnome-doc-utils"
-DESCRIPTION = "gcalctool is a powerful calculator"
-PR = "r0"
-
-SRC_URI = "http://download.gnome.org/sources/${BPN}/5.8/${BPN}-${PV}.tar.gz \
-	file://fix-includedir.patch;patch=1"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-gnome"

deleted file mode 100644
index 892946f..0000000
@@ -1,32 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: gnome-settings-daemon-2.26.1/configure.ac
-===================================================================
---- gnome-settings-daemon-2.26.1.orig/configure.ac	2009-09-16 22:57:31.000000000 +0100
-+++ gnome-settings-daemon-2.26.1/configure.ac	2009-09-16 22:58:45.000000000 +0100
-@@ -133,9 +133,6 @@
- #
- AC_DEFUN([AC_CHECK_X_HEADERS], [
-   ac_save_CPPFLAGS="$CPPFLAGS"
--  if test \! -z "$includedir" ; then
--    CPPFLAGS="$CPPFLAGS -I$includedir"
--  fi
-   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-   AC_CHECK_HEADERS([$1],[$2],[$3],[$4])
-   CPPFLAGS="$ac_save_CPPFLAGS"])
-@@ -148,15 +145,9 @@
-   ac_save_LDFLAGS="$LDFLAGS"
- #  ac_save_LIBS="$LIBS"
- 
--  if test \! -z "$includedir" ; then
--    CPPFLAGS="$CPPFLAGS -I$includedir"
--  fi
-   # note: $X_CFLAGS includes $x_includes
-   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
- 
--  if test \! -z "$libdir" ; then
--    LDFLAGS="$LDFLAGS -L$libdir"
--  fi
-   # note: $X_LIBS includes $x_libraries
-   LDFLAGS="$LDFLAGS $ALL_X_LIBS"
- 

deleted file mode 100644
index b8f1661..0000000
@@ -1,13 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---- gnome-settings-daemon-2.26.1/data/gnome-settings-daemon.desktop.in.in~	2009-04-24 20:59:51.000000000 -0700
-+++ gnome-settings-daemon-2.26.1/data/gnome-settings-daemon.desktop.in.in	2009-04-24 20:59:51.000000000 -0700
-@@ -2,7 +2,7 @@
- Type=Application
- _Name=GNOME Settings Daemon
- Exec=@LIBEXECDIR@/gnome-settings-daemon
--OnlyShowIn=GNOME;
-+OnlyShowIn=GNOME;MOBLIN;
- X-GNOME-Autostart-Phase=Initialization
- X-GNOME-Autostart-Notify=true
- X-GNOME-AutoRestart=true

deleted file mode 100644
index b9cf6e1..0000000
@@ -1,21 +0,0 @@
-Upstream-Status: Pending
-
-============================================================
- Listen for DeviceAdded in addition to DeviceEnabled
-
-  This should help address problems like left-handed
-mouse, and acceleration settings getting lost after
-resume, or when new devices gets plugged in.
-
-diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
---- a/plugins/mouse/gsd-mouse-manager.c
-+++ b/plugins/mouse/gsd-mouse-manager.c
-@@ -320,7 +320,7 @@ devicepresence_filter (GdkXEvent *xevent,
-         if (xev->type == xi_presence)
-         {
-             XDevicePresenceNotifyEvent *dpn = (XDevicePresenceNotifyEvent *) xev;
--            if (dpn->devchange == DeviceEnabled)
-+            if (dpn->devchange == DeviceEnabled || dpn->devchange == DeviceAdded)
-                 set_mouse_settings ((GsdMouseManager *) data);
-         }
-         return GDK_FILTER_CONTINUE;

deleted file mode 100644
index 965da09..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: gnome-settings-daemon-2.25.90/configure.ac
-===================================================================
---- gnome-settings-daemon-2.25.90.orig/configure.ac
-+++ gnome-settings-daemon-2.25.90/configure.ac
-@@ -85,6 +85,8 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2)
- 
- AM_GCONF_SOURCE_2
- 
-+AC_CHECK_LIB(gthread-2.0, g_thread_init)
-+
- dnl ---------------------------------------------------------------------------
- dnl - Check for libnotify
- dnl ---------------------------------------------------------------------------

76 lines not on this page · raw message

620 lines not on this page · raw message

deleted file mode 100644
index cb216b2..0000000
@@ -1,25 +0,0 @@
-DESCRIPTION = "GNOME settings daemon"
-LICENSE = "GPL"
-DEPENDS = "libxklavier gnome-doc-utils gtk+ libglade libgnomekbd gnome-desktop librsvg libxml2 libart-lgpl"
-
-PR = "r3"
-
-inherit gnome
-
-SRC_URI += "file://desktop-moblin.patch;patch=1 \
-            file://gnome-settings-daemon-fix-gthread.patch;patch=1 \
-            file://mount-plugin.patch;patch=1 \
-            file://gnome-settings-daemon-2.24.0-catch-deviceadded.patch;patch=1 \
-            file://configurefix.patch;patch=1 \
-            file://mojito-cleanup.patch;patch=1"
-
-EXTRA_OECONF = "--disable-esd --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}"
-ASNEEDED = ""
-
-FILES_${PN} += "${libdir}/gnome-settings-daemon-2.0/*.so ${libdir}/gnome-settings-daemon-2.0/*plugin \
-                ${datadir}/dbus-1/ \
-                ${datadir}/icon* \
-                ${datadir}/xsession*"
-
-FILES_${PN}-dbg += "${libdir}/gnome-settings-daemon-2.0/.debug"
-FILES_${PN}-dev += "${libdir}/gnome-settings-daemon-2.0/*.a ${libdir}/gnome-settings-daemon-2.0/*.la"

deleted file mode 100644
index 435cb6a..0000000
@@ -1,22 +0,0 @@
-From 30f29e7d8e1b67c40cd18a7155ba30c4382692d5 Mon Sep 17 00:00:00 2001
-From: Seán de Búrca <[email protected]>
-Date: Fri, 07 Aug 2009 00:38:52 +0000
-Subject: Remove useless Plural-Forms line which breaks build with gnome-doc-utils master
-
-Upstream-Status: Inappropriate [configuration]
-
----
-diff --git a/help/el/el.po b/help/el/el.po
-index ab77264..635b68f 100644
---- a/help/el/el.po
-+++ b/help/el/el.po
-@@ -10,7 +10,6 @@ msgstr ""
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"Plural-Forms: 2\n"
- "X-Poedit-Language: Greek\n"
- "X-Poedit-Country: GREECE\n"
- "X-Generator: Lokalize 0.2\n"
---
-cgit v0.8.3.1

deleted file mode 100644
index 73f0b99..0000000
@@ -1,16 +0,0 @@
-DESCRIPTION = "GNOME Terminal"
-LICENSE = "GPL"
-DEPENDS = "gtk+ glib-2.0 startup-notification dbus-glib vte"
-PR = "r2"
-
-inherit gnome
-
-SRC_URI += "file://30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch;patch=1"
-
-EXTRA_OECONF += "--disable-scrollkeeper"
-
-# Remove an autogenerated file that needs to be rebuilt
-do_configure_prepend () {
-	rm -f ${S}/src/terminal-type-builtins.c
-}
-

deleted file mode 100644
index 266d44b..0000000
@@ -1,14 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome/libs"
-DESCRIPTION = "A powerful object-oriented display"
-PR = "r2"
-
-inherit gnome
-
-DEPENDS = "libglade libart-lgpl virtual/gail"
-
-EXTRA_OECONF = "--disable-gtk-doc"
-
-FILES_${PN} += "${libdir}/libglade/*/libcanvas.so"
-FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/"
-FILES_${PN}-dev += "${libdir}/libglade/*/libcanvas.*a"

deleted file mode 100644
index 68e4eee..0000000
@@ -1,14 +0,0 @@
-DESCRIPTION = "GNOME keyboard library"
-LICENSE = "LGPL"
-
-DEPENDS = "gconf dbus libxklavier gtk+"
-
-inherit gnome
-
-do_configure_append() {
-        find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-        find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
-}
-
-
-

deleted file mode 100644
index 01139c7..0000000
@@ -1,25 +0,0 @@
-DESCRIPTION = "GNOME Structured File Library"
-LICENSE = "GPL"
-SECTION = "libs"
-PR = "r3"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=dc7371b50816c96e145fa0f8ade8e24d \
-                    file://COPYING.LIB;md5=61464cfe342798eeced82efe9ae55f63 \
-                    file://gsf/gsf.h;endline=25;md5=15cf6d31ad023167779ab5f0bbb76f49"
-
-DEPENDS= "libxml2 bzip2 glib-2.0 zlib"
-RDEPENDS_${PN} = "gconf"
-
-
-PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev "
-
-FILES_${PN}-gnome = "${libdir}/libgsf-gnome-1.so.*"
-FILES_${PN}-gnome-dev = "${libdir}/libgsf-gnome-1.* ${includedir}/libgsf-1/gsf-gnome"
-
-inherit autotools pkgconfig gnome gconf
-
-EXTRA_OECONF = "\
-		--without-python \
-		--without-gnome \
-		--disable-gtk-doc \
-		--with-bz2"

deleted file mode 100644
index b1302ed..0000000
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-GTK_MODULES=libgtkstylus.so
-
-export GTK_MODULES

deleted file mode 100644
index b359938..0000000
@@ -1,24 +0,0 @@
-DESCRIPTION = "GTK plugin for stylus based systems"
-SECTION = "libs"
-DEPENDS = "gtk+"
-LICENSE = "LGPL"
-PR = "r2"
-
-inherit autotools
-
-SRC_URI = "http://burtonini.com/temp/${BPN}-${PV}.tar.gz \
-	file://gtkstylus.sh"
-
-do_install_append() {
-	install -d ${D}/${sysconfdir}/X11/Xsession.d
-	install -m 755 ${WORKDIR}/gtkstylus.sh ${D}/${sysconfdir}/X11/Xsession.d/45gtkstylus
-}
-
-# Horrible but rpm falls over if you use '*'
-GTKVER = "2.10.0"
-
-FILES_${PN} = "${sysconfdir} \
-               ${libdir}/gtk-2.0/${GTKVER}/modules/libgtkstylus.so.*"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/${GTKVER}/modules/.debug"
-FILES_${PN}-dev += "${libdir}/gtk-2.0/${GTKVER}/modules/libgtkstylus.so \
-                    ${libdir}/gtk-2.0/${GTKVER}/modules/libgtkstylus.*a"

deleted file mode 100644
index 0c0eddf..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: wv-1.2.0/wv-1.0.pc.in
-===================================================================
---- wv-1.2.0.orig/wv-1.0.pc.in	2008-03-19 22:25:18.000000000 +0000
-+++ wv-1.2.0/wv-1.0.pc.in	2008-03-19 22:26:32.000000000 +0000
-@@ -6,5 +6,6 @@
- Name: wvWare
- Description: Word Document Filter library and utilities
- Version: @VERSION@
--Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @GLIB_LIBS@ @GSF_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
--Cflags: -I${includedir}/wv @GSF_CFLAGS@
-+Requires: libgsf-1
-+Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
-+Cflags: -I${includedir}/wv

deleted file mode 100644
index 54878a9..0000000
@@ -1,14 +0,0 @@
-DESCRIPTION = "Programs for accessing Microsoft Word documents"
-HOMEPAGE = "http://wvware.sourceforge.net/"
-LICENSE = "GPLv2"
-DEPENDS = "libgsf glib-2.0"
-PR = "r3"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \
-           file://pkgconfig.patch;patch=1"
-
-inherit autotools pkgconfig
-
-S = "${WORKDIR}/${BPN}-${PV}"
-
-EXTRA_OECONF = ""

deleted file mode 100644
index 13d6fc7..0000000
@@ -1,20 +0,0 @@
-DESCRIPTION = "Tidy library"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPLv2.1+"
-
-STDDEPENDS = "clutter-1.4"
-BASE_CONF = "--disable-gtk-doc"
-
-DEPENDS = "${STDDEPENDS}"
-EXTRA_OECONF = "${BASE_CONF}"
-
-inherit autotools pkgconfig
-
-PACKAGES =+ "tidy-examples"
-FILES_tidy-examples = "${bindir}/test-*"
-
-do_configure_prepend() {
-        touch ${S}/gtk-doc.make
-        sed -i s:docs/reference/Makefile::g ${S}/configure.ac
-        sed -i s:docs::g ${S}/Makefile.am
-}

deleted file mode 100644
index 51b4eea..0000000
@@ -1,13 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: tidy/doc/reference/Makefile.am
-===================================================================
---- tidy.orig/doc/reference/Makefile.am  2007-11-06 19:36:56.000000000 +0000
-+++ tidy/doc/reference/Makefile.am       2007-11-06 19:37:02.000000000 +0000
-@@ -77,4 +77,4 @@ include $(top_srcdir)/gtk-doc.make
- 
- # Other files to distribute
- # e.g. EXTRA_DIST += version.xml.in
--EXTRA_DIST += version.xml.in
-+EXTRA_DIST = version.xml.in
-

deleted file mode 100644
index 6942577..0000000
@@ -1,22 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: trunk/tests/Makefile.am
-===================================================================
---- trunk.orig/tests/Makefile.am	2008-03-04 12:22:10.000000000 +0000
-+++ trunk/tests/Makefile.am	2008-03-04 12:23:46.000000000 +0000
-@@ -1,4 +1,4 @@
--noinst_PROGRAMS = \
-+bin_PROGRAMS = \
- 	test-button \
- 	test-finger-scroll \
- 	test-list-view \
-@@ -14,6 +14,9 @@
- 	test-grow \
- 	test-viewport
- 
-+test_texture_framedir = $(pkgdatadir)
-+test_texture_frame_DATA = frame.png
-+
- INCLUDES = -I$(top_srcdir)
- LDADD = $(top_builddir)/tidy/libtidy-1.0.la
- 

deleted file mode 100644
index 623de18..0000000
@@ -1,14 +0,0 @@
-require tidy.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
-                    file://tidy/tidy.h;endline=21;md5=ac342e7aac55849bf0755d79967fa3e8"
-
-SRCREV = "e25416e1293e1074bfa6727c80527dcff5b1f3cb"
-PV = "0.1.0+git${SRCPV}"
-PR = "r7"
-
-SRC_URI = "git://git.clutter-project.org/tidy.git;protocol=git \
-           file://tidy-enable-tests.patch;patch=1"
-
-S = "${WORKDIR}/git"
-

deleted file mode 100644
index f58f30b..0000000
@@ -1,17 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: libxklavier-3.7/libxklavier.pc.in
-===================================================================
---- libxklavier-3.7.orig/libxklavier.pc.in	2009-06-10 15:58:46.000000000 +0100
-+++ libxklavier-3.7/libxklavier.pc.in	2009-06-10 16:00:45.000000000 +0100
-@@ -5,7 +5,7 @@
- 
- Name: libxklavier
- Description: libxklavier library
--Requires: libxml-2.0
-+Requires: libxml-2.0 glib-2.0
- Version: @VERSION@
--Libs: -L${libdir} -lxklavier @GLIB_LIBS@ @XML_LIBS@
--Cflags: -I${includedir} @GLIB_CFLAGS@
-+Libs: -L${libdir} -lxklavier
-+Cflags: -I${includedir}

deleted file mode 100644
index da077b8..0000000
@@ -1,11 +0,0 @@
-DESCRIPTION = "Utility library to make using XKB easier"
-SECTION = "x11/libs"
-DEPENDS = "iso-codes libxml2 glib-2.0 libxkbfile"
-LICENSE = "LGPL"
-PR = "r2"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/gswitchit/libxklavier-${PV}.tar.bz2 \
-           file://pkgconfigfix.patch;patch=1"
-
-inherit autotools
-

deleted file mode 100644
index 8d3659f..0000000
@@ -1,16 +0,0 @@
-DESCRIPTION = "A clock combined with a game of pong"
-LICENSE = "GPLv2+"
-DEPENDS = "virtual/libx11 xdmcp xau"
-
-SRC_URI = "file://pong-clock-no-flicker.c"
-
-S = "${WORKDIR}"
-
-do_compile () {
-	${CC} -o pong-clock pong-clock-no-flicker.c `pkg-config --cflags --libs x11 xau xdmcp`
-}
-
-do_install () {
-	install -d ${D}${bindir}
-	install -m 0755 pong-clock ${D}${bindir}
-}

deleted file mode 100644
index 78804d7..0000000
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "X Backlight Utility"
-DEPENDS += "libxrender libxrandr"

deleted file mode 100644
index 07ce072..0000000
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-
-DEPENDS += " virtual/libx11 libxau libxt libxext libxmu"

deleted file mode 100644
index 08d8bec..0000000
@@ -1,3 +0,0 @@
-if [ -e $HOME/.Xdefaults ]; then
-    xrdb -merge -nocpp < $HOME/.Xdefaults
-fi

deleted file mode 100644
index 906d7d8..0000000
@@ -1,14 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "X server resource database utility"
-LICENSE = "xrdb"
-DEPENDS += "libxmu"
-PE = "1"
-PR = "r2"
-
-SRC_URI += "file://60XDefaults.sh"
-
-do_install_append() {
-    install -d ${D}${sysconfdir}/X11/Xsession.d/
-    install -m 0755 ${WORKDIR}/60XDefaults.sh ${D}${sysconfdir}/X11/Xsession.d/
-}

65 lines not on this page · raw message

deleted file mode 100644
index cdf3509..0000000
@@ -1,11 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "XFIXES Extension"
-DEPENDS += " libxext xextproto xproto zlib"
-PROVIDES = "lbxutil"
-PE = "1"
-PR = "r1"
-
-SRC_URI += "file://mkg3states.patch;patch=1"
-
-export CC_FOR_BUILD = "gcc"

deleted file mode 100644
index 489f456..0000000
@@ -1,21 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Athena Widget Set"
-DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
-PROVIDES = "xaw"
-PR = "r1"
-PE = "1"
-
-XORG_PN = "libXaw"
-
-do_install_append () {
-	ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6
-	ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7
-	ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so
-}
-
-PACKAGES =+ "libxaw6 libxaw7 libxaw8"
-
-FILES_libxaw6 = "${libdir}/libXaw6.so.6*"
-FILES_libxaw7 = "${libdir}/libXaw7.so.7*"
-FILES_libxaw8 = "${libdir}/libXaw8.so.8*"

deleted file mode 100644
index 6c6b459..0000000
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X11 EvIE extension library"
-DEPENDS += "libxext evieext"
-PR = "r1"
-PE = "1"
-
-XORG_PN = "libXevie"

deleted file mode 100644
index 9a3f5f1..0000000
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X11 keyboard UI presentation library"
-LICENSE= "GPL"
-DEPENDS += "virtual/libx11 libxt libxkbfile"
-PROVIDES = "xkbui"
-PR = "r1"
-PE = "1"

deleted file mode 100644
index 9c3d9ef..0000000
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-PROVIDES="xproxymngproto"
-PR = "r1"
-PE = "1"

deleted file mode 100644
index ec75e71..0000000
@@ -1,17 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- src/Makefile.am |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: xournal-0.2/src/Makefile.am
-===================================================================
---- xournal-0.2.orig/src/Makefile.am	2007-05-09 15:06:26.000000000 +0100
-+++ xournal-0.2/src/Makefile.am	2007-05-09 15:06:35.000000000 +0100
-@@ -21,5 +21,5 @@ xournal_SOURCES = \
- 	xo-interface.c xo-interface.h \
- 	xo-callbacks.c xo-callbacks.h 
- 
--xournal_LDADD = @PACKAGE_LIBS@
-+xournal_LDADD = @PACKAGE_LIBS@ -lz
- 

179 lines not on this page · raw message

deleted file mode 100644
index 1ca6e1e..0000000

Lines of this file are not shown. View the raw message.

58 lines not on this page · raw message

deleted file mode 100644
index f8a8396..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index 8291817..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index 4351d1e..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index fe70414..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index de0705c..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index d5ca3db..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index 41ca1d6..0000000

Lines of this file are not shown. View the raw message.

1,011 lines not on this page · raw message

1,010 lines not on this page · raw message

deleted file mode 100644
index 82dd1d0..0000000

Lines of this file are not shown. View the raw message.

46 lines not on this page · raw message

deleted file mode 100644
index 17cd742..0000000

Lines of this file are not shown. View the raw message.

41 lines not on this page · raw message

deleted file mode 100644
index 3ddf514..0000000

Lines of this file are not shown. View the raw message.

57 lines not on this page · raw message

deleted file mode 100644
index d3bf06d..0000000

Lines of this file are not shown. View the raw message.

327 lines not on this page · raw message

deleted file mode 100644
index a528474..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index 34e08bd..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index ae6bf71..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index c749616..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index 9e16529..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index 67db92c..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index 1ba7b0a..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index 214dd3d..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index 6dc40c0..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index 21716cf..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index 21843fd..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index 7fbbe28..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index a731421..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index 4251138..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index 18841a8..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index 397c932..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index 37a8564..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index 2fbee13..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index b534ac2..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index 92c25bc..0000000

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index 4bd8360..0000000
@@ -1,20 +0,0 @@
-Fix for glib-2.0 version 2.32.2
-
-Upstream-Status: Pending
-
-Signed-off-by: Saul Wold <[email protected]>
-
-
-Index: git/src/debug.h
-===================================================================
---- git.orig/src/debug.h
-+++ git/src/debug.h
-@@ -19,7 +19,7 @@
-  *
-  */
- 
--#include <glib/gmessages.h>
-+#include <glib.h>
- 
- //#define DBG(fmt, arg...)  g_debug("%s: " fmt, __FUNCTION__ , ## arg)
- #define DBG(fmt, arg...)

deleted file mode 100644
index 474ec28..0000000
@@ -1,20 +0,0 @@
-SUMMARY = "Library for simple D-Bus integration with GLib"
-DESCRIPTION = "Library for simple D-Bus integration with GLib"
-HOMEPAGE = "http://www.bluez.org"
-SECTION = "libs"
-LICENSE = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
-                    file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09"
-
-DEPENDS = "glib-2.0 dbus"
-
-SRCREV = "aeab6e3c0185b271ca343b439470491b99cc587f"
-PV = "0.0+git${SRCPV}"
-PR = "r1"
-
-SRC_URI = "git://git.kernel.org/pub/scm/bluetooth/libgdbus.git;protocol=git \
-           file://fix-for-new-glib.patch"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig

deleted file mode 100644
index 79e2ab8..0000000
@@ -1,1186 +0,0 @@
-Upstream-Status: Pending
-
-diff -rupN libsoup-2.2.105/tests/auth-test.c libsoup-2.2.105.new//tests/auth-test.c
---- libsoup-2.2.105/tests/auth-test.c	2007-12-05 00:13:27.000000000 +0200
-+++ libsoup-2.2.105.new//tests/auth-test.c	2012-01-16 20:12:09.000000000 +0200
-@@ -19,7 +19,7 @@ int errors = 0;
- gboolean debug = FALSE;
- 
- static void
--dprintf (const char *format, ...)
-+dprintfsoup (const char *format, ...)
- {
- 	va_list args;
- 
-@@ -216,18 +216,18 @@ handler (SoupMessage *msg, gpointer data
- 
- 	auth = identify_auth (msg);
- 
--	dprintf ("  %d %s (using %s)\n", msg->status_code, msg->reason_phrase,
-+	dprintfsoup ("  %d %s (using %s)\n", msg->status_code, msg->reason_phrase,
- 		 auths[auth]);
- 
- 	if (*expected) {
- 		exp = *expected - '0';
- 		if (auth != exp) {
--			dprintf ("    expected %s!\n", auths[exp]);
-+			dprintfsoup ("    expected %s!\n", auths[exp]);
- 			errors++;
- 		}
- 		memmove (expected, expected + 1, strlen (expected));
- 	} else {
--		dprintf ("    expected to be finished\n");
-+		dprintfsoup ("    expected to be finished\n");
- 		errors++;
- 	}
- }
-@@ -266,10 +266,10 @@ bug271540_sent (SoupMessage *msg, gpoint
- 	int auth = identify_auth (msg);
- 
- 	if (!*authenticated && auth) {
--		dprintf ("    using auth on message %d before authenticating!!??\n", n);
-+		dprintfsoup ("    using auth on message %d before authenticating!!??\n", n);
- 		errors++;
- 	} else if (*authenticated && !auth) {
--		dprintf ("    sent unauthenticated message %d after authenticating!\n", n);
-+		dprintfsoup ("    sent unauthenticated message %d after authenticating!\n", n);
- 		errors++;
- 	}
- }
-@@ -287,12 +287,12 @@ bug271540_authenticate (SoupSession *ses
- 		return;
- 
- 	if (!*authenticated) {
--		dprintf ("    authenticating message %d\n", n);
-+		dprintfsoup ("    authenticating message %d\n", n);
- 		*username = g_strdup ("user1");
- 		*password = g_strdup ("realm1");
- 		*authenticated = TRUE;
- 	} else {
--		dprintf ("    asked to authenticate message %d after authenticating!\n", n);
-+		dprintfsoup ("    asked to authenticate message %d after authenticating!\n", n);
- 		errors++;
- 	}
- }
-@@ -304,7 +304,7 @@ bug271540_finished (SoupMessage *msg, gp
- 	int n = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (msg), "#"));
- 
- 	if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) {
--		dprintf ("      got status '%d %s' on message %d!\n",
-+		dprintfsoup ("      got status '%d %s' on message %d!\n",
- 			msg->status_code, msg->reason_phrase, n);
- 		errors++;
- 	}
-@@ -350,10 +350,10 @@ main (int argc, char **argv)
- 			  G_CALLBACK (reauthenticate), &i);
- 
- 	for (i = 0; i < ntests; i++) {
--		dprintf ("Test %d: %s\n", i + 1, tests[i].explanation);
-+		dprintfsoup ("Test %d: %s\n", i + 1, tests[i].explanation);
- 
- 		uri = g_strconcat (base_uri, tests[i].url, NULL);
--		dprintf ("  GET %s\n", uri);
-+		dprintfsoup ("  GET %s\n", uri);
- 
- 		msg = soup_message_new (SOUP_METHOD_GET, uri);
- 		g_free (uri);
-@@ -372,21 +372,21 @@ main (int argc, char **argv)
- 		soup_session_send_message (session, msg);
- 		if (msg->status_code != SOUP_STATUS_UNAUTHORIZED &&
- 		    msg->status_code != SOUP_STATUS_OK) {
--			dprintf ("  %d %s !\n", msg->status_code,
-+			dprintfsoup ("  %d %s !\n", msg->status_code,
- 				msg->reason_phrase);
- 			errors++;
- 		}
- 		if (*expected) {
--			dprintf ("  expected %d more round(s)\n",
-+			dprintfsoup ("  expected %d more round(s)\n",
- 				(int)strlen (expected));
- 			errors++;
- 		}
- 		g_free (expected);
- 
- 		if (msg->status_code != tests[i].final_status)
--			dprintf ("  expected %d\n", tests[i].final_status);
-+			dprintfsoup ("  expected %d\n", tests[i].final_status);
- 
--		dprintf ("\n");
-+		dprintfsoup ("\n");
- 
- 		g_object_unref (msg);
- 	}
-@@ -395,7 +395,7 @@ main (int argc, char **argv)
- 
- 	/* And now for a regression test */
- 
--	dprintf ("Regression test for bug 271540:\n");
-+	dprintfsoup ("Regression test for bug 271540:\n");
- 	session = soup_session_async_new ();
- 
- 	authenticated = FALSE;
-@@ -424,7 +424,7 @@ main (int argc, char **argv)
- 
- 	apache_cleanup ();
- 
--	dprintf ("\n");
-+	dprintfsoup ("\n");
- 	if (errors) {
- 		printf ("auth-test: %d error(s). Run with '-d' for details\n",
- 			errors);
-diff -rupN libsoup-2.2.105/tests/context-test.c libsoup-2.2.105.new//tests/context-test.c
---- libsoup-2.2.105/tests/context-test.c	2007-12-05 00:13:27.000000000 +0200
-+++ libsoup-2.2.105.new//tests/context-test.c	2012-01-16 20:11:27.000000000 +0200
-@@ -28,7 +28,7 @@ GThread *server_thread;
- char *base_uri;
- 
- static void
--dprintf (const char *format, ...)
-+dprintfsoup (const char *format, ...)
- {
- 	va_list args;
- 
-@@ -168,7 +168,7 @@ do_test1 (void)
- {
- 	GMainLoop *loop;
- 
--	dprintf ("Test 1: blocking the main thread does not block other thread\n");
-+	dprintfsoup ("Test 1: blocking the main thread does not block other thread\n");
- 
- 	test1_cond = g_cond_new ();
- 	test1_mutex = g_mutex_new ();
-@@ -196,7 +196,7 @@ idle_start_test1_thread (gpointer loop)
- 	if (g_cond_timed_wait (test1_cond, test1_mutex, &time))
- 		g_thread_join (thread);
- 	else {
--		dprintf ("  timeout!\n");
-+		dprintfsoup ("  timeout!\n");
- 		errors++;
- 	}
- 
-@@ -232,17 +232,17 @@ test1_thread (gpointer user_data)
- 
- 	uri = g_build_filename (base_uri, "slow", NULL);
- 
--	dprintf ("  send_message\n");
-+	dprintfsoup ("  send_message\n");
- 	msg = soup_message_new ("GET", uri);
- 	soup_session_send_message (session, msg);
- 	if (msg->status_code != SOUP_STATUS_OK) {
--		dprintf ("    unexpected status: %d %s\n",
-+		dprintfsoup ("    unexpected status: %d %s\n",
- 			 msg->status_code, msg->reason_phrase);
- 		errors++;
- 	}
- 	g_object_unref (msg);
- 
--	dprintf ("  queue_message\n");
-+	dprintfsoup ("  queue_message\n");
- 	msg = soup_message_new ("GET", uri);
- 	loop = g_main_loop_new (async_context, FALSE);
- 	g_object_ref (msg);
-@@ -250,7 +250,7 @@ test1_thread (gpointer user_data)
- 	g_main_loop_run (loop);
- 	g_main_loop_unref (loop);
- 	if (msg->status_code != SOUP_STATUS_OK) {
--		dprintf ("    unexpected status: %d %s\n",
-+		dprintfsoup ("    unexpected status: %d %s\n",
- 			 msg->status_code, msg->reason_phrase);
- 		errors++;
- 	}
-@@ -279,7 +279,7 @@ do_test2 (void)
- 	char *uri;
- 	SoupMessage *msg;
- 
--	dprintf ("Test 2: a session with its own context is independent of the main loop.\n");
-+	dprintfsoup ("Test 2: a session with its own context is independent of the main loop.\n");
- 
- 	idle = g_idle_add_full (G_PRIORITY_HIGH, idle_test2_fail, NULL, NULL);
- 
-@@ -291,11 +291,11 @@ do_test2 (void)
- 
- 	uri = g_build_filename (base_uri, "slow", NULL);
- 
--	dprintf ("  send_message\n");
-+	dprintfsoup ("  send_message\n");
- 	msg = soup_message_new ("GET", uri);
- 	soup_session_send_message (session, msg);
- 	if (msg->status_code != SOUP_STATUS_OK) {
--		dprintf ("    unexpected status: %d %s\n",
-+		dprintfsoup ("    unexpected status: %d %s\n",
- 			 msg->status_code, msg->reason_phrase);
- 		errors++;
- 	}
-@@ -311,7 +311,7 @@ do_test2 (void)
- static gboolean
- idle_test2_fail (gpointer user_data)
- {
--	dprintf ("  idle ran!\n");
-+	dprintfsoup ("  idle ran!\n");
- 	errors++;
- 	return FALSE;
- }
-@@ -356,7 +356,7 @@ main (int argc, char **argv)
- 	g_free (base_uri);
- 	g_main_context_unref (g_main_context_default ());
- 
--	dprintf ("\n");
-+	dprintfsoup ("\n");
- 	if (errors) {
- 		printf ("context-test: %d error(s). Run with '-d' for details\n",
- 			errors);
-diff -rupN libsoup-2.2.105/tests/header-parsing.c libsoup-2.2.105.new//tests/header-parsing.c
---- libsoup-2.2.105/tests/header-parsing.c	2007-10-28 19:57:03.000000000 +0200
-+++ libsoup-2.2.105.new//tests/header-parsing.c	2012-01-16 20:11:54.000000000 +0200
-@@ -10,7 +10,7 @@
- gboolean debug = FALSE;
- 
- static void
--dprintf (const char *format, ...)
-+dprintfsoup (const char *format, ...)
- {
- 	va_list args;
- 
-@@ -455,7 +455,7 @@ static void
- print_header (gpointer key, gpointer value, gpointer data)
- {
- 	GSList *values = value;
--	dprintf ("              '%s': '%s'\n",
-+	dprintfsoup ("              '%s': '%s'\n",
- 		 (char *)key, (char*)values->data);
- }
- 
-@@ -480,11 +480,11 @@ do_request_tests (void)
- 	SoupHttpVersion version;
- 	GHashTable *headers;
- 
--	dprintf ("Request tests\n");
-+	dprintfsoup ("Request tests\n");
- 	for (i = 0; i < 1; i++) {
- 		gboolean ok = TRUE;
- 
--		dprintf ("%2d. %s (%s): ", i + 1, reqtests[i].description,
-+		dprintfsoup ("%2d. %s (%s): ", i + 1, reqtests[i].description,
- 			 reqtests[i].method ? "should parse" : "should NOT parse");
- 
- 		headers = g_hash_table_new_full (g_str_hash, g_str_equal,
-@@ -519,34 +519,34 @@ do_request_tests (void)
- 		}
- 
- 		if (ok)
--			dprintf ("OK!\n");
-+			dprintfsoup ("OK!\n");
- 		else {
--			dprintf ("BAD!\n");
-+			dprintfsoup ("BAD!\n");
- 			errors++;
- 			if (reqtests[i].method) {
--				dprintf ("    expected: '%s' '%s' 'HTTP/1.%d'\n",
-+				dprintfsoup ("    expected: '%s' '%s' 'HTTP/1.%d'\n",
- 					 reqtests[i].method, reqtests[i].path,
- 					 reqtests[i].version);
- 				for (h = 0; reqtests[i].headers[h].name; h++) {
--					dprintf ("              '%s': '%s'\n",
-+					dprintfsoup ("              '%s': '%s'\n",
- 						 reqtests[i].headers[h].name,
- 						 reqtests[i].headers[h].value);
- 				}
- 			} else
--				dprintf ("    expected: parse error\n");
-+				dprintfsoup ("    expected: parse error\n");
- 			if (method) {
--				dprintf ("         got: '%s' '%s' 'HTTP/1.%d'\n",
-+				dprintfsoup ("         got: '%s' '%s' 'HTTP/1.%d'\n",
- 					method, path, version);
- 				g_hash_table_foreach (headers, print_header, NULL);
- 			} else
--				dprintf ("         got: parse error\n");
-+				dprintfsoup ("         got: parse error\n");
- 		}
- 
- 		g_free (method);
- 		g_free (path);
- 		g_hash_table_destroy (headers);
- 	}
--	dprintf ("\n");
-+	dprintfsoup ("\n");
- 
- 	return errors;
- }
-@@ -561,11 +561,11 @@ do_response_tests (void)
- 	SoupHttpVersion version;
- 	GHashTable *headers;
- 
--	dprintf ("Response tests\n");
-+	dprintfsoup ("Response tests\n");
- 	for (i = 0; i < num_resptests; i++) {
- 		gboolean ok = TRUE;
- 
--		dprintf ("%2d. %s (%s): ", i + 1, resptests[i].description,
-+		dprintfsoup ("%2d. %s (%s): ", i + 1, resptests[i].description,
- 			 resptests[i].reason_phrase ? "should parse" : "should NOT parse");
- 
- 		headers = g_hash_table_new_full (g_str_hash, g_str_equal,
-@@ -600,34 +600,34 @@ do_response_tests (void)
- 		}
- 
- 		if (ok)
--			dprintf ("OK!\n");
-+			dprintfsoup ("OK!\n");
- 		else {
--			dprintf ("BAD!\n");
-+			dprintfsoup ("BAD!\n");
- 			errors++;
- 			if (resptests[i].reason_phrase) {
--				dprintf ("    expected: 'HTTP/1.%d' '%03d' '%s'\n",
-+				dprintfsoup ("    expected: 'HTTP/1.%d' '%03d' '%s'\n",
- 					 resptests[i].version,
- 					 resptests[i].status_code,
- 					 resptests[i].reason_phrase);
- 				for (h = 0; resptests[i].headers[h].name; h++) {
--					dprintf ("              '%s': '%s'\n",
-+					dprintfsoup ("              '%s': '%s'\n",
- 						 resptests[i].headers[h].name,
- 						 resptests[i].headers[h].value);
- 				}
- 			} else
--				dprintf ("    expected: parse error\n");
-+				dprintfsoup ("    expected: parse error\n");
- 			if (reason_phrase) {
--				dprintf ("         got: 'HTTP/1.%d' '%03d' '%s'\n",
-+				dprintfsoup ("         got: 'HTTP/1.%d' '%03d' '%s'\n",
- 					 version, status_code, reason_phrase);
- 				g_hash_table_foreach (headers, print_header, NULL);
- 			} else
--				dprintf ("         got: parse error\n");
-+				dprintfsoup ("         got: parse error\n");
- 		}
- 
- 		g_free (reason_phrase);
- 		g_hash_table_destroy (headers);
- 	}
--	dprintf ("\n");
-+	dprintfsoup ("\n");
- 
- 	return errors;
- }
-@@ -651,7 +651,7 @@ main (int argc, char **argv)
- 	errors = do_request_tests ();
- 	errors += do_response_tests ();
- 
--	dprintf ("\n");
-+	dprintfsoup ("\n");
- 	if (errors) {
- 		printf ("header-parsing: %d error(s). Run with '-d' for details\n",
- 			errors);
-diff -rupN libsoup-2.2.105/tests/ntlm-test.c libsoup-2.2.105.new//tests/ntlm-test.c
---- libsoup-2.2.105/tests/ntlm-test.c	2007-12-05 00:13:27.000000000 +0200
-+++ libsoup-2.2.105.new//tests/ntlm-test.c	2012-01-16 20:11:45.000000000 +0200
-@@ -29,7 +29,7 @@
- gboolean debug = FALSE;
- 
- static void
--dprintf (const char *format, ...)
-+dprintfsoup (const char *format, ...)
- {
- 	va_list args;
- 
-@@ -219,58 +219,58 @@ do_message (SoupSession *session, SoupUr
- 			  G_CALLBACK (ntlm_response_check), &state);
- 
- 	soup_session_send_message (session, msg);
--	dprintf ("  %-10s -> ", path);
-+	dprintfsoup ("  %-10s -> ", path);
- 
- 	if (state.got_prompt) {
--		dprintf (" PROMPT");
-+		dprintfsoup (" PROMPT");
- 		if (!get_prompt) {
--			dprintf ("???");
-+			dprintfsoup ("???");
- 			errors++;
- 		}
- 	} else if (get_prompt) {
--		dprintf (" no-prompt???");
-+		dprintfsoup (" no-prompt???");
- 		errors++;
- 	}
- 
- 	if (state.sent_request) {
--		dprintf (" REQUEST");
-+		dprintfsoup (" REQUEST");
- 		if (!do_ntlm) {
--			dprintf ("???");
-+			dprintfsoup ("???");
- 			errors++;
- 		}
- 	} else if (do_ntlm) {
--		dprintf (" no-request???");
-+		dprintfsoup (" no-request???");
- 		errors++;
- 	}
- 
- 	if (state.got_challenge) {
--		dprintf (" CHALLENGE");
-+		dprintfsoup (" CHALLENGE");
- 		if (!do_ntlm) {
--			dprintf ("???");
-+			dprintfsoup ("???");
- 			errors++;
- 		}
- 	} else if (do_ntlm) {
--		dprintf (" no-challenge???");
-+		dprintfsoup (" no-challenge???");
- 		errors++;
- 	}
- 
- 	if (state.sent_response) {
--		dprintf (" RESPONSE");
-+		dprintfsoup (" RESPONSE");
- 		if (!do_ntlm) {
--			dprintf ("???");
-+			dprintfsoup ("???");
- 			errors++;
- 		}
- 	} else if (do_ntlm) {
--		dprintf (" no-response???");
-+		dprintfsoup (" no-response???");
- 		errors++;
- 	}
- 
--	dprintf (" -> %s", msg->reason_phrase);
-+	dprintfsoup (" -> %s", msg->reason_phrase);
- 	if (msg->status_code != status_code) {
--		dprintf ("???");
-+		dprintfsoup ("???");
- 		errors++;
- 	}
--	dprintf ("\n");
-+	dprintfsoup ("\n");
- 
- 	g_object_unref (msg);
- 	return errors;
-@@ -327,11 +327,11 @@ do_ntlm_tests (SoupUri *base_uri)
- {
- 	int errors = 0;
- 
--	dprintf ("Round 1: Non-NTLM Connection\n");
-+	dprintfsoup ("Round 1: Non-NTLM Connection\n");
- 	errors += do_ntlm_round (base_uri, NULL);
--	dprintf ("Round 2: NTLM Connection, user=alice\n");
-+	dprintfsoup ("Round 2: NTLM Connection, user=alice\n");
- 	errors += do_ntlm_round (base_uri, "alice");
--	dprintf ("Round 3: NTLM Connection, user=bob\n");
-+	dprintfsoup ("Round 3: NTLM Connection, user=bob\n");
- 	errors += do_ntlm_round (base_uri, "bob");
- 
- 	return errors;
-@@ -397,7 +397,7 @@ main (int argc, char **argv)
- 	g_hash_table_destroy (connections);
- 	g_main_context_unref (g_main_context_default ());
- 
--	dprintf ("\n");
-+	dprintfsoup ("\n");
- 	if (errors) {
- 		printf ("ntlm-test: %d error(s). Run with '-d' for details\n",
- 			errors);
-diff -rupN libsoup-2.2.105/tests/proxy-test.c libsoup-2.2.105.new//tests/proxy-test.c
---- libsoup-2.2.105/tests/proxy-test.c	2007-12-05 00:13:27.000000000 +0200
-+++ libsoup-2.2.105.new//tests/proxy-test.c	2012-01-16 20:11:02.000000000 +0200
-@@ -14,7 +14,7 @@ int errors = 0;
- gboolean debug = FALSE;
- 
- static void
--dprintf (const char *format, ...)
-+dprintfsoup (const char *format, ...)
- {
- 	va_list args;
- 
-@@ -76,7 +76,7 @@ test_url (const char *url, int proxy, gu
- 	SoupUri *proxy_uri;
- 	SoupMessage *msg;
- 
--	dprintf ("  GET %s via %s\n", url, proxy_names[proxy]);
-+	dprintfsoup ("  GET %s via %s\n", url, proxy_names[proxy]);
- 	if (proxy == UNAUTH_PROXY && expected != SOUP_STATUS_FORBIDDEN)
- 		expected = SOUP_STATUS_PROXY_UNAUTHORIZED;
- 
-@@ -99,9 +99,9 @@ test_url (const char *url, int proxy, gu
- 
- 	soup_session_send_message (session, msg);
- 
--	dprintf ("  %d %s\n", msg->status_code, msg->reason_phrase);
-+	dprintfsoup ("  %d %s\n", msg->status_code, msg->reason_phrase);
- 	if (msg->status_code != expected) {
--		dprintf ("  EXPECTED %d!\n", expected);
-+		dprintfsoup ("  EXPECTED %d!\n", expected);
- 		errors++;
- 	}
- 
-@@ -115,7 +115,7 @@ run_test (int i, gboolean sync)
- {
- 	char *http_url, *https_url;
- 
--	dprintf ("Test %d: %s (%s)\n", i + 1, tests[i].explanation,
-+	dprintfsoup ("Test %d: %s (%s)\n", i + 1, tests[i].explanation,
- 		 sync ? "sync" : "async");
- 
- 	if (!strncmp (tests[i].url, "http", 4)) {
-@@ -141,7 +141,7 @@ run_test (int i, gboolean sync)
- 	g_free (http_url);
- 	g_free (https_url);
- 
--	dprintf ("\n");
-+	dprintfsoup ("\n");
- }
- 
- int
-@@ -176,7 +176,7 @@ main (int argc, char **argv)
- 	apache_cleanup ();
- 	g_main_context_unref (g_main_context_default ());
- 
--	dprintf ("\n");
-+	dprintfsoup ("\n");
- 	if (errors) {
- 		printf ("proxy-test: %d error(s). Run with '-d' for details\n",
- 			errors);
-diff -rupN libsoup-2.2.105/tests/pull-api.c libsoup-2.2.105.new//tests/pull-api.c
---- libsoup-2.2.105/tests/pull-api.c	2007-12-05 00:13:27.000000000 +0200
-+++ libsoup-2.2.105.new//tests/pull-api.c	2012-01-16 20:11:14.000000000 +0200
-@@ -19,7 +19,7 @@ char *correct_response;
- guint correct_response_len;
- 
- static void
--dprintf (int level, const char *format, ...)
-+dprintfsoup (int level, const char *format, ...)
- {
- 	va_list args;
- 
-@@ -98,7 +98,7 @@ do_fully_async_test (SoupSession *sessio
- 	loop = g_main_loop_new (NULL, FALSE);
- 
- 	uri = g_build_filename (base_uri, sub_uri, NULL);
--	dprintf (1, "GET %s\n", uri);
-+	dprintfsoup (1, "GET %s\n", uri);
- 
- 	msg = soup_message_new (SOUP_METHOD_GET, uri);
- 	g_free (uri);
-@@ -152,10 +152,10 @@ fully_async_request_chunk (gpointer user
- 	FullyAsyncData *ad = user_data;
- 
- 	if (!ad->did_first_timeout) {
--		dprintf (1, "  first timeout\n");
-+		dprintfsoup (1, "  first timeout\n");
- 		ad->did_first_timeout = TRUE;
- 	} else
--		dprintf (2, "  timeout\n");
-+		dprintfsoup (2, "  timeout\n");
- 	ad->timeout = 0;
- 
- 	/* ad->chunks_ready and ad->chunk_wanted are used because
-@@ -180,14 +180,14 @@ fully_async_got_headers (SoupMessage *ms
- {
- 	FullyAsyncData *ad = user_data;
- 
--	dprintf (1, "  %d %s\n", msg->status_code, msg->reason_phrase);
-+	dprintfsoup (1, "  %d %s\n", msg->status_code, msg->reason_phrase);
- 	if (msg->status_code == SOUP_STATUS_UNAUTHORIZED) {
- 		/* Let soup handle this one; this got_headers handler
- 		 * will get called again next time around.
- 		 */
- 		return;
- 	} else if (msg->status_code != SOUP_STATUS_OK) {
--		dprintf (1, "  unexpected status: %d %s\n",
-+		dprintfsoup (1, "  unexpected status: %d %s\n",
- 			 msg->status_code, msg->reason_phrase);
- 		errors++;
- 		return;
-@@ -210,7 +210,7 @@ fully_async_got_chunk (SoupMessage *msg,
- {
- 	FullyAsyncData *ad = user_data;
- 
--	dprintf (2, "  got chunk from %lu - %lu\n",
-+	dprintfsoup (2, "  got chunk from %lu - %lu\n",
- 		 (unsigned long) ad->read_so_far,
- 		 (unsigned long) ad->read_so_far + msg->response.length);
- 
-@@ -227,13 +227,13 @@ fully_async_got_chunk (SoupMessage *msg,
- 	 * somewhere.
- 	 */
- 	if (ad->read_so_far + msg->response.length > correct_response_len) {
--		dprintf (1, "  read too far! (%lu > %lu)\n",
-+		dprintfsoup (1, "  read too far! (%lu > %lu)\n",
- 			 (unsigned long) (ad->read_so_far + msg->response.length),
- 			 (unsigned long) correct_response_len);
- 		errors++;
- 	} else if (memcmp (msg->response.body, correct_response + ad->read_so_far,
- 			   msg->response.length) != 0) {
--		dprintf (1, "  data mismatch in block starting at %lu\n",
-+		dprintfsoup (1, "  data mismatch in block starting at %lu\n",
- 			 (unsigned long) ad->read_so_far);
- 		errors++;
- 	}
-@@ -257,7 +257,7 @@ fully_async_finished (SoupMessage *msg,
- 	FullyAsyncData *ad = user_data;
- 
- 	if (msg->status_code != ad->expected_status) {
--		dprintf (1, "  unexpected final status: %d %s !\n",
-+		dprintfsoup (1, "  unexpected final status: %d %s !\n",
- 			 msg->status_code, msg->reason_phrase);
- 		errors++;
- 	}
-@@ -300,7 +300,7 @@ do_synchronously_async_test (SoupSession
- 	GByteArray *chunk;
- 
- 	uri = g_build_filename (base_uri, sub_uri, NULL);
--	dprintf (1, "GET %s\n", uri);
-+	dprintfsoup (1, "GET %s\n", uri);
- 
- 	msg = soup_message_new (SOUP_METHOD_GET, uri);
- 	g_free (uri);
-@@ -314,11 +314,11 @@ do_synchronously_async_test (SoupSession
- 	sync_async_send (session, msg);
- 	if (msg->status == SOUP_MESSAGE_STATUS_FINISHED &&
- 	    expected_status == SOUP_STATUS_OK) {
--		dprintf (1, "  finished without reading response!\n");
-+		dprintfsoup (1, "  finished without reading response!\n");
- 		errors++;
- 	} else if (msg->status != SOUP_MESSAGE_STATUS_FINISHED &&
- 		   expected_status != SOUP_STATUS_OK) {
--		dprintf (1, "  request failed to fail!\n");
-+		dprintfsoup (1, "  request failed to fail!\n");
- 		errors++;
- 	}
- 
-@@ -327,19 +327,19 @@ do_synchronously_async_test (SoupSession
- 	 */
- 	read_so_far = 0;
- 	while ((chunk = sync_async_read_chunk (msg))) {
--		dprintf (2, "  read chunk from %lu - %lu\n",
-+		dprintfsoup (2, "  read chunk from %lu - %lu\n",
- 			 (unsigned long) read_so_far,
- 			 (unsigned long) read_so_far + chunk->len);
- 
- 		if (read_so_far + chunk->len > correct_response_len) {
--			dprintf (1, "  read too far! (%lu > %lu)\n",
-+			dprintfsoup (1, "  read too far! (%lu > %lu)\n",
- 				 (unsigned long) read_so_far + chunk->len,
- 				 (unsigned long) correct_response_len);
- 			errors++;
- 		} else if (memcmp (chunk->data,
- 				   correct_response + read_so_far,
- 				   chunk->len) != 0) {
--			dprintf (1, "  data mismatch in block starting at %lu\n",
-+			dprintfsoup (1, "  data mismatch in block starting at %lu\n",
- 				 (unsigned long) read_so_far);
- 			errors++;
- 		}
-@@ -350,10 +350,10 @@ do_synchronously_async_test (SoupSession
- 	if (msg->status != SOUP_MESSAGE_STATUS_FINISHED ||
- 	    (msg->status_code == SOUP_STATUS_OK &&
- 	     read_so_far != correct_response_len)) {
--		dprintf (1, "  loop ended before message was fully read!\n");
-+		dprintfsoup (1, "  loop ended before message was fully read!\n");
- 		errors++;
- 	} else if (msg->status_code != expected_status) {
--		dprintf (1, "  unexpected final status: %d %s !\n",
-+		dprintfsoup (1, "  unexpected final status: %d %s !\n",
- 			 msg->status_code, msg->reason_phrase);
- 		errors++;
- 	}
-@@ -413,14 +413,14 @@ sync_async_got_headers (SoupMessage *msg
- {
- 	SyncAsyncData *ad = user_data;
- 
--	dprintf (1, "  %d %s\n", msg->status_code, msg->reason_phrase);
-+	dprintfsoup (1, "  %d %s\n", msg->status_code, msg->reason_phrase);
- 	if (msg->status_code == SOUP_STATUS_UNAUTHORIZED) {
- 		/* Let soup handle this one; this got_headers handler
- 		 * will get called again next time around.
- 		 */
- 		return;
- 	} else if (msg->status_code != SOUP_STATUS_OK) {
--		dprintf (1, "  unexpected status: %d %s\n",
-+		dprintfsoup (1, "  unexpected status: %d %s\n",
- 			 msg->status_code, msg->reason_phrase);
- 		errors++;
- 		return;
-@@ -526,7 +526,7 @@ main (int argc, char **argv)
- 	base_uri = "http://localhost:47524/";
- 	get_correct_response (base_uri);
- 
--	dprintf (1, "\nFully async, fast requests\n");
-+	dprintfsoup (1, "\nFully async, fast requests\n");
- 	session = soup_session_async_new ();
- 	g_signal_connect (session, "authenticate",
- 			  G_CALLBACK (authenticate), NULL);
-@@ -539,7 +539,7 @@ main (int argc, char **argv)
- 	soup_session_abort (session);
- 	g_object_unref (session);
- 
--	dprintf (1, "\nFully async, slow requests\n");
-+	dprintfsoup (1, "\nFully async, slow requests\n");
- 	session = soup_session_async_new ();
- 	g_signal_connect (session, "authenticate",
- 			  G_CALLBACK (authenticate), NULL);
-@@ -552,7 +552,7 @@ main (int argc, char **argv)
- 	soup_session_abort (session);
- 	g_object_unref (session);
- 
--	dprintf (1, "\nSynchronously async\n");
-+	dprintfsoup (1, "\nSynchronously async\n");
- 	session = soup_session_async_new ();
- 	g_signal_connect (session, "authenticate",
- 			  G_CALLBACK (authenticate), NULL);
-@@ -571,7 +571,7 @@ main (int argc, char **argv)
- 	apache_cleanup ();
- 	g_main_context_unref (g_main_context_default ());
- 
--	dprintf (1, "\n");
-+	dprintfsoup (1, "\n");
- 	if (errors) {
- 		printf ("pull-api: %d error(s). Run with '-d' for details\n",
- 			errors);
-diff -rupN libsoup-2.2.105/tests/uri-parsing.c libsoup-2.2.105.new//tests/uri-parsing.c
---- libsoup-2.2.105/tests/uri-parsing.c	2007-10-28 19:57:03.000000000 +0200
-+++ libsoup-2.2.105.new//tests/uri-parsing.c	2012-01-16 20:10:35.000000000 +0200
-@@ -10,7 +10,7 @@
- gboolean debug = FALSE;
- 
- static void
--dprintf (const char *format, ...)
-+dprintfsoup (const char *format, ...)
- {
- 	va_list args;
- 
-@@ -113,21 +113,21 @@ do_uri (SoupUri *base_uri, const char *b
- 	char *uri_string;
- 
- 	if (base_uri) {
--		dprintf ("<%s> + <%s> = <%s>? ", base_str, in_uri,
-+		dprintfsoup ("<%s> + <%s> = <%s>? ", base_str, in_uri,
- 			 out_uri ? out_uri : "ERR");
- 		uri = soup_uri_new_with_base (base_uri, in_uri);
- 	} else {
--		dprintf ("<%s> => <%s>? ", in_uri,
-+		dprintfsoup ("<%s> => <%s>? ", in_uri,
- 			 out_uri ? out_uri : "ERR");
- 		uri = soup_uri_new (in_uri);
- 	}
- 
- 	if (!uri) {
- 		if (out_uri) {
--			dprintf ("ERR\n  Could not parse %s\n", in_uri);
-+			dprintfsoup ("ERR\n  Could not parse %s\n", in_uri);
- 			return FALSE;
- 		} else {
--			dprintf ("OK\n");
-+			dprintfsoup ("OK\n");
- 			return TRUE;
- 		}
- 	}
-@@ -136,18 +136,18 @@ do_uri (SoupUri *base_uri, const char *b
- 	soup_uri_free (uri);
- 
- 	if (!out_uri) {
--		dprintf ("ERR\n  Got %s\n", uri_string);
-+		dprintfsoup ("ERR\n  Got %s\n", uri_string);
- 		return FALSE;
- 	}
- 
- 	if (strcmp (uri_string, out_uri) != 0) {
--		dprintf ("NO\n  Unparses to <%s>\n", uri_string);
-+		dprintfsoup ("NO\n  Unparses to <%s>\n", uri_string);
- 		g_free (uri_string);
- 		return FALSE;
- 	}
- 	g_free (uri_string);
- 
--	dprintf ("OK\n");
-+	dprintfsoup ("OK\n");
- 	return TRUE;
- }
- 
-@@ -169,14 +169,14 @@ main (int argc, char **argv)
- 		}
- 	}
- 
--	dprintf ("Absolute URI parsing\n");
-+	dprintfsoup ("Absolute URI parsing\n");
- 	for (i = 0; i < num_abs_tests; i++) {
- 		if (!do_uri (NULL, NULL, abs_tests[i].uri_string,
- 			     abs_tests[i].result))
- 			errs++;
- 	}
- 
--	dprintf ("\nRelative URI parsing\n");
-+	dprintfsoup ("\nRelative URI parsing\n");
- 	base_uri = soup_uri_new (base);
- 	if (!base_uri) {
- 		fprintf (stderr, "Could not parse %s!\n", base);
-@@ -198,7 +198,7 @@ main (int argc, char **argv)
- 	}
- 	soup_uri_free (base_uri);
- 
--	dprintf ("\n");
-+	dprintfsoup ("\n");
- 	if (errs) {
- 		printf ("uri-parsing: %d error(s). Run with '-d' for details\n",
- 			errs);
-diff -rupN libsoup-2.2.105/tests/xmlrpc-test.c libsoup-2.2.105.new//tests/xmlrpc-test.c
---- libsoup-2.2.105/tests/xmlrpc-test.c	2008-02-08 04:19:00.000000000 +0200
-+++ libsoup-2.2.105.new//tests/xmlrpc-test.c	2012-01-16 20:12:18.000000000 +0200
-@@ -19,7 +19,7 @@ static const char *uri = "http://localho
- int debug;
- 
- static void
--dprintf (int level, const char *format, ...)
-+dprintfsoup (int level, const char *format, ...)
- {
- 	va_list args;
- 
-@@ -54,13 +54,13 @@ do_xmlrpc (SoupXmlrpcMessage *xmsg, Soup
- 	soup_xmlrpc_message_persist (xmsg);
- 	status = soup_session_send_message (session, msg);
- 
--	dprintf (3, "\n%.*s\n%d %s\n%.*s\n",
-+	dprintfsoup (3, "\n%.*s\n%d %s\n%.*s\n",
- 		 msg->request.length, msg->request.body,
- 		 msg->status_code, msg->reason_phrase,
- 		 msg->response.length, msg->response.body);
- 
- 	if (!SOUP_STATUS_IS_SUCCESSFUL (status)) {
--		dprintf (1, "ERROR: %d %s\n", status, msg->reason_phrase);
-+		dprintfsoup (1, "ERROR: %d %s\n", status, msg->reason_phrase);
- 		g_object_unref (msg);
- 		return FALSE;
- 	}
-@@ -69,9 +69,9 @@ do_xmlrpc (SoupXmlrpcMessage *xmsg, Soup
- 	g_object_unref (msg);
- 	if (!response || soup_xmlrpc_response_is_fault (response)) {
- 		if (!response)
--			dprintf (1, "ERROR: no response\n");
-+			dprintfsoup (1, "ERROR: no response\n");
- 		else {
--			dprintf (1, "ERROR: fault\n");
-+			dprintfsoup (1, "ERROR: fault\n");
- 			g_object_unref (response);
- 		}
- 		return FALSE;
-@@ -79,11 +79,11 @@ do_xmlrpc (SoupXmlrpcMessage *xmsg, Soup
- 
- 	value = soup_xmlrpc_response_get_value (response);
- 	if (!value) {
--		dprintf (1, "ERROR: no value?\n");
-+		dprintfsoup (1, "ERROR: no value?\n");
- 		g_object_unref (response);
- 		return NULL;
- 	} else if (soup_xmlrpc_value_get_type (value) != type) {
--		dprintf (1, "ERROR: wrong value type; expected %s, got %s\n",
-+		dprintfsoup (1, "ERROR: wrong value type; expected %s, got %s\n",
- 			 value_type[type], value_type[soup_xmlrpc_value_get_type (value)]);
- 		g_object_unref (response);
- 		return NULL;
-@@ -101,7 +101,7 @@ test_sum (void)
- 	int i, val, sum;
- 	long result;
- 
--	dprintf (1, "sum (array of int -> int): ");
-+	dprintfsoup (1, "sum (array of int -> int): ");
- 
- 	msg = soup_xmlrpc_message_new (uri);
- 	soup_xmlrpc_message_start_call (msg, "sum");
-@@ -109,11 +109,11 @@ test_sum (void)
- 	soup_xmlrpc_message_start_array (msg);
- 	for (i = sum = 0; i < 10; i++) {
- 		val = rand () % 100;
--		dprintf (2, "%s%d", i == 0 ? "[" : ", ", val);
-+		dprintfsoup (2, "%s%d", i == 0 ? "[" : ", ", val);
- 		soup_xmlrpc_message_write_int (msg, val);
- 		sum += val;
- 	}
--	dprintf (2, "] -> ");
-+	dprintfsoup (2, "] -> ");
- 	soup_xmlrpc_message_end_array (msg);
- 	soup_xmlrpc_message_end_param (msg);
- 	soup_xmlrpc_message_end_call (msg);
-@@ -124,14 +124,14 @@ test_sum (void)
- 	value = soup_xmlrpc_response_get_value (response);
- 
- 	if (!soup_xmlrpc_value_get_int (value, &result)) {
--		dprintf (1, "wrong type?\n");
-+		dprintfsoup (1, "wrong type?\n");
- 		g_object_unref (response);
- 		return FALSE;
- 	}
- 	g_object_unref (response);
- 
--	dprintf (2, "%ld: ", result);
--	dprintf (1, "%s\n", result == sum ? "OK!" : "WRONG!");
-+	dprintfsoup (2, "%ld: ", result);
-+	dprintfsoup (1, "%s\n", result == sum ? "OK!" : "WRONG!");
- 	return result == sum;
- }
- 
-@@ -146,7 +146,7 @@ test_countBools (void)
- 	gboolean val, ok;
- 	GHashTable *result;
- 
--	dprintf (1, "countBools (array of boolean -> struct of ints): ");
-+	dprintfsoup (1, "countBools (array of boolean -> struct of ints): ");
- 
- 	msg = soup_xmlrpc_message_new (uri);
- 	soup_xmlrpc_message_start_call (msg, "countBools");
-@@ -154,14 +154,14 @@ test_countBools (void)
- 	soup_xmlrpc_message_start_array (msg);
- 	for (i = trues = falses = 0; i < 10; i++) {
- 		val = rand () > (RAND_MAX / 2);
--		dprintf (2, "%s%c", i == 0 ? "[" : ", ", val ? 'T' : 'F');
-+		dprintfsoup (2, "%s%c", i == 0 ? "[" : ", ", val ? 'T' : 'F');
- 		soup_xmlrpc_message_write_boolean (msg, val);
- 		if (val)
- 			trues++;
- 		else
- 			falses++;
- 	}
--	dprintf (2, "] -> ");
-+	dprintfsoup (2, "] -> ");
- 	soup_xmlrpc_message_end_array (msg);
- 	soup_xmlrpc_message_end_param (msg);
- 	soup_xmlrpc_message_end_call (msg);
-@@ -172,19 +172,19 @@ test_countBools (void)
- 	value = soup_xmlrpc_response_get_value (response);
- 
- 	if (!soup_xmlrpc_value_get_struct (value, &result)) {
--		dprintf (1, "wrong type?\n");
-+		dprintfsoup (1, "wrong type?\n");
- 		g_object_unref (response);
- 		return FALSE;
- 	}
- 
- 	if (!soup_xmlrpc_value_get_int (g_hash_table_lookup (result, "true"), &ret_trues)) {
--		dprintf (1, "NO 'true' value in response\n");
-+		dprintfsoup (1, "NO 'true' value in response\n");
- 		g_hash_table_destroy (result);
- 		g_object_unref (response);
- 		return FALSE;
- 	}
- 	if (!soup_xmlrpc_value_get_int (g_hash_table_lookup (result, "false"), &ret_falses)) {
--		dprintf (1, "NO 'false' value in response\n");
-+		dprintfsoup (1, "NO 'false' value in response\n");
- 		g_hash_table_destroy (result);
- 		g_object_unref (response);
- 		return FALSE;
-@@ -192,9 +192,9 @@ test_countBools (void)
- 	g_hash_table_destroy (result);
- 	g_object_unref (response);
- 
--	dprintf (2, "{ true: %ld, false: %ld } ", ret_trues, ret_falses);
-+	dprintfsoup (2, "{ true: %ld, false: %ld } ", ret_trues, ret_falses);
- 	ok = (trues == ret_trues) && (falses == ret_falses);
--	dprintf (1, "%s\n", ok ? "OK!" : "WRONG!");
-+	dprintfsoup (1, "%s\n", ok ? "OK!" : "WRONG!");
- 	return ok;
- }
- 
-@@ -211,7 +211,7 @@ test_md5sum (void)
- 	guchar digest[16];
- 	gboolean ok;
- 
--	dprintf (1, "md5sum (base64 -> base64): ");
-+	dprintfsoup (1, "md5sum (base64 -> base64): ");
- 
- 	msg = soup_xmlrpc_message_new (uri);
- 	soup_xmlrpc_message_start_call (msg, "md5sum");
-@@ -228,14 +228,14 @@ test_md5sum (void)
- 	value = soup_xmlrpc_response_get_value (response);
- 
- 	if (!soup_xmlrpc_value_get_base64 (value, &result)) {
--		dprintf (1, "wrong type?\n");
-+		dprintfsoup (1, "wrong type?\n");
- 		g_object_unref (response);
- 		return FALSE;
- 	}
- 	g_object_unref (response);
- 
- 	if (result->len != 16) {
--		dprintf (1, "result has WRONG length (%d)\n", result->len);
-+		dprintfsoup (1, "result has WRONG length (%d)\n", result->len);
- 		g_byte_array_free (result, TRUE);
- 		return FALSE;
- 	}
-@@ -245,7 +245,7 @@ test_md5sum (void)
- 	soup_md5_final (&md5, digest);
- 
- 	ok = (memcmp (digest, result->data, 16) == 0);
--	dprintf (1, "%s\n", ok ? "OK!" : "WRONG!");
-+	dprintfsoup (1, "%s\n", ok ? "OK!" : "WRONG!");
- 	g_byte_array_free (result, TRUE);
- 	return ok;
- }
-@@ -260,7 +260,7 @@ test_dateChange (void)
- 	time_t when, result;
- 	char timestamp[128];
- 
--	dprintf (1, "dateChange (struct of time and ints -> time): ");
-+	dprintfsoup (1, "dateChange (struct of time and ints -> time): ");
- 
- 	msg = soup_xmlrpc_message_new (uri);
- 	soup_xmlrpc_message_start_call (msg, "dateChange");
-@@ -281,53 +281,53 @@ test_dateChange (void)
- 
- 	strftime (timestamp, sizeof (timestamp),
- 		  "%Y-%m-%dT%H:%M:%S", &tm);
--	dprintf (2, "{ date: %s", timestamp);
-+	dprintfsoup (2, "{ date: %s", timestamp);
- 
- 	if (rand () % 3) {
- 		tm.tm_year = 70 + (rand () % 50);
--		dprintf (2, ", tm_year: %d", tm.tm_year);
-+		dprintfsoup (2, ", tm_year: %d", tm.tm_year);
- 		soup_xmlrpc_message_start_member (msg, "tm_year");
- 		soup_xmlrpc_message_write_int (msg, tm.tm_year);
- 		soup_xmlrpc_message_end_member (msg);
- 	}
- 	if (rand () % 3) {
- 		tm.tm_mon = rand () % 12;
--		dprintf (2, ", tm_mon: %d", tm.tm_mon);
-+		dprintfsoup (2, ", tm_mon: %d", tm.tm_mon);
- 		soup_xmlrpc_message_start_member (msg, "tm_mon");
- 		soup_xmlrpc_message_write_int (msg, tm.tm_mon);
- 		soup_xmlrpc_message_end_member (msg);
- 	}
- 	if (rand () % 3) {
- 		tm.tm_mday = 1 + (rand () % 28);
--		dprintf (2, ", tm_mday: %d", tm.tm_mday);
-+		dprintfsoup (2, ", tm_mday: %d", tm.tm_mday);
- 		soup_xmlrpc_message_start_member (msg, "tm_mday");
- 		soup_xmlrpc_message_write_int (msg, tm.tm_mday);
- 		soup_xmlrpc_message_end_member (msg);
- 	}
- 	if (rand () % 3) {
- 		tm.tm_hour = rand () % 24;
--		dprintf (2, ", tm_hour: %d", tm.tm_hour);
-+		dprintfsoup (2, ", tm_hour: %d", tm.tm_hour);
- 		soup_xmlrpc_message_start_member (msg, "tm_hour");
- 		soup_xmlrpc_message_write_int (msg, tm.tm_hour);
- 		soup_xmlrpc_message_end_member (msg);
- 	}
- 	if (rand () % 3) {
- 		tm.tm_min = rand () % 60;
--		dprintf (2, ", tm_min: %d", tm.tm_min);
-+		dprintfsoup (2, ", tm_min: %d", tm.tm_min);
- 		soup_xmlrpc_message_start_member (msg, "tm_min");
- 		soup_xmlrpc_message_write_int (msg, tm.tm_min);
- 		soup_xmlrpc_message_end_member (msg);
- 	}
- 	if (rand () % 3) {
- 		tm.tm_sec = rand () % 60;
--		dprintf (2, ", tm_sec: %d", tm.tm_sec);
-+		dprintfsoup (2, ", tm_sec: %d", tm.tm_sec);
- 		soup_xmlrpc_message_start_member (msg, "tm_sec");
- 		soup_xmlrpc_message_write_int (msg, tm.tm_sec);
- 		soup_xmlrpc_message_end_member (msg);
- 	}
- 	when = soup_mktime_utc (&tm);
- 
--	dprintf (2, " } -> ");
-+	dprintfsoup (2, " } -> ");
- 
- 	soup_xmlrpc_message_end_struct (msg);
- 	soup_xmlrpc_message_end_param (msg);
-@@ -339,7 +339,7 @@ test_dateChange (void)
- 	value = soup_xmlrpc_response_get_value (response);
- 
- 	if (!soup_xmlrpc_value_get_datetime (value, &result)) {
--		dprintf (1, "wrong type?\n");
-+		dprintfsoup (1, "wrong type?\n");
- 		g_object_unref (response);
- 		return FALSE;
- 	}
-@@ -348,9 +348,9 @@ test_dateChange (void)
- 	memset (&tm, 0, sizeof (tm));
- 	soup_gmtime (&result, &tm);
- 	strftime (timestamp, sizeof (timestamp), "%Y-%m-%dT%H:%M:%S", &tm);
--	dprintf (2, "%s: ", timestamp);
-+	dprintfsoup (2, "%s: ", timestamp);
- 
--	dprintf (1, "%s\n", (when == result) ? "OK!" : "WRONG!");
-+	dprintfsoup (1, "%s\n", (when == result) ? "OK!" : "WRONG!");
- 	return (when == result);
- }
- 
-@@ -372,17 +372,17 @@ test_echo (void)
- 	char *echo;
- 	int i;
- 
--	dprintf (1, "echo (array of string -> array of string): ");
-+	dprintfsoup (1, "echo (array of string -> array of string): ");
- 
- 	msg = soup_xmlrpc_message_new (uri);
- 	soup_xmlrpc_message_start_call (msg, "echo");
- 	soup_xmlrpc_message_start_param (msg);
- 	soup_xmlrpc_message_start_array (msg);
- 	for (i = 0; i < N_ECHO_STRINGS; i++) {
--		dprintf (2, "%s\"%s\"", i == 0 ? "[" : ", ", echo_strings[i]);
-+		dprintfsoup (2, "%s\"%s\"", i == 0 ? "[" : ", ", echo_strings[i]);
- 		soup_xmlrpc_message_write_string (msg, echo_strings[i]);
- 	}
--	dprintf (2, "] -> ");
-+	dprintfsoup (2, "] -> ");
- 	soup_xmlrpc_message_end_array (msg);
- 	soup_xmlrpc_message_end_param (msg);
- 	soup_xmlrpc_message_end_call (msg);
-@@ -393,25 +393,25 @@ test_echo (void)
- 	value = soup_xmlrpc_response_get_value (response);
- 
- 	if (!soup_xmlrpc_value_array_get_iterator (value, &iter)) {
--		dprintf (1, "wrong type?\n");
-+		dprintfsoup (1, "wrong type?\n");
- 		g_object_unref (response);
- 		return FALSE;
- 	}
- 	i = 0;
- 	while (iter) {
- 		if (!soup_xmlrpc_value_array_iterator_get_value (iter, &elt)) {
--			dprintf (1, " WRONG! Can't get result element %d\n", i + 1);
-+			dprintfsoup (1, " WRONG! Can't get result element %d\n", i + 1);
- 			g_object_unref (response);
- 			return FALSE;
- 		}
- 		if (!soup_xmlrpc_value_get_string (elt, &echo)) {
--			dprintf (1, " WRONG! Result element %d is not a string", i + 1);
-+			dprintfsoup (1, " WRONG! Result element %d is not a string", i + 1);
- 			g_object_unref (response);
- 			return FALSE;
- 		}
--		dprintf (2, "%s\"%s\"", i == 0 ? "[" : ", ", echo);
-+		dprintfsoup (2, "%s\"%s\"", i == 0 ? "[" : ", ", echo);
- 		if (strcmp (echo_strings[i], echo) != 0) {
--			dprintf (1, " WRONG! Mismatch at %d\n", i + 1);
-+			dprintfsoup (1, " WRONG! Mismatch at %d\n", i + 1);
- 			g_free (echo);
- 			g_object_unref (response);
- 			return FALSE;
-@@ -421,10 +421,10 @@ test_echo (void)
- 		iter = soup_xmlrpc_value_array_iterator_next (iter);
- 		i++;
- 	}
--	dprintf (2, "] ");
-+	dprintfsoup (2, "] ");
- 	g_object_unref (response);
- 
--	dprintf (1, "%s\n", i == N_ECHO_STRINGS ? "OK!" : "WRONG! Too few results");
-+	dprintfsoup (1, "%s\n", i == N_ECHO_STRINGS ? "OK!" : "WRONG! Too few results");
- 	return i == N_ECHO_STRINGS;
- }
- 
-@@ -480,7 +480,7 @@ main (int argc, char **argv)
- 
- 	apache_cleanup ();
- 
--	dprintf (1, "\n");
-+	dprintfsoup (1, "\n");
- 	if (errors) {
- 		printf ("xmlrpc-test: %d error(s). Run with '-d' for details\n",
- 			errors);

85 lines not on this page · raw message

deleted file mode 100644
index 9b5d4f8..0000000
@@ -1,20 +0,0 @@
-DESCRIPTION = "An HTTP library implementation in C"
-SECTION = "x11/gnome/libs"
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
-PR = "r4"
-
-DEPENDS = "glib-2.0 gnutls libxml2"
-
-SRC_URI = "${GNOME_MIRROR}/${BPN}/2.2/${BPN}-${PV}.tar.bz2 \
-	    file://dprintf_conflict_with_eglibc.patch \
-            file://fix-for-new-glib.patch"
-
-SRC_URI[md5sum] = "7fa48b06a0e2b0ff3d2fa45cf331f169"
-SRC_URI[sha256sum] = "3760a127ee810cfd0fda257ff615d19a2dd8aeece199dad0d18690446df72e8f"
-
-inherit autotools pkgconfig
-
-#FILES_${PN} = "${libdir}/lib*.so.*"
-#FILES_${PN}-dev = "${includedir}/ ${libdir}/"
-#FILES_${PN}-doc = "${datadir}/"