diff -Naur gearmand-0.14/debian//changelog gearmand-0.23/debian//changelog --- gearmand-0.14/debian//changelog 2011-02-05 18:21:46.000000000 +0100 +++ gearmand-0.23/debian//changelog 2011-07-21 14:14:17.887998113 +0200 @@ -1,3 +1,11 @@ +gearmand (0.23-0ubuntu1) oneiric; urgency=low + + * New upstream release. (LP: #682680) + * Drop ipv6 patch as this is fixed upstream. + * debian/control: update/added build-deps. + + -- Jean-Louis Dupond Thu, 21 Jul 2011 12:28:44 +0200 + gearmand (0.14-1) unstable; urgency=low * New upstream release. (Closes: #590116) diff -Naur gearmand-0.14/debian//control gearmand-0.23/debian//control --- gearmand-0.14/debian//control 2011-02-05 18:21:46.000000000 +0100 +++ gearmand-0.23/debian//control 2011-07-21 14:12:55.748031762 +0200 @@ -1,8 +1,9 @@ Source: gearmand Section: misc Priority: optional -Maintainer: Monty Taylor -Build-Depends: debhelper (>= 7.0.50), libevent-dev, uuid-dev, libdrizzle-dev (>= 0.3), doxygen, libmemcached-dev (>= 0.30), libsqlite3-dev, libpq-dev, memcached, procps, automake, autoconf, libtool +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Monty Taylor +Build-Depends: debhelper (>= 7.0.50), pkg-config, libevent-dev, uuid-dev, libdrizzle-dev (>= 0.3), doxygen, libmemcached-dev (>= 0.30), libsqlite3-dev, libpq-dev, memcached, procps, automake, autoconf, libtool, libboost-dev, libboost-program-options-dev, libtokyocabinet-dev Standards-Version: 3.9.1 Homepage: http://launchpad.net/gearmand Vcs-Browser: http://bazaar.launchpad.net/~gearman-developers/debian/sid/gearmand/sid/files diff -Naur gearmand-0.14/debian//docs gearmand-0.23/debian//docs --- gearmand-0.14/debian//docs 2011-02-05 18:21:46.000000000 +0100 +++ gearmand-0.23/debian//docs 2011-07-21 12:58:58.188031819 +0200 @@ -1,2 +1,6 @@ +AUTHORS +COPYING +HACKING NEWS README +THANKS diff -Naur gearmand-0.14/debian//libgearman-doc.doc-base.api gearmand-0.23/debian//libgearman-doc.doc-base.api --- gearmand-0.14/debian//libgearman-doc.doc-base.api 2011-02-05 18:21:46.000000000 +0100 +++ gearmand-0.23/debian//libgearman-doc.doc-base.api 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -Document: libgearman-api -Title: libgearman API Documentation -Author: Eric Day -Abstract: Public API doxygen descriptions for libgearman -Section: Programming/C - -Format: HTML -Index: /usr/share/doc/libgearman-doc/api/html/index.html -Files: /usr/share/doc/libgearman-doc/api/html/*.html diff -Naur gearmand-0.14/debian//libgearman-doc.doc-base.dev gearmand-0.23/debian//libgearman-doc.doc-base.dev --- gearmand-0.14/debian//libgearman-doc.doc-base.dev 2011-02-05 18:21:46.000000000 +0100 +++ gearmand-0.23/debian//libgearman-doc.doc-base.dev 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -Document: libgearman-dev -Title: libgearman Developer Documentation -Author: Eric Day -Abstract: Internal developer doxygen descriptions for libgearman -Section: Programming/C - -Format: HTML -Index: /usr/share/doc/libgearman-doc/dev/html/index.html -Files: /usr/share/doc/libgearman-doc/dev/html/*.html diff -Naur gearmand-0.14/debian//libgearman-doc.docs gearmand-0.23/debian//libgearman-doc.docs --- gearmand-0.14/debian//libgearman-doc.docs 2011-02-05 18:21:46.000000000 +0100 +++ gearmand-0.23/debian//libgearman-doc.docs 2011-07-21 13:28:32.928032168 +0200 @@ -1,2 +1 @@ -docs/api -docs/dev +docs/man diff -Naur gearmand-0.14/debian//patches/ipv6.patch gearmand-0.23/debian//patches/ipv6.patch --- gearmand-0.14/debian//patches/ipv6.patch 2011-02-05 18:21:46.000000000 +0100 +++ gearmand-0.23/debian//patches/ipv6.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -Description: Fix sockaddr storage for IPv6 addresses. -Forwarded: Fixed in trunk -Author: Stig Sandbeck Mathisen -Last-Update: 2011-01-21 -Index: gearmand-0.14/libgearman-server/gearmand.c -=================================================================== ---- gearmand-0.14.orig/libgearman-server/gearmand.c 2010-12-14 10:55:02.444346085 +0100 -+++ gearmand-0.14/libgearman-server/gearmand.c 2010-12-14 10:56:00.414345977 +0100 -@@ -500,14 +500,14 @@ - void *arg) - { - gearmand_port_st *port= (gearmand_port_st *)arg; -- struct sockaddr sa; -+ struct sockaddr_storage sa; - socklen_t sa_len; - char host[NI_MAXHOST]; - char port_str[NI_MAXSERV]; - int ret; - - sa_len= sizeof(sa); -- fd= accept(fd, &sa, &sa_len); -+ fd= accept(fd, (struct sockaddr *)&sa, &sa_len); - if (fd == -1) - { - if (errno == EINTR) diff -Naur gearmand-0.14/debian//patches/series gearmand-0.23/debian//patches/series --- gearmand-0.14/debian//patches/series 2011-02-05 18:21:46.000000000 +0100 +++ gearmand-0.23/debian//patches/series 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ipv6.patch diff -Naur gearmand-0.14/debian//rules gearmand-0.23/debian//rules --- gearmand-0.14/debian//rules 2011-02-05 18:21:46.000000000 +0100 +++ gearmand-0.23/debian//rules 2011-07-21 12:57:40.398031954 +0200 @@ -15,10 +15,6 @@ $(MAKE) test endif -override_dh_auto_build: - dh_auto_build - $(MAKE) docs - override_dh_installchangelogs: dh_installchangelogs ChangeLog