Dear maintainer, I've prepared an NMU for xawtv (versioned as 3.95.dfsg.1-8.2). The diff is attached to this message.
Regards. diff -u xawtv-3.95.dfsg.1/debian/control xawtv-3.95.dfsg.1/debian/control --- xawtv-3.95.dfsg.1/debian/control +++ xawtv-3.95.dfsg.1/debian/control @@ -1,7 +1,7 @@ Source: xawtv Section: graphics Priority: extra -Build-Depends: debhelper (>= 5), dpatch, libjpeg62-dev, libncurses5-dev, libx11-dev, libxext-dev, libxinerama-dev, libxmu-dev, libxpm-dev, libxrandr-dev, libxt-dev, libxv-dev, libxxf86dga-dev, libxxf86vm-dev, x-dev, liblircclient-dev, xutils, xbase-clients, libaa1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libzvbi-dev (>= 0.2.1), libquicktime-dev (>= 0.9.9), libxaw7-dev, libgl1-mesa-dev, libxft-dev, po-debconf, libpng12-dev, libglib2.0-dev, libfs-dev, libdv-dev +Build-Depends: debhelper (>= 5), dpatch, libjpeg62-dev, libncurses5-dev, libx11-dev, libxext-dev, libxinerama-dev, libxmu-dev, libxpm-dev, libxrandr-dev, libxt-dev, libxv-dev, libxxf86dga-dev, libxxf86vm-dev, x11proto-core-dev, liblircclient-dev, xutils, xbase-clients, libaa1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libzvbi-dev (>= 0.2.1), libquicktime-dev (>= 0.9.9), libxaw7-dev, libgl1-mesa-dev, libxft-dev, po-debconf, libpng12-dev, libglib2.0-dev, libfs-dev, libdv-dev Maintainer: Krzysztof Burghardt <[email protected]> Standards-Version: 3.7.3 diff -u xawtv-3.95.dfsg.1/debian/changelog xawtv-3.95.dfsg.1/debian/changelog --- xawtv-3.95.dfsg.1/debian/changelog +++ xawtv-3.95.dfsg.1/debian/changelog @@ -1,3 +1,14 @@ +xawtv (3.95.dfsg.1-8.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with binutils-fold (Closes: #556689); + patch from Felix Geyer. + * Replace x-dev with x11proto-core-dev in the Build-Depends field; + report and patch come from Julien Cristau (Closes:# 515517). + * Also rebuild with newest libquicktime in sid. + + -- Alessio Treglia <[email protected]> Thu, 26 May 2011 12:05:53 +0200 + xawtv (3.95.dfsg.1-8.1) unstable; urgency=low * Non-maintainer upload. diff -u xawtv-3.95.dfsg.1/debian/po/tr.po xawtv-3.95.dfsg.1/debian/po/tr.po --- xawtv-3.95.dfsg.1/debian/po/tr.po +++ xawtv-3.95.dfsg.1/debian/po/tr.po @@ -10,6 +10,7 @@ "PO-Revision-Date: 2004-05-15 11:11+0300\n" "Last-Translator: Recai Oktaş <[email protected]>\n" "Language-Team: Turkish <[email protected]>\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u xawtv-3.95.dfsg.1/debian/po/cs.po xawtv-3.95.dfsg.1/debian/po/cs.po --- xawtv-3.95.dfsg.1/debian/po/cs.po +++ xawtv-3.95.dfsg.1/debian/po/cs.po @@ -19,6 +19,7 @@ "PO-Revision-Date: 2007-11-04 14:51+0100\n" "Last-Translator: Miroslav Kure <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u xawtv-3.95.dfsg.1/debian/po/pt.po xawtv-3.95.dfsg.1/debian/po/pt.po --- xawtv-3.95.dfsg.1/debian/po/pt.po +++ xawtv-3.95.dfsg.1/debian/po/pt.po @@ -4,8 +4,8 @@ # Rui Branco <[email protected]>, 2006. # 2007-08-26 - Rui Branco <[email protected]> - 3f # 2007-11-08 - Rui Branco <[email protected]> - 17u5f -# -# +# +# msgid "" msgstr "" "Project-Id-Version: xawtv 3.95.dfsg.1-5\n" @@ -14,6 +14,7 @@ "PO-Revision-Date: 2007-11-09 00:00+0000\n" "Last-Translator: Rui Branco <[email protected]>\n" "Language-Team: Portuguese <[email protected]>\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u xawtv-3.95.dfsg.1/debian/po/ja.po xawtv-3.95.dfsg.1/debian/po/ja.po --- xawtv-3.95.dfsg.1/debian/po/ja.po +++ xawtv-3.95.dfsg.1/debian/po/ja.po @@ -6,6 +6,7 @@ "PO-Revision-Date: 2007-10-30 22:04+0900\n" "Last-Translator: Hideki Yamane (Debian-JP) <[email protected]>\n" "Language-Team: Japanese <[email protected]>\n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u xawtv-3.95.dfsg.1/debian/po/es.po xawtv-3.95.dfsg.1/debian/po/es.po --- xawtv-3.95.dfsg.1/debian/po/es.po +++ xawtv-3.95.dfsg.1/debian/po/es.po @@ -28,6 +28,7 @@ "PO-Revision-Date: 2007-10-26 04:20+0200\n" "Last-Translator: Carlos Valdivia Yagüe <[email protected]>\n" "Language-Team: Debian L10n Spanish <[email protected]>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u xawtv-3.95.dfsg.1/debian/po/fi.po xawtv-3.95.dfsg.1/debian/po/fi.po --- xawtv-3.95.dfsg.1/debian/po/fi.po +++ xawtv-3.95.dfsg.1/debian/po/fi.po @@ -6,6 +6,7 @@ "PO-Revision-Date: 2007-10-25 21:25+0200\n" "Last-Translator: Esko Arajärvi <[email protected]>\n" "Language-Team: Finnish <[email protected]>\n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u xawtv-3.95.dfsg.1/debian/po/de.po xawtv-3.95.dfsg.1/debian/po/de.po --- xawtv-3.95.dfsg.1/debian/po/de.po +++ xawtv-3.95.dfsg.1/debian/po/de.po @@ -10,6 +10,7 @@ "PO-Revision-Date: 2007-10-26 19:17+0200\n" "Last-Translator: Helge Kreutzmann <[email protected]>\n" "Language-Team: de <[email protected]>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u xawtv-3.95.dfsg.1/debian/po/gl.po xawtv-3.95.dfsg.1/debian/po/gl.po --- xawtv-3.95.dfsg.1/debian/po/gl.po +++ xawtv-3.95.dfsg.1/debian/po/gl.po @@ -10,6 +10,7 @@ "PO-Revision-Date: 2007-10-25 19:00+0100\n" "Last-Translator: Jacobo Tarrio <[email protected]>\n" "Language-Team: Galician <[email protected]>\n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u xawtv-3.95.dfsg.1/debian/po/fr.po xawtv-3.95.dfsg.1/debian/po/fr.po --- xawtv-3.95.dfsg.1/debian/po/fr.po +++ xawtv-3.95.dfsg.1/debian/po/fr.po @@ -17,6 +17,7 @@ "PO-Revision-Date: 2007-10-30 22:30+0100\n" "Last-Translator: Michel Grentzinger <[email protected]>\n" "Language-Team: French <[email protected]>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u xawtv-3.95.dfsg.1/debian/po/vi.po xawtv-3.95.dfsg.1/debian/po/vi.po --- xawtv-3.95.dfsg.1/debian/po/vi.po +++ xawtv-3.95.dfsg.1/debian/po/vi.po @@ -10,6 +10,7 @@ "PO-Revision-Date: 2007-10-25 22:47+0930\n" "Last-Translator: Clytie Siddall <[email protected]>\n" "Language-Team: Vietnamese <[email protected]>\n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u xawtv-3.95.dfsg.1/debian/po/it.po xawtv-3.95.dfsg.1/debian/po/it.po --- xawtv-3.95.dfsg.1/debian/po/it.po +++ xawtv-3.95.dfsg.1/debian/po/it.po @@ -11,6 +11,7 @@ "PO-Revision-Date: 2007-01-05 20:05+0100\n" "Last-Translator: Luca Monducci <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u xawtv-3.95.dfsg.1/debian/po/eu.po xawtv-3.95.dfsg.1/debian/po/eu.po --- xawtv-3.95.dfsg.1/debian/po/eu.po +++ xawtv-3.95.dfsg.1/debian/po/eu.po @@ -11,6 +11,7 @@ "PO-Revision-Date: 2007-10-25 09:56+0200\n" "Last-Translator: Piarres Beobide <[email protected]>\n" "Language-Team: Euskara <[email protected]>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u xawtv-3.95.dfsg.1/debian/po/ru.po xawtv-3.95.dfsg.1/debian/po/ru.po --- xawtv-3.95.dfsg.1/debian/po/ru.po +++ xawtv-3.95.dfsg.1/debian/po/ru.po @@ -11,12 +11,13 @@ "PO-Revision-Date: 2007-11-07 20:40+0300\n" "Last-Translator: Yuri Kozlov <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: boolean #. Description diff -u xawtv-3.95.dfsg.1/debian/po/pt_BR.po xawtv-3.95.dfsg.1/debian/po/pt_BR.po --- xawtv-3.95.dfsg.1/debian/po/pt_BR.po +++ xawtv-3.95.dfsg.1/debian/po/pt_BR.po @@ -19,6 +19,7 @@ "PO-Revision-Date: 2006-07-27 23:25-0300\n" "Last-Translator: Herbert Parentes Fortes Neto <[email protected]>\n" "Language-Team: l10n portuguese <[email protected]>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u xawtv-3.95.dfsg.1/debian/po/sv.po xawtv-3.95.dfsg.1/debian/po/sv.po --- xawtv-3.95.dfsg.1/debian/po/sv.po +++ xawtv-3.95.dfsg.1/debian/po/sv.po @@ -18,6 +18,7 @@ "PO-Revision-Date: 2008-07-19 11:48+0200\n" "Last-Translator: Martin Ågren <[email protected]>\n" "Language-Team: Swedish <[email protected]>\n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u xawtv-3.95.dfsg.1/debian/po/da.po xawtv-3.95.dfsg.1/debian/po/da.po --- xawtv-3.95.dfsg.1/debian/po/da.po +++ xawtv-3.95.dfsg.1/debian/po/da.po @@ -23,6 +23,7 @@ "PO-Revision-Date: 2008-09-28 15:46+0200\n" "Last-Translator: Frank Damgaard <[email protected]>\n" "Language-Team: Danish <[email protected]>\n" +"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u xawtv-3.95.dfsg.1/debian/po/nl.po xawtv-3.95.dfsg.1/debian/po/nl.po --- xawtv-3.95.dfsg.1/debian/po/nl.po +++ xawtv-3.95.dfsg.1/debian/po/nl.po @@ -22,6 +22,7 @@ "PO-Revision-Date: 2008-09-24 21:36-0500\n" "Last-Translator: Paul Gevers <[email protected]>\n" "Language-Team: Dutch <[email protected]>\n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u xawtv-3.95.dfsg.1/debian/patches/00list xawtv-3.95.dfsg.1/debian/patches/00list --- xawtv-3.95.dfsg.1/debian/patches/00list +++ xawtv-3.95.dfsg.1/debian/patches/00list @@ -18,0 +19 @@ +103_fix_ftbfs_no-add-needed.dpatch only in patch2: unchanged: --- xawtv-3.95.dfsg.1.orig/debian/patches/103_fix_ftbfs_no-add-needed.dpatch +++ xawtv-3.95.dfsg.1/debian/patches/103_fix_ftbfs_no-add-needed.dpatch @@ -0,0 +1,47 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 103_fix_ftbfs_no-add-needed.dpatch by Felix Geyer <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix FTBFS with ld --no-add-needed. + +@DPATCH@ +diff -Nur xawtv-3.95.dfsg.1/console/Subdir.mk xawtv-3.95.dfsg.1.patch/console/Subdir.mk +--- xawtv-3.95.dfsg.1/console/Subdir.mk 2003-02-14 15:14:04.000000000 +0100 ++++ xawtv-3.95.dfsg.1.patch/console/Subdir.mk 2011-01-09 17:10:13.457715742 +0100 +@@ -74,11 +74,11 @@ + # libraries to link + console/fbtv : LDLIBS += \ + $(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \ +- $(FS_LIBS) -ljpeg -lm +-console/ttv : LDLIBS += $(THREAD_LIBS) $(AA_LIBS) -ljpeg -lm +-console/scantv : LDLIBS += $(THREAD_LIBS) $(VBI_LIBS) -ljpeg +-console/streamer : LDLIBS += $(THREAD_LIBS) -ljpeg -lm +-console/webcam : LDLIBS += $(THREAD_LIBS) -ljpeg -lm ++ $(FS_LIBS) -ljpeg -lm -ldl ++console/ttv : LDLIBS += $(THREAD_LIBS) $(AA_LIBS) -ljpeg -lm -ldl ++console/scantv : LDLIBS += $(THREAD_LIBS) $(VBI_LIBS) -ljpeg -ldl ++console/streamer : LDLIBS += $(THREAD_LIBS) -ljpeg -lm -ldl ++console/webcam : LDLIBS += $(THREAD_LIBS) -ljpeg -lm -ldl + console/radio : LDLIBS += $(CURSES_LIBS) + console/record : LDLIBS += $(CURSES_LIBS) + console/v4l-conf : LDLIBS += $(ATHENA_LIBS) +diff -Nur xawtv-3.95.dfsg.1/x11/Subdir.mk xawtv-3.95.dfsg.1.patch/x11/Subdir.mk +--- xawtv-3.95.dfsg.1/x11/Subdir.mk 2005-01-05 11:25:03.000000000 +0100 ++++ xawtv-3.95.dfsg.1.patch/x11/Subdir.mk 2011-01-09 17:12:23.554314060 +0100 +@@ -98,13 +98,13 @@ + # libraries to link + x11/xawtv : LDLIBS += \ + $(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \ +- $(ATHENA_LIBS) $(VBI_LIBS) $(GL_LIBS) -ljpeg -lm ++ $(ATHENA_LIBS) $(VBI_LIBS) $(GL_LIBS) -ljpeg -lm -ldl -lfontconfig + x11/motv : LDLIBS += \ + $(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \ + $(MOTIF_LIBS) $(VBI_LIBS) $(GL_LIBS) -ljpeg -lm + x11/mtt : LDLIBS += $(THREAD_LIBS) $(MOTIF_LIBS) $(VBI_LIBS) -ljpeg +-x11/v4lctl : LDLIBS += $(THREAD_LIBS) $(ATHENA_LIBS) -ljpeg -lm +-x11/pia : LDLIBS += $(ATHENA_LIBS) $(GL_LIBS) -ljpeg -lm ++x11/v4lctl : LDLIBS += $(THREAD_LIBS) $(ATHENA_LIBS) -ljpeg -lm -ldl ++x11/pia : LDLIBS += $(ATHENA_LIBS) $(GL_LIBS) -ljpeg -lm -ldl + x11/rootv : LDLIBS += $(ATHENA_LIBS) + x11/xawtv-remote : LDLIBS += $(ATHENA_LIBS) + x11/propwatch : LDLIBS += $(ATHENA_LIBS) -- Alessio Treglia | www.alessiotreglia.com Debian Developer | [email protected] Ubuntu Core Developer | [email protected] 0FEC 59A5 E18E E04F 6D40 593B 45D4 8C7C DCFC 3FD0 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
