diff -u jabber-1.4.3/debian/control jabber-1.4.3/debian/control --- jabber-1.4.3/debian/control +++ jabber-1.4.3/debian/control @@ -1,10 +1,10 @@ Source: jabber Section: net Priority: optional +XSBC-Original-Maintainer: Debian QA Group Maintainer: Ubuntu MOTU Developers -XSBC-Original-Maintainer: Jamin W. Collins Standards-Version: 3.7.2 -Build-Depends: dpatch, libpth-dev (>= 2.0.7-2ubuntu2), libssl-dev (>=0.9.5), debhelper (>=4), libexpat1-dev (>= 1.95.6) +Build-Depends: dpatch, libpth-dev (>=2.0.0), libssl-dev (>=0.9.5), debhelper (>=4), libexpat1-dev (>= 1.95.6) Package: jabber Architecture: any diff -u jabber-1.4.3/debian/changelog jabber-1.4.3/debian/changelog --- jabber-1.4.3/debian/changelog +++ jabber-1.4.3/debian/changelog @@ -1,3 +1,26 @@ +jabber (1.4.3-3.6ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #326253), Ubuntu remaining changes: + - debian/init.d: create /var/run/jabber if it isn't already there, to cope + with the New World Order of /var/run on tmpfs. + + -- Alessio Treglia Sun, 08 Feb 2009 18:13:08 +0100 + +jabber (1.4.3-3.6) unstable; urgency=low + + * Really patch configure to fix build on GNU/kFreeBSD (closes: + #512611). + + -- Aurelien Jarno Sat, 07 Feb 2009 14:49:45 +0100 + +jabber (1.4.3-3.5) unstable; urgency=low + + * QA Upload. + * Set maintainer to Debian QA Group. + * Fix build on GNU/kFreeBSD (closes: #512611) + + -- Aurelien Jarno Fri, 06 Feb 2009 02:45:10 +0100 + jabber (1.4.3-3.4ubuntu1) intrepid; urgency=low * Merge from Debian unstable. Remaining Ubuntu changes: @@ -340 +362,0 @@ - only in patch2: unchanged: --- jabber-1.4.3.orig/configure +++ jabber-1.4.3/configure @@ -143,7 +143,7 @@ printf "Setting Build Parameters..." hosttype=`uname -s` case $hosttype in - Linux) + Linux|GNU*) CFLAGS="$CFLAGS -fPIC" LIBS="$LIBS -ldl -lresolv" SLIBS="$SLIBS /usr/lib/libresolv.a";