tags 555057 + patch tags 555057 + pending tags 654281 + patch tags 654281 + pending thanks
Dear maintainer,
I've prepared an NMU for kplayer (versioned as 1:0.7-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
--
Regards,
dai
GPG Fingerprint = 0B29 D88E 42E6 B765 B8D8 EA50 7839 619D D439 668E
diff -u kplayer-0.7/debian/changelog kplayer-0.7/debian/changelog --- kplayer-0.7/debian/changelog +++ kplayer-0.7/debian/changelog @@ -1,3 +1,16 @@ +kplayer (1:0.7-2.1) unstable; urgency=low + + * Non-maintainer upload. + * FTBFS with binutils-gold (Closes: #555057) + - debian/patches/07_indirect_linking.diff + thanks to Scott Kitterman <sc...@kitterman.com>. + * FTBFS on armhf/s390x, reproduced on amd64: not defined Entities + while generating index.cache.bz2 (Closes: #654281) + - debian/patches/06_fix_dtd_reference.diff + thanks to peter green <plugw...@p10link.net> for doc/da. + + -- HIGUCHI Daisuke (VDR dai) <d...@debian.org> Mon, 09 Jan 2012 15:01:33 +0900 + kplayer (1:0.7-2) unstable; urgency=low * Backport crash fixes ( Closes: bug#565123 ) diff -u kplayer-0.7/debian/patches/series kplayer-0.7/debian/patches/series --- kplayer-0.7/debian/patches/series +++ kplayer-0.7/debian/patches/series @@ -5,0 +6,2 @@ +06_fix_dtd_reference.diff +07_indirect_linking.diff only in patch2: unchanged: --- kplayer-0.7.orig/debian/patches/07_indirect_linking.diff +++ kplayer-0.7/debian/patches/07_indirect_linking.diff @@ -0,0 +1,17 @@ +Description: FTBFS with binutils-gold +Bug-Debian: http://bugs.debian.org/555057 +Author: Scott Kitterman <sc...@kitterman.com> + +Index: kplayer-0.7/kplayer/CMakeLists.txt +=================================================================== +--- kplayer-0.7.orig/kplayer/CMakeLists.txt 2011-01-10 14:47:52.000000000 -0500 ++++ kplayer-0.7/kplayer/CMakeLists.txt 2011-01-10 14:48:14.000000000 -0500 +@@ -55,7 +55,7 @@ + + kde4_add_executable(kplayer ${kplayer_SRCS}) + +-target_link_libraries(kplayer ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBRARY} ${X11_LIBRARIES}) ++target_link_libraries(kplayer ${KDE4_SOLID_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBRARY} ${X11_LIBRARIES}) + + install(TARGETS kplayer DESTINATION ${BIN_INSTALL_DIR}) + only in patch2: unchanged: --- kplayer-0.7.orig/debian/patches/06_fix_dtd_reference.diff +++ kplayer-0.7/debian/patches/06_fix_dtd_reference.diff @@ -0,0 +1,58 @@ +Description: not defined Entities while generating index.cache.bz2 +Bug-Debian: http://bugs.debian.org/654281 +Author: peter green <plugw...@p10link.net>, HIGUCHI Daisuke (VDR dai) <d...@debian.org> + +--- kplayer-0.7/doc/da/index.docbook.orig 2008-01-11 13:27:10.000000000 +0000 ++++ kplayer-0.7/doc/da/index.docbook 2012-01-02 23:46:46.000000000 +0000 +@@ -1,5 +1,5 @@ + <?xml version="1.0" ?> +-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ ++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!ENTITY kplayer "<application + >KPlayer</application + >"> +--- kplayer-0.7/doc/en/index.docbook.orig 2008-01-11 22:27:09.000000000 +0900 ++++ kplayer-0.7/doc/en/index.docbook 2012-01-09 15:08:42.000000000 +0900 +@@ -1,5 +1,5 @@ + <?xml version="1.0" ?> +-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ ++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!ENTITY kplayer "<application>KPlayer</application>"> + <!ENTITY mplayer "<application>MPlayer</application>"> + <!ENTITY mldonkey "<application>MLDonkey</application>"> +--- kplayer-0.7/doc/es/index.docbook.orig 2008-01-11 22:27:10.000000000 +0900 ++++ kplayer-0.7/doc/es/index.docbook 2012-01-09 15:11:03.000000000 +0900 +@@ -1,5 +1,5 @@ + <?xml version="1.0" ?> +-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ ++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!ENTITY kplayer "<application + >KPlayer</application + >"> +--- kplayer-0.7/doc/it/index.docbook.orig 2008-01-11 22:27:11.000000000 +0900 ++++ kplayer-0.7/doc/it/index.docbook 2012-01-09 15:12:39.000000000 +0900 +@@ -1,5 +1,5 @@ + <?xml version="1.0" ?> +-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ ++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!ENTITY kplayer "<application + >KPlayer</application + >"> +--- kplayer-0.7/doc/pt/index.docbook.orig 2008-01-11 22:27:10.000000000 +0900 ++++ kplayer-0.7/doc/pt/index.docbook 2012-01-09 15:14:29.000000000 +0900 +@@ -1,5 +1,5 @@ + <?xml version="1.0" ?> +-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ ++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!ENTITY kplayer "<application + >KPlayer</application + >"> +--- kplayer-0.7/doc/sv/index.docbook.orig 2008-01-11 22:27:10.000000000 +0900 ++++ kplayer-0.7/doc/sv/index.docbook 2012-01-09 15:15:12.000000000 +0900 +@@ -1,5 +1,5 @@ + <?xml version="1.0" ?> +-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ ++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!ENTITY kplayer "<application + >KPlayer</application + >">
signature.asc
Description: Digital signature
