diff -pruN 1:0.7-2.1/debian/changelog 1:0.7-2.1ubuntu1/debian/changelog --- 1:0.7-2.1/debian/changelog 2015-03-28 02:38:09.000000000 +0000 +++ 1:0.7-2.1ubuntu1/debian/changelog 2015-03-28 02:38:10.000000000 +0000 @@ -1,3 +1,15 @@ +kplayer (1:0.7-2.1ubuntu1) vivid; urgency=low + + * Merge from Debian testing. Remaining changes: + - debian/control, debian/kplayer*: + + Keep kplayer-doc and kplayer-data. + + Don't install files in both kplayer and -data. + * Drop following patches, fixed in Debian: + - kubuntu_01_docbook_fix.diff -> 06_fix_dtd_reference.diff + - kubuntu_02_indirect_linking.diff -> 07_indirect_linking.diff + + -- Artur Rona Sat, 28 Mar 2015 02:04:01 +0100 + kplayer (1:0.7-2.1) unstable; urgency=low * Non-maintainer upload. @@ -11,6 +23,34 @@ kplayer (1:0.7-2.1) unstable; urgency=lo -- HIGUCHI Daisuke (VDR dai) Mon, 09 Jan 2012 15:01:33 +0900 +kplayer (1:0.7-2ubuntu4) oneiric; urgency=low + + * Fix typo in debian/control. + + -- Andreas Moog Sun, 17 Jul 2011 10:00:32 +0200 + +kplayer (1:0.7-2ubuntu3) oneiric; urgency=low + + * Don't install files in both kplayer and -data (LP: #657840) + + -- Andreas Moog Sat, 16 Jul 2011 21:16:59 +0000 + +kplayer (1:0.7-2ubuntu2) natty; urgency=low + + * Add debian/patches/kubuntu_02_indirect_linking.diff to explicitly link + KDE4_SOLID_LIBS to fix FTBFS due to indirect linking + + -- Scott Kitterman Mon, 10 Jan 2011 14:09:29 -0500 + +kplayer (1:0.7-2ubuntu1) maverick; urgency=low + + * Merge with debian, remaining changes + - Keep kplayer-doc and kplayer-data + - Add kubuntu_01_docbook_fix.diff to fix docbook build FTBFS + - Add ${misc:Depends} to kplayer-doc and kplayer-data + + -- Rohan Garg Sun, 26 Sep 2010 00:18:08 +0530 + kplayer (1:0.7-2) unstable; urgency=low * Backport crash fixes ( Closes: bug#565123 ) @@ -27,6 +67,31 @@ kplayer (1:0.7-1) unstable; urgency=low -- David Palacio Fri, 20 Mar 2009 19:27:14 -0500 +kplayer (1:0.7-0.5ubuntu1) karmic; urgency=low + + * Merged from debian-multimedia.org, remaining Ubuntu changes: + + debian/control: + - Depend on mplayer | mplayer-nogui. + - Re-added kplayer-data package. + + debian/install: + - Split files from kplayer-data to kplayer-data.install. + + debian/kplayer.1: + - Re-added. + + debian/kplayer-doc.install: + - Upstream installs files to /usr/share/doc/kde - updated accordingly. + + debian/rules: + - Re-added dh_installman calls. + + debian/patches: + - Re-added desktop.patch from -0.1ubuntu1, as 02_desktop.diff. + + -- Maia Kozheva Tue, 28 Apr 2009 21:41:25 +0700 + +kplayer (1:0.7-0.5) unstable; urgency=low + + * Upload in unstable, because KDE4 in now in unstable. + + -- Christian Marillat Mon, 20 Apr 2009 08:29:42 +0200 + kplayer (1:0.7-0.4) experimental; urgency=low * Upload in experimental. @@ -46,6 +111,37 @@ kplayer (0.7-0.2) unstable; urgency=low -- Christian Marillat Thu, 17 Jul 2008 11:59:04 +0200 +kplayer (0.7-0.1ubuntu2) intrepid; urgency=low + + * Remove kde4-config path and ccache (fixes build with new kdelibs). + + -- Matvey Kozhev Mon, 16 Jun 2008 10:32:05 +0700 + +kplayer (0.7-0.1ubuntu1) intrepid; urgency=low + + * First upload to Ubuntu from debian-multimedia.org. + * debian/patches/desktop.patch: + - Remove Encoding key from desktop file. + * debian/control: + - Set maintainer field. + - Build-depend on quilt. + - Build-depend on debhelper >= 5.0.51 (for dh_icons). + - Depend on mplayer | mplayer-nogui. + - Added kplayer-data package. + * debian/rules: + - Specify kde4-config path. + - Fixed path to COPYING file to remove. + - Build with -Wl,--as-needed. + - Call dh_installman, dh_icons and dh_desktop. + - Delete .pc in clean. + * debian/install: + - Moved everything usr/share to kplayer-data. + * debian/kplayer-data.install: + - New file. + - Fixed path to usr/share/apps. + + -- Matvey Kozhev Sat, 10 May 2008 15:51:13 +0700 + kplayer (0.7-0.1) unstable; urgency=low * Change section to kde. diff -pruN 1:0.7-2.1/debian/control 1:0.7-2.1ubuntu1/debian/control --- 1:0.7-2.1/debian/control 2015-03-28 02:38:09.000000000 +0000 +++ 1:0.7-2.1ubuntu1/debian/control 2015-03-28 02:38:10.000000000 +0000 @@ -1,7 +1,8 @@ Source: kplayer Section: video Priority: optional -Maintainer: David Palacio +Maintainer: Kubuntu Developers +XSBC-Original-Maintainer: David Palacio Homepage: http://kplayer.sourceforge.net/ Standards-Version: 3.8.3 Build-Depends: debhelper (>> 7), cmake, kdelibs5-dev, pkg-kde-tools, @@ -10,22 +11,31 @@ Build-Depends: debhelper (>> 7), cmake, Package: kplayer Architecture: any Depends: mplayer, ${shlibs:Depends}, ${misc:Depends} +Replaces: kplayer-data (<= 0.7-2ubuntu2) Description: A KDE media player based on MPlayer KPlayer is a multimedia player based on the popular MPlayer. It provides video, audio and subtitle playback from files, URLs, DVDs, VCDs, audio CDs, TV, DVB and KDE I/O Slaves as well as global and file specific options, various controls, playlist, progress and status display, and a message log. -Package: kplayer-dbg -Section: debug -Architecture: any -Priority: extra -Depends: kplayer (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Description: kplayer debug symbols +Package: kplayer-doc +Architecture: all +Section: doc +Depends: kplayer, ${misc:Depends} +Replaces: kplayer (<= 0.5.3-0.4) +Description: Documentation for kplayer + KPlayer is a multimedia player based on the popular MPlayer. It provides + video, audio and subtitle playback from files, URLs, DVDs, VCDs, audio CDs, + TV, DVB and KDE I/O Slaves as well as global and file specific options, + various controls, playlist, progress and status display, and a message log. + +Package: kplayer-data +Architecture: all +Depends: ${misc:Depends} +Replaces: kplayer (<= 0.7-2ubuntu2) +Suggests: kplayer +Description: Data files for kplayer KPlayer is a multimedia player based on the popular MPlayer. It provides video, audio and subtitle playback from files, URLs, DVDs, VCDs, audio CDs, TV, DVB and KDE I/O Slaves as well as global and file specific options, various controls, playlist, progress and status display, and a message log. - . - This package contains debugging files used to investigate problems with - the kplayer binaries. diff -pruN 1:0.7-2.1/debian/kplayer-data.install 1:0.7-2.1ubuntu1/debian/kplayer-data.install --- 1:0.7-2.1/debian/kplayer-data.install 1970-01-01 00:00:00.000000000 +0000 +++ 1:0.7-2.1ubuntu1/debian/kplayer-data.install 2015-03-28 02:38:10.000000000 +0000 @@ -0,0 +1,3 @@ +usr/share/icons +usr/share/kde4/apps +usr/share/locale diff -pruN 1:0.7-2.1/debian/kplayer-doc.install 1:0.7-2.1ubuntu1/debian/kplayer-doc.install --- 1:0.7-2.1/debian/kplayer-doc.install 1970-01-01 00:00:00.000000000 +0000 +++ 1:0.7-2.1ubuntu1/debian/kplayer-doc.install 2015-03-28 02:38:10.000000000 +0000 @@ -0,0 +1,6 @@ +usr/share/doc/kde/HTML/da usr/share/doc/kde/HTML/da/kplayer +usr/share/doc/kde/HTML/en usr/share/doc/kde/HTML/en/kplayer +usr/share/doc/kde/HTML/es usr/share/doc/kde/HTML/es/kplayer +usr/share/doc/kde/HTML/it usr/share/doc/kde/HTML/it/kplayer +usr/share/doc/kde/HTML/pt usr/share/doc/kde/HTML/pt/kplayer +usr/share/doc/kde/HTML/sv usr/share/doc/kde/HTML/sv/kplayer diff -pruN 1:0.7-2.1/debian/kplayer-doc.links 1:0.7-2.1ubuntu1/debian/kplayer-doc.links --- 1:0.7-2.1/debian/kplayer-doc.links 1970-01-01 00:00:00.000000000 +0000 +++ 1:0.7-2.1ubuntu1/debian/kplayer-doc.links 2015-03-28 02:38:10.000000000 +0000 @@ -0,0 +1,6 @@ +usr/share/doc/kde/HTML/da/common usr/share/doc/kde/HTML/da/kplayer/common +usr/share/doc/kde/HTML/en/common usr/share/doc/kde/HTML/en/kplayer/common +usr/share/doc/kde/HTML/es/common usr/share/doc/kde/HTML/es/kplayer/common +usr/share/doc/kde/HTML/it/common usr/share/doc/kde/HTML/it/kplayer/common +usr/share/doc/kde/HTML/pt/common usr/share/doc/kde/HTML/pt/kplayer/common +usr/share/doc/kde/HTML/sv/common usr/share/doc/kde/HTML/sv/kplayer/common diff -pruN 1:0.7-2.1/debian/kplayer.install 1:0.7-2.1ubuntu1/debian/kplayer.install --- 1:0.7-2.1/debian/kplayer.install 2015-03-28 02:38:09.000000000 +0000 +++ 1:0.7-2.1ubuntu1/debian/kplayer.install 2015-03-28 02:38:10.000000000 +0000 @@ -1,35 +1,9 @@ -usr/share/kde4/apps/kplayer/icons/hicolor/32x32/actions/hue.png -usr/share/kde4/apps/kplayer/icons/hicolor/32x32/actions/contrast.png -usr/share/kde4/apps/kplayer/icons/hicolor/16x16/actions/brightness.png -usr/share/kde4/apps/kplayer/icons/hicolor/22x22/actions/hue.png -usr/share/kde4/apps/kplayer/icons/hicolor/16x16/actions/saturation.png -usr/share/kde4/apps/kplayer/icons/hicolor/22x22/actions/saturation.png -usr/share/kde4/apps/kplayer/icons/hicolor/32x32/actions/loop.png -usr/share/kde4/apps/kplayer/icons/hicolor/22x22/actions/loop.png -usr/share/kde4/apps/kplayer/icons/hicolor/32x32/actions/saturation.png -usr/share/kde4/apps/kplayer/icons/hicolor/16x16/actions/shuffle.png -usr/share/kde4/apps/kplayer/icons/hicolor/32x32/actions/shuffle.png -usr/share/kde4/apps/kplayer/icons/hicolor/22x22/actions/shuffle.png -usr/share/kde4/apps/kplayer/icons/hicolor/16x16/actions/loop.png -usr/share/kde4/apps/kplayer/icons/hicolor/16x16/actions/hue.png -usr/share/kde4/apps/kplayer/icons/hicolor/22x22/actions/brightness.png -usr/share/kde4/apps/kplayer/icons/hicolor/22x22/actions/contrast.png -usr/share/kde4/apps/kplayer/icons/hicolor/32x32/actions/brightness.png -usr/share/kde4/apps/kplayer/icons/hicolor/16x16/actions/contrast.png usr/bin/kplayer usr/lib/kde4/libkplayerpart.so usr/share/applications/kde4/kplayer.desktop -usr/share/kde4/apps/kplayer/kplayerpartui.rc -usr/share/kde4/apps/kplayer/input.conf usr/share/kde4/services/kplayerpart.desktop -usr/share/kde4/apps/kplayer/kplayerui.rc usr/share/kde4/services/ServiceMenus/kplayer-play-queue.desktop usr/share/kde4/services/ServiceMenus/kplayer-next.desktop usr/share/kde4/services/ServiceMenus/kplayer-directory.desktop usr/share/kde4/services/ServiceMenus/kplayer-actions.desktop -usr/share/icons/hicolor/48x48/apps/kplayer.png -usr/share/icons/hicolor/64x64/apps/kplayer.png -usr/share/icons/hicolor/16x16/apps/kplayer.png -usr/share/icons/hicolor/22x22/apps/kplayer.png -usr/share/icons/hicolor/32x32/apps/kplayer.png debian/kplayer.xpm usr/share/pixmaps