diff -u kmplayer-0.11.1a/debian/watch kmplayer-0.11.1a/debian/watch --- kmplayer-0.11.1a/debian/watch +++ kmplayer-0.11.1a/debian/watch @@ -3 +3 @@ - http://kmplayer.kde.org/pkgs/kmplayer-(.*)\.tar\.bz2 debian svn-upgrade + http://kmplayer.kde.org/pkgs/kmplayer-(.*)\.tar\.bz2 diff -u kmplayer-0.11.1a/debian/rules kmplayer-0.11.1a/debian/rules --- kmplayer-0.11.1a/debian/rules +++ kmplayer-0.11.1a/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk +include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/utils.mk diff -u kmplayer-0.11.1a/debian/changelog kmplayer-0.11.1a/debian/changelog --- kmplayer-0.11.1a/debian/changelog +++ kmplayer-0.11.1a/debian/changelog @@ -1,22 +1,52 @@ -kmplayer (1:0.11.1a-1) unstable; urgency=low +kmplayer (1:0.11.1a-1ubuntu1) karmic; urgency=low + + * Merge with debian unstable (LP: #380449), remaining changes: + - drop cmake from build-deps + - add kmplayer-base transitional package + - add kmplayer.install + - conflicts kmplayer-base << 1:0.11.1a-1ubuntu1 + - debian/rules: use '/usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk' + instead '/usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk' + - debian/watch: we don't need to run 'debian svn-upgrade' + + -- Alessandro Ghersi Tue, 26 May 2009 03:38:19 +0200 + +kmplayer (1:0.11.1a-0ubuntu1) karmic; urgency=low + + * New upstream release + + -- Anthony Mercatante Fri, 22 May 2009 05:12:55 +0200 + +kmplayer (1:0.11.0a-1) unstable; urgency=low * New upstream release. + * Allow debian/watch to handle upstream -rc. + * Move to Section: video. + * Add ${misc:Depends}. + * Add Build-Depends: pkg-kde-tools. + * Remove obsolete debian/*docbook entries. + * Upload to unstable (KDE4 is here :-). - -- Fathi Boudra Mon, 18 May 2009 12:27:37 +0200 + -- Mark Purcell Sat, 11 Apr 2009 10:56:09 +1000 -kmplayer (1:0.11.1-1) unstable; urgency=low +kmplayer (1:0.11.0a-1) unstable; urgency=low * New upstream release. - * Remove patch to fix kmplayer.desktop install path. Commited upstream. - * Bump compat to 7. - * Update debian/control: - - Cleanup build dependencies. - - Bump debhelper to 7. - - Bump Standards-Version from 3.8.0 to 3.8.1 (no changes needed). - - Add dbus-x11 dependency (Closes: #514108). - * Update debian/rules: cleanup. + * Allow debian/watch to handle upstream -rc. + * Move to Section: video. + * Add ${misc:Depends}. + * Add Build-Depends: pkg-kde-tools. + * Remove obsolete debian/*docbook entries. + * Upload to unstable (KDE4 is here :-). + + -- Mark Purcell Sat, 11 Apr 2009 10:56:09 +1000 - -- Fathi Boudra Tue, 12 May 2009 12:26:53 +0200 +kmplayer (1:0.11.1-0ubuntu1) karmic; urgency=low + + * New upstream release + * Fixed packaging to use pkg-kde-tools + + -- Anthony Mercatante Mon, 11 May 2009 05:34:03 +0200 kmplayer (1:0.11.0a-1) unstable; urgency=low @@ -30,6 +60,20 @@ -- Mark Purcell Sat, 11 Apr 2009 10:56:09 +1000 +kmplayer (1:0.11.0a+svn962335-0ubuntu1~ppa1) jaunty; urgency=low + + * New SVN snapshot + + -- Anthony Mercatante Sat, 02 May 2009 06:05:28 +0200 + +kmplayer (1:0.11.0a+svn919425-0ubuntu1) jaunty; urgency=low + + * New upstream version released. + * SVN snapshot to fix FTBFS with 4.2 + * Rewrite packaging for KDE4 + + -- Anthony Mercatante Sat, 31 Jan 2009 23:59:43 +0100 + kmplayer (1:0.11.0-3) experimental; urgency=low * Add patch to fix kmplayer.desktop install path. @@ -57,6 +101,26 @@ -- Fathi Boudra Tue, 13 Jan 2009 18:03:08 +0100 +kmplayer (1:0.10.0c-2ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - XSBC-Original-Maintainer/Maintainer lines. + - Remove 10_xine_default_player.diff - done by kubuntu_01_kmplayerrc.diff. + - Remove 12_remove_audio_mimetypes.diff - done by + kubuntu_03_no_audio_mimetypes.patch + - Drop /usr/share/doc/kde/HTML from kmplayer (in debian/kmplayer.install) + - Watch file, we don't need to run 'debian svn-upgrade' + * Make kmplayer-base call ldconfig in postinst and postrm as per Policy + Manual 8.1.1 + * Added the following to kmplayer-base.lintian-overrides - W: kmplayer-base: + package-name-doesnt-match-sonames libkmplayercommon + * Fixed the kxineplayer manpage (it wasn't getting installed). + * Fixed an error in the formatting of the Kubuntu changelog. + * Remove Encoding: from the kmplayer Desktop file; + kubuntu_04_no_encoding_in_desktop.diff. + + -- Ryan Kavanagh Sun, 08 Jun 2008 12:30:02 -0400 + kmplayer (1:0.10.0c-2) unstable; urgency=low [ Fathi Boudra ] @@ -68,7 +132,7 @@ [ Mark Purcell ] * Add debian/patches/20_autoadjust from Andrea - - translation files and default parameter values (Closes: #477451) + - traslation files and default parameter values (Closes: #477451) -- Mark Purcell Tue, 29 Apr 2008 21:27:14 +1000 @@ -78,6 +142,28 @@ -- Fathi Boudra Sat, 22 Dec 2007 15:26:45 +0100 +kmplayer (1:0.10.0c-0ubuntu3) hardy; urgency=low + + * Drop /usr/share/doc/kde/HTML from kmplayer, as it's already in + kmplayer-doc (LP: #210443). + + -- Colin Watson Tue, 15 Apr 2008 02:22:14 +0100 + +kmplayer (1:0.10.0c-0ubuntu2) hardy; urgency=low + + * dapper -> hardy upgrade fixes, kmplayer replaces old kmplayer-doc + and vice-versa + + -- Jonathan Riddell Wed, 19 Mar 2008 15:38:32 +0000 + +kmplayer (1:0.10.0c-0ubuntu1) hardy; urgency=low + + * New upstream release. + * Merged Debian changelog, remaining changes in 0.10.0a-2ubuntu1 entry. + * Cleaned up rules file. + + -- Jonathan Patrick Davies Fri, 22 Dec 2007 11:23:40 +0100 + kmplayer (1:0.10.0b-1) unstable; urgency=low * New upstream release. (Closes: #454794) @@ -88,6 +174,58 @@ -- Fathi Boudra Thu, 06 Dec 2007 09:26:27 +0100 +kmplayer (1:0.10.0b-0ubuntu1) hardy; urgency=low + + * New upstream release. + * Dropped kubuntu_02_use_default_config_with_kparts_.diff - applied upstream. + * Updated email in kmplayer.1.docbook. + * Updated Standards-Version to 3.7.3.0. + + -- Jonathan Patrick Davies Fri, 7 Dec 2007 18:56:10 +0100 + +kmplayer (1:0.10.0a-2ubuntu4) hardy; urgency=low + + * Fix kmplayer-doc.install to include all documentation. + * Removed "debian/tmp/" from *.install's. + + -- Jonathan Patrick Davies Mon, 12 Nov 2007 22:25:24 +0100 + +kmplayer (1:0.10.0a-2ubuntu3) hardy; urgency=low + + * Reuploaded as the buildd seems to be fixed + + -- Anthony Mercatante Mon, 12 Nov 2007 14:14:56 +0100 + +kmplayer (1:0.10.0a-2ubuntu2) hardy; urgency=low + + * Re-add kubuntu_03_no_audio_mimetypes, not merged upstream + + -- Anthony Mercatante Sat, 10 Nov 2007 10:20:27 +0100 + +kmplayer (1:0.10.0a-2ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Ubuntu maintainer spec. + - kmplayer-base instead of kmplayer-common. + - kmplayer-konq-plugin instead of kmplayer-plugin. + - Added kubuntu_ patches to series. + - No overrides. + - Remove 10_xine_default_player.diff - done by kubuntu_01_kmplayerrc.diff. + - Drop 12_remove_audio_mimetypes and kubuntu_04_real_mimetype - applied + upstream. + - docbook2x dep for docbooks. + * New upstream release. (LP: #131620) + * Adjust kmplayer's xine deps for new packages. (LP: #159338) + * Bumped Standards-Version to 3.7.2.2. + * Updated kmplayer.1.docbook. + * New Homepage field location. + * Drop kubuntu_03_no_audio_mimetypes - applied upstream. + * Drop kubuntu_05_gxx32 - changed upstream. + * Remove quilt patch system. + * And drop build dep on quilt. + + -- Jonathan Patrick Davies Sat, 03 Nov 2007 12:26:24 +0100 + kmplayer (1:0.10.0a-2) unstable; urgency=low * Add Depends: libxine1-x @@ -173,6 +311,48 @@ -- Mark Purcell Mon, 30 Oct 2006 18:04:39 +0000 +kmplayer (0.9.4a-0ubuntu2) gutsy; urgency=low + + * Build with -fpermissive when building with g++-4.3. LP: #138604. + + -- Matthias Klose Thu, 13 Sep 2007 19:53:49 +0200 + +kmplayer (0.9.4a-0ubuntu1) gutsy; urgency=low + + * New upstream release + + -- Anthony Mercatante Sat, 30 Jun 2007 22:55:48 +0200 + +kmplayer (0.9.4-0ubuntu4) gutsy; urgency=low + + * debian/control: Dropped unnecessary Build-dep on xlibs-dev. + + -- Timo Aaltonen Wed, 16 May 2007 14:42:30 +0300 + +kmplayer (0.9.4-0ubuntu3) gutsy; urgency=low + + * Fix typo in kubuntu_03_no_audio_mimetypes.patch + + -- Andrew Ash Fri, 27 Apr 2007 19:08:56 -0400 + +kmplayer (0.9.4-0ubuntu2) feisty; urgency=low + + * Add kubuntu_04_real_mimetype.diff to support real -plugin mimetype + + -- Jonathan Riddell Mon, 26 Mar 2007 12:37:14 +0100 + +kmplayer (0.9.4-0ubuntu1) feisty; urgency=low + + * New upstream release + + -- Anthony Mercatante Thu, 15 Mar 2007 11:28:27 +0100 + +kmplayer (0.9.3a-0ubuntu1) feisty; urgency=low + + * New upstream release + + -- Anthony Mercatante Monday, 8 Jan 2007 11:58:34 +0100 + kmplayer (0.9.3-1) unstable; urgency=low [ Fathi Boudra ] @@ -182,12 +362,45 @@ -- Fathi Boudra Wed, 20 Sep 2006 11:47:59 +0200 +kmplayer (0.9.3-0ubuntu4) feisty; urgency=low + + * Fix typo in kubuntu_03_no_audio_mimetypes.patch + + -- Jonathan Riddell Sun, 7 Jan 2007 18:48:42 +0000 + +kmplayer (0.9.3-0ubuntu3) feisty; urgency=low + + * Rebuilt without gstreamer support + + -- Anthony Mercatante Thu, 07 Dec 2006 12:57:04 +0100 + +kmplayer (0.9.3-0ubuntu2) feisty; urgency=low + + * Add kubuntu_03_no_audio_mimetypes.patch to remove + audio mymetypes. + + -- Anthony Mercatante Fri, 20 Oct 2006 17:58:05 +0200 + +kmplayer (0.9.3-0ubuntu1) edgy; urgency=low + + * New upstream release + + -- Anthony Mercatante Wed, 27 Sep 2006 05:08:05 +0200 + kmplayer (0.9.2a-1) unstable; urgency=low * New upstream release -- Fathi Boudra Mon, 12 Jun 2006 12:51:35 +0200 +kmplayer (0.9.2a-0ubuntu1) edgy; urgency=low + + * New upstream maintainace release. + * Merge Debian changelog, keep Kubuntu defaults and add Debian: build-dep: + libxv-dev and ${shlibs:Depends}. + + -- Jonathan Patrick Davies Sun, 11 Jun 2006 13:22:04 +0200 + kmplayer (0.9.2-1) unstable; urgency=low [ Fathi Boudra ] @@ -208,0 +422,47 @@ +kmplayer (0.9.1.99+0.9.2-rc1-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Merge Debian changelog. + * Enable gstreamer0.10 support. + * Added kubuntu_01_kmplayerrc.diff: extra recorder using Xine (which + has an extra benefit that it records while playing). + * Remove kubuntu_01_use_xine_by_default: now in kubuntu_01_kmplayerrc. + + -- Jonathan Patrick Davies Sat, 08 Apr 2006 11:04:34 +0200 + +kmplayer (0.9.2-pre3-1) unstable; urgency=low + + [ Fathi Boudra ] + * Initial release Closes: #360092 + * Set Xine as default player and disable gstreamer support + + [ Mark Purcell ] + * Update debian/watch to use svn-upgrade + + -- Mark Purcell Fri, 7 Apr 2006 23:39:00 +0100 + +kmplayer (0.9.1.99+0.9.2-pre3-0ubuntu2) dapper; urgency=low + + * Remove suggests on gstreamer, we don't use gstreamer 0.8 + + -- Jonathan Riddell Thu, 30 Mar 2006 17:01:59 +0100 + +kmplayer (0.9.1.99+0.9.2-pre3-0ubuntu1) dapper; urgency=low + + * Initial release + + [Achim Bonnet] + * Defined package structure + + [Jonathan Patrick Davies] + * Global packaging + + [Anthony Mercatante] + * Package polishing (debian/copyright, debian/rules...) + * Added kubuntu_01_use_xine_by_default.patch to make usage of wine by default + * Added kubuntu_02_use_default_config_with_kparts_.patch to enable default + config in the konqueror plugin + * Tarball rebuilt to remove obsolete debian/ folder in it + + -- Anthony Mercatante Sun, 26 Mar 2006 16:03:54 +0100 + diff -u kmplayer-0.11.1a/debian/control kmplayer-0.11.1a/debian/control --- kmplayer-0.11.1a/debian/control +++ kmplayer-0.11.1a/debian/control @@ -1,23 +1,21 @@ Source: kmplayer Section: video Priority: optional -Maintainer: Debian KDE Extras Team -Uploaders: Fathi Boudra , Mark Purcell -Build-Depends: cdbs, debhelper (>= 7), cmake, pkg-kde-tools, kdelibs5-dev, +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Debian KDE Extras Team +Uploaders: Fathi Boudra , Mark Purcell +Build-Depends: cdbs, debhelper (>= 7), pkg-kde-tools, kdelibs5-dev, libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libgtk2.0-dev, libx11-dev, libxt-dev Standards-Version: 3.8.1 Homepage: http://kmplayer.kde.org -Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kmplayer/?op=log -Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kmplayer/trunk/ Package: kmplayer Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, dbus-x11, libxine1-x Suggests: ffmpeg, vdr, xawtv, konqueror, mplayer -Conflicts: kmplayer-common, kmplayer-plugin -Replaces: kmplayer-common, kmplayer-plugin +Conflicts: kmplayer-base (<<1:0.11.1a-1ubuntu1) Description: media player for KDE KMPlayer is a simple frontend for MPlayer/FFMpeg/Phonon. . @@ -31,0 +30,10 @@ + +Package: kmplayer-base +Architecture: all +Priority: extra +Depends: kmplayer, ${misc:Depends} +Description: Transitional package + This dummy package is provided for a smooth transition from kmplayer-base to + the kmplayer package. + . + It may safely be removed after installation. only in patch2: unchanged: --- kmplayer-0.11.1a.orig/debian/kmplayer.install +++ kmplayer-0.11.1a/debian/kmplayer.install @@ -0,0 +1,12 @@ +/usr/bin/kmplayer +/usr/bin/knpplayer +/usr/bin/kphononplayer +/usr/share/kde4/apps/kmplayer/kmplayerui.rc +/usr/share/applications/kde4/kmplayer.desktop +/usr/lib/* +/usr/share/doc/kde/* +/usr/share/icons/hicolor/* +/usr/share/kde4/apps/kmplayer/* +/usr/share/kde4/config/kmplayerrc +/usr/share/kde4/services/kmplayer_part.desktop +/usr/share/locale/*