Yes, I can. (And sorry for the noise, really.)
--
Cyril Brulebois
--- transmission-1.61/cli/Makefile.am
+++ transmission-1.61/cli/Makefile.am
@@ -17,7 +17,7 @@
transmissioncli_LDADD = \
$(top_builddir)/libtransmission/libtransmission.a \
- $(top_builddir)/third-party/libevent/libevent.la \
+ $(LIBEVENT_LDFLAGS) \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(INTLLIBS) \
--- transmission-1.61/configure.ac
+++ transmission-1.61/configure.ac
@@ -169,10 +169,10 @@
dnl
dnl libevent fun
-AC_CONFIG_SUBDIRS([third-party/libevent])
-AC_MSG_NOTICE([invoking libevent's configure script])
-LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent"
+LIBEVENT_CPPFLAGS=""
+LIBEVENT_LDFLAGS="-levent"
AC_SUBST(LIBEVENT_CPPFLAGS)
+AC_SUBST(LIBEVENT_LDFLAGS)
dnl ----------------------------------------------------------------------------
--- transmission-1.61/daemon/Makefile.am
+++ transmission-1.61/daemon/Makefile.am
@@ -21,7 +21,7 @@
$(top_builddir)/libtransmission/libtransmission.a \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
- $(top_builddir)/third-party/libevent/libevent.la \
+ $(LIBEVENT_LDFLAGS) \
$(INTLLIBS) \
$(LIBCURL_LIBS) \
$(ZLIB_LIBS) \
--- transmission-1.61/daemon/remote.c
+++ transmission-1.61/daemon/remote.c
@@ -23,7 +23,7 @@
#include <unistd.h> /* getcwd */
#endif
-#include <libevent/event.h>
+#include <event.h>
#define CURL_DISABLE_TYPECHECK /* otherwise -Wunreachable-code goes insane */
#include <curl/curl.h>
--- transmission-1.61/debian/changelog
+++ transmission-1.61/debian/changelog
@@ -1,3 +1,10 @@
+transmission (1.61-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Get rid of embedded code copy: libevent.
+
+ -- Cyril Brulebois <[email protected]> Tue, 19 May 2009 00:06:49 +0000
+
transmission (1.61-2) unstable; urgency=low
* debian/patches: remove ipv6.patch, was causing other problems
--- transmission-1.61/gtk/Makefile.am
+++ transmission-1.61/gtk/Makefile.am
@@ -98,7 +98,7 @@
transmission_LDADD = \
$(top_builddir)/libtransmission/libtransmission.a \
- $(top_builddir)/third-party/libevent/libevent.la \
+ $(LIBEVENT_LDFLAGS) \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
$(GTK_LIBS) \
--- transmission-1.61/gtk/util.c
+++ transmission-1.61/gtk/util.c
@@ -38,7 +38,7 @@
#include <dbus/dbus-glib.h>
#endif
-#include <libevent/evhttp.h>
+#include <evhttp.h>
#include <libtransmission/transmission.h> /* TR_RATIO_NA, TR_RATIO_INF */
#include <libtransmission/utils.h> /* tr_inf */
--- transmission-1.61/libtransmission/Makefile.am
+++ transmission-1.61/libtransmission/Makefile.am
@@ -123,7 +123,7 @@
./libtransmission.a \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
- $(top_builddir)/third-party/libevent/libevent.la \
+ $(LIBEVENT_LDFLAGS) \
$(INTLLIBS) \
$(LIBCURL_LIBS) \
$(OPENSSL_LIBS) \
--- transmission-1.61/libtransmission/clients.c
+++ transmission-1.61/libtransmission/clients.c
@@ -17,7 +17,7 @@
#include <stdlib.h> /* strtol */
#include <string.h>
-#include <libevent/event.h> /* evbuffer */
+#include <event.h> /* evbuffer */
#include "transmission.h"
#include "clients.h"
--- transmission-1.61/libtransmission/rpc-server.c
+++ transmission-1.61/libtransmission/rpc-server.c
@@ -24,8 +24,8 @@
#include <zlib.h>
#endif
-#include <libevent/event.h>
-#include <libevent/evhttp.h>
+#include <event.h>
+#include <evhttp.h>
#include "transmission.h"
#include "bencode.h"
--- transmission-1.61/third-party/Makefile.am
+++ transmission-1.61/third-party/Makefile.am
@@ -1,5 +1,4 @@
SUBDIRS = \
- libevent \
libnatpmp \
miniupnp
_______________________________________________
Secure-testing-team mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/secure-testing-team
