tags 424423 + patch tags 457730 + patch thanks Hi,
Attached is the diff for my jabber-muc 0.6.0-2.1 NMU.
diff -u jabber-muc-0.6.0/debian/patches/00list jabber-muc-0.6.0/debian/patches/00list --- jabber-muc-0.6.0/debian/patches/00list +++ jabber-muc-0.6.0/debian/patches/00list @@ -1,0 +2 @@ +20_bts-457730 diff -u jabber-muc-0.6.0/debian/changelog jabber-muc-0.6.0/debian/changelog --- jabber-muc-0.6.0/debian/changelog +++ jabber-muc-0.6.0/debian/changelog @@ -1,3 +1,13 @@ +jabber-muc (0.6.0-2.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/rules + - fixed FTBFS if built twice in a row (Closes: #424423) + * debian/patches/20_bts-457730.dpatch + - added from BTS (Closes: #457730) + + -- Sandro Tosi <[EMAIL PROTECTED]> Wed, 09 Apr 2008 18:51:13 +0200 + jabber-muc (0.6.0-2) unstable; urgency=low * added needed build depends on libglib2.0-dev (Closes: #228877) diff -u jabber-muc-0.6.0/debian/rules jabber-muc-0.6.0/debian/rules --- jabber-muc-0.6.0/debian/rules +++ jabber-muc-0.6.0/debian/rules @@ -46,6 +46,8 @@ # Add here commands to clean up after the build process. -$(MAKE) clean + rm -f src/*.o src/*.so + dh_clean install: build only in patch2: unchanged: --- jabber-muc-0.6.0.orig/debian/patches/20_bts-457730.dpatch +++ jabber-muc-0.6.0/debian/patches/20_bts-457730.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_bts-457730.dpatch by Michael Wensley <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: BTS 457730 + [EMAIL PROTECTED]@ + +--- jabber-muc-0.6.0/src/conference_room.c 2003-11-15 04:19:45.000000000 +0000 ++++ jabber-muc-0.6.0/src/conference_room.c 2007-12-25 02:13:47.000000000 +0000 +@@ -720,7 +720,7 @@ + str[strlen(str) - 1] = '\0'; /* cut off newline */ + xmlnode_insert_cdata(xmlnode_insert_tag(jp->iq, "display"), pstrdup(jp->p, str), -1); + +- free(str); ++ + + deliver(dpacket_new(jp->x),NULL); + return;
