diff -u libyahoo2-0.7.6/debian/rules libyahoo2-0.7.6/debian/rules --- libyahoo2-0.7.6/debian/rules +++ libyahoo2-0.7.6/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +include /usr/share/dpatch/dpatch.make + # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -30,12 +32,12 @@ --prefix=/usr build: build-stamp -build-stamp: config.status +build-stamp: patch-stamp config.status dh_testdir $(MAKE) touch $@ -clean: +clean: unpatch dh_testdir dh_testroot rm -f build-stamp diff -u libyahoo2-0.7.6/debian/control libyahoo2-0.7.6/debian/control --- libyahoo2-0.7.6/debian/control +++ libyahoo2-0.7.6/debian/control @@ -1,9 +1,10 @@ Source: libyahoo2 Priority: optional Section: libs -Maintainer: Kartik Mistry +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Kartik Mistry Uploaders: Jaldhar H. Vyas -Build-Depends: debhelper (>= 5), autotools-dev +Build-Depends: debhelper (>= 5), autotools-dev, dpatch Homepage: http://libyahoo2.sourceforge.net/ Standards-Version: 3.7.3 diff -u libyahoo2-0.7.6/debian/changelog libyahoo2-0.7.6/debian/changelog --- libyahoo2-0.7.6/debian/changelog +++ libyahoo2-0.7.6/debian/changelog @@ -1,3 +1,10 @@ +libyahoo2 (0.7.6-1ubuntu1) intrepid; urgency=low + + * Add dpatch support. + * Add h_addr_glibc28.dpatch patch, fix FTBFS (LP: #256124). + + -- Devid Antonio Filoni Fri, 08 Aug 2008 15:35:10 +0200 + libyahoo2 (0.7.6-1) unstable; urgency=low * New upstream release only in patch2: unchanged: --- libyahoo2-0.7.6.orig/debian/patches/00list +++ libyahoo2-0.7.6/debian/patches/00list @@ -0,0 +1 @@ +h_addr_glibc28 only in patch2: unchanged: --- libyahoo2-0.7.6.orig/debian/patches/h_addr_glibc28.dpatch +++ libyahoo2-0.7.6/debian/patches/h_addr_glibc28.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## h_addr_glibc28.dpatch by Devid Antonio Filoni +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix "'struct hostent' has no member named 'h_addr'" build errors. + +@DPATCH@ +diff -urNad libyahoo2-0.7.6~/src/autoresponder.c libyahoo2-0.7.6/src/autoresponder.c +--- libyahoo2-0.7.6~/src/autoresponder.c 2008-04-28 04:52:27.000000000 +0200 ++++ libyahoo2-0.7.6/src/autoresponder.c 2008-08-08 17:52:39.000000000 +0200 +@@ -265,7 +265,7 @@ + + hn = gethostbyname(buff); + if(hn) +- strncpy_term(addresses, inet_ntoa( *((struct in_addr*)hn->h_addr)), sizeof(addresses) ); ++ strncpy_term(addresses, inet_ntoa( *((struct in_addr*)hn->h_addr_list[0])), sizeof(addresses) ); + else + addresses[0] = 0; + +diff -urNad libyahoo2-0.7.6~/src/sample_client.c libyahoo2-0.7.6/src/sample_client.c +--- libyahoo2-0.7.6~/src/sample_client.c 2008-04-28 04:52:27.000000000 +0200 ++++ libyahoo2-0.7.6/src/sample_client.c 2008-08-08 17:51:27.000000000 +0200 +@@ -252,7 +252,7 @@ + + hn = gethostbyname(buff); + if(hn) +- strncpy(addresses, inet_ntoa( *((struct in_addr*)hn->h_addr)), sizeof(addresses) ); ++ strncpy(addresses, inet_ntoa( *((struct in_addr*)hn->h_addr_list[0])), sizeof(addresses) ); + else + addresses[0] = 0; +