diff -Nru kaffeine-1.2.2/debian/changelog kaffeine-1.2.2/debian/changelog --- kaffeine-1.2.2/debian/changelog 2011-05-01 10:56:13.000000000 +0200 +++ kaffeine-1.2.2/debian/changelog 2011-05-07 00:17:10.000000000 +0200 @@ -1,3 +1,12 @@ +kaffeine (1.2.2-1ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. (LP: #774874) Remaining changes: + - Suggest, not depend, on libxine1-ffmpeg + - Keep kubuntu_01_kaffeine_restricted_install.diff + * Refresh kubuntu_01_kaffeine_restricted_install.diff + + -- Philip Muškovac Wed, 04 May 2011 20:06:31 +0200 + kaffeine (1.2.2-1) unstable; urgency=low * New upstream release/ @@ -19,6 +28,34 @@ -- Mark Purcell Sat, 25 Sep 2010 08:45:50 +1000 +kaffeine (1.1-0ubuntu2) natty; urgency=low + + * In kubuntu_01_kaffeine_restricted_install.diff install GStreamer + plugin instead of Xine + + -- Jonathan Riddell Thu, 18 Nov 2010 16:58:36 +0000 + +kaffeine (1.1-0ubuntu1) maverick; urgency=low + + * New upstream bugfix release + + -- Alessandro Ghersi Fri, 03 Sep 2010 06:50:08 +0200 + +kaffeine (1.0-1ubuntu2) maverick; urgency=low + + * Add export KUBUNTU_DESKTOP_POT=extragear-multimedia_kaffeine + + -- Jonathan Riddell Mon, 26 Jul 2010 17:45:49 +0100 + +kaffeine (1.0-1ubuntu1) maverick; urgency=low + + * Merge with Debian unstable, remaining changes: + - Suggest, not depend, on libxine1-ffmpeg + - Keep kubuntu_01_kaffeine_restricted_install.diff + * Refresh kubuntu_01_kaffeine_restricted_install.diff + + -- Alessandro Ghersi Fri, 04 Jun 2010 04:07:18 +0200 + kaffeine (1.0-1) unstable; urgency=low * New upstream release. @@ -31,6 +68,14 @@ -- Fathi Boudra Wed, 02 Jun 2010 09:16:51 +0300 +kaffeine (1.0~pre3-3ubuntu1) maverick; urgency=low + + * Merge with Debian unstable (LP: #583884), remaining changes: + - Suggest, not depend, on libxine1-ffmpeg + - Keep kubuntu_01_kaffeine_restricted_install.diff + + -- Ralph Janke Fri, 21 May 2010 09:15:17 -0400 + kaffeine (1.0~pre3-3) unstable; urgency=low * Unstable KDE4 release @@ -49,6 +94,15 @@ -- Michael Meskes Fri, 12 Feb 2010 09:28:53 +0100 +kaffeine (1.0~pre3-1ubuntu1) lucid; urgency=low + + * Merge with Debian Experimental, remaining changes: + - Build-depend on a lower version of pkg-kde-tools + - Suggest, not depend, on libxine1-ffmpeg + - Keep kubuntu_01_kaffeine_restricted_install.diff + + -- Jonathan Thomas Thu, 11 Feb 2010 18:49:25 -0500 + kaffeine (1.0~pre3-1) experimental; urgency=low * New upstream release: @@ -73,6 +127,22 @@ -- Fathi Boudra Thu, 04 Feb 2010 12:24:19 +0100 +kaffeine (1.0~pre3-0ubuntu1) lucid; urgency=low + + * New upstream release (LP: #515266) + - Drop kubuntu_01_qt_phonon.diff no longer need + - Refresh kubuntu_02_kaffeine_restricted_install and renamed to + kubuntu_01_kaffeine_restricted_install + * Merge with Debian remaining changes: + - Don't add phonon-backend-xine, libxine1-ffmpeg, libxine1-x to depends + - Add kubuntu_01_kaffeine_restricted_install.diff + - Add series file and quilt to build depends + - Add libxine-dev (required) to build-depends + - Build with kde sequence addon, kde.mk is deprecated + - Add README.source + + -- Alessandro Ghersi Wed, 03 Feb 2010 02:28:45 +0100 + kaffeine (1.0~pre2-1) experimental; urgency=low * New upstream release (KDE 4 version). @@ -90,6 +160,106 @@ -- Fathi Boudra Wed, 12 Aug 2009 02:23:50 +0200 +kaffeine (1.0~pre2-0ubuntu1) karmic; urgency=low + + * New upstream release (LP: #411082). + * debian/control: + - Update maintainer-fields. + - Update homepage. + - Add ${misc:Depends} to fix lintian warning. + - Bump Standard-Version to 3.8.2, no changes needed. + * debian/patches/series: Add to fix lintian warning. + * kubuntu_01_qt_phonon.diff: Fix typo in filename. + * kubuntu_03_dont_define__u64_again.diff: Remove, fixed upstream. + + -- Artur Rona Tue, 11 Aug 2009 20:57:31 +0200 + +kaffeine (1.0~pre1+svn976487-0ubuntu4) karmic; urgency=low + + * Add kubuntu_03_dont_define__u64_again.diff to fix FTBFS on ia64 + + -- Scott Kitterman Sun, 09 Aug 2009 00:19:55 -0400 + +kaffeine (1.0~pre1+svn976487-0ubuntu3) karmic; urgency=low + + * Reintroduced kubuntu_01_qt_phonon.diff + + -- Anthony Mercatante Tue, 02 Jun 2009 18:39:57 +0200 + +kaffeine (1.0~pre1+svn976487-0ubuntu1) karmic; urgency=low + + * New SVN snapshot + + -- Anthony Mercatante Mon, 01 Jun 2009 22:01:04 +0200 + +kaffeine (1.0~pre1-0ubuntu3) karmic; urgency=low + + * Fixed debian/rules: + - use /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk + - switch to cdbs simple-patchsys.mk + * Added kubuntu_02_kaffeine_restricted_install.diff: + - use update-notifier-kde for extra codecs installation + + -- Anthony Mercatante Mon, 01 Jun 2009 20:07:40 +0200 + +kaffeine (1.0~pre1-0ubuntu2) karmic; urgency=low + + * Added pkg-kde-tools build-dep + * Fixed debian/rules, to use debian-qt-kde.mk instead of kde4.mk + + -- Anthony Mercatante Fri, 22 May 2009 05:08:25 +0200 + +kaffeine (1.0~pre1-0ubuntu1) karmic; urgency=low + + * New upstream pre release + * Packaging rewrote for KDE4 + * Added kubuntu_01_qt_phonon.diff, fix compile with Qt's Phonon which + does not install Phonon/Global + + -- Anthony Mercatante Mon, 11 May 2009 06:52:11 +0200 + +kaffeine (0.8.7-1ubuntu4) jaunty; urgency=low + + * Rebuild with new cdbs, don't add gettext domain to .desktop files + + -- Jonathan Riddell Wed, 08 Apr 2009 21:03:49 +0100 + +kaffeine (0.8.7-1ubuntu3) jaunty; urgency=low + + * Add back missing kaffeine.install + * Remove DEB_DESTDIR from previous build, caused overlapping files + * Remove conflicts on kaffine-gstreamer + + -- Jonathan Riddell Fri, 12 Dec 2008 19:12:43 +0000 + +kaffeine (0.8.7-1ubuntu2) jaunty; urgency=low + + * Fix files not installed (LP: #307175): + - re-add DEB_DESTDIR line (Debian doesn't use a kaffeine.install file) + - change dir from tmp to kaffeine in kaffeine-gstreamer.install + + -- Cesare Tirabassi Thu, 11 Dec 2008 18:39:42 +0100 + +kaffeine (0.8.7-1ubuntu1) jaunty; urgency=low + + * Merge with Debian, remaining changes: + - kaffeine can't depend on libxine1-ffmpeg + - add kaffeine-gstreamer.install and description + - build-dep on libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev + - remove --without-gstreamer + - remove DEB_DESTDIR line + - install/kaffeine:: Kubuntu additions + - DEB_FIXPERMS_EXCLUDE := install-css.sh install-codecs + - patches + - install-codecs + - kaffeine_codecinstall.desktop + - kaffeine_xine-install-dvdcss.desktop + - kaffeine_xine-install-ffmpeg.desktop + - add install depends on python-qt4, python-apt + - Recommend kdebase-runtime and install-package for install-codecs + + -- Jonathan Riddell Thu, 20 Nov 2008 14:51:55 +0000 + kaffeine (0.8.7-1) unstable; urgency=low * New upstream release. @@ -98,6 +268,36 @@ -- Fathi Boudra Mon, 21 Jul 2008 22:00:21 +0200 +kaffeine (0.8.6-2ubuntu2) intrepid; urgency=low + + * Fix install-codecs (LP: #210303) + - Added some returns and use KDE 4's kdesu and the new install-package + * Recommend kdebase-runtime and install-package for install-codecs + * Final newlines for kaffeine-gstreamer.install and KUBUNTU-DEBIAN-DIFF + * quilt refresh + + -- Harald Sitter Mon, 22 Sep 2008 12:24:21 +0200 + +kaffeine (0.8.6-2ubuntu1) intrepid; urgency=low + + * Merge with Debian, remaining changes: + - kaffeine can't depend on libxine1-ffmpeg + - kaffeine does depend on kaffeine-xine, remove conflicts/replaces + - add kaffeine-gstreamer.install and description + - build-dep on libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev + - remove --without-gstreamer + - remove DEB_DESTDIR line + - install/kaffeine:: Kubuntu additions + - DEB_FIXPERMS_EXCLUDE := install-css.sh install-codecs + - patches + - install-codecs + - kaffeine_codecinstall.desktop + - kaffeine_xine-install-dvdcss.desktop + - kaffeine_xine-install-ffmpeg.desktop + - add install depends on python-qt4, python-apt + + -- Jonathan Riddell Wed, 11 Jun 2008 14:31:44 +0000 + kaffeine (0.8.6-2) unstable; urgency=low * Build with -fasynchronous-unwind-tables flags. (Closes: #469594) @@ -130,6 +330,97 @@ -- Fathi Boudra Sun, 30 Dec 2007 17:44:40 +0100 +kaffeine (0.8.6-0ubuntu8.2) intrepid; urgency=low + + * SRU to intrepid + + -- Jonathan Riddell Tue, 06 May 2008 11:49:20 +0100 + +kaffeine (0.8.6-0ubuntu8.1) hardy-proposed; urgency=low + + * Change kaffeine_xine-install-dvdcss.desktop + - Revert the dvd codec autoinstalling (LP: #226475) + * In debian/rules install script install-css.sh + * Alter debian/install-codecs + - handle possible loop by ffmpeg autoinstallation (http://bugs.kde.org/show_bug.cgi?id=161592) + * Alter kxinewidget.cpp in kubuntu_07_codecs_installation.diff + - Hide extra error messagebox + - Handling of additional situations of the codecs absense + + -- Sergey Rudchenko Wed, 30 Apr 2008 22:32:41 +0300 + +kaffeine (0.8.6-0ubuntu8) hardy; urgency=low + + * rewrite install-codecs script in python + * add i18n to codec installation procedure + + -- Sergey Rudchenko Sun, 09 Mar 2008 12:02:46 +0200 + +kaffeine (0.8.6-0ubuntu7) hardy; urgency=low + + * fix 'dash' quoting issues + * handle XINE_MSG_ENCRYPTED SOURCE for dvdcss installation + * rebuild patches + + -- Sergey Rudchenko Mon, 03 Mar 2008 14:24:45 +0200 + +kaffeine (0.8.6-0ubuntu6) hardy; urgency=low + + * Fix Recommends, add missing commas + + -- Jonathan Riddell Wed, 27 Feb 2008 16:50:26 +0000 + +kaffeine (0.8.6-0ubuntu5) hardy; urgency=low + + * Refactor install-codecs script + * Implement libdvdcss installing + + -- Sergey Rudchenko Tue, 26 Feb 2008 19:03:36 +0200 + +kaffeine (0.8.6-0ubuntu4) hardy; urgency=low + + * Adapt install-codecs script to dash shell syntax + + -- Sergey Rudchenko Tue, 26 Feb 2008 12:58:33 +0200 + +kaffeine (0.8.6-0ubuntu3) hardy; urgency=low + + * Set fixperms exclude for install-codecs + + -- Jonathan Riddell Fri, 22 Feb 2008 14:29:51 +0000 + +kaffeine (0.8.6-0ubuntu2) hardy; urgency=low + + * Make install-codecs executable in debian/rules + + -- Jonathan Riddell Mon, 04 Feb 2008 14:39:57 +0000 + +kaffeine (0.8.6-0ubuntu1) hardy; urgency=low + + * New upstream release + + -- Anthony Mercatante Tue, 22 Jan 2008 13:50:29 +0100 + +kaffeine (0.8.5-1ubuntu2) hardy; urgency=low + + * Remove depends on kaffeine-xine + + -- Jonathan Riddell Wed, 28 Nov 2007 20:37:29 +0000 + +kaffeine (0.8.5-1ubuntu1) hardy; urgency=low + + * Merge with Debian, remaining changes: + - kaffeine can't depend on libxine1-ffmpeg + - kaffeine does depend on kaffeine-xine, remove conflicts/replaces + - add kaffeine-gstreamer.install and description + - build-dep on libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev + - Kubuntu patches in debian/patches/ + - Remove --without-gstreamer + - Remove DEB_DESTDIR line in debian/rules + * Update kubuntu_07_codecs_installation.diff and add autocodec files to install/kaffeine:: + + -- Jonathan Riddell Wed, 28 Nov 2007 19:01:00 +0000 + kaffeine (0.8.5-1) unstable; urgency=low * New upstream release. @@ -282,6 +573,233 @@ -- Riku Voipio Mon, 3 Apr 2006 23:16:16 +0300 +kaffeine (0.8.5-0ubuntu3) hardy; urgency=low + + * Reuploaded as the buildd seems to be fixed + + -- Anthony Mercatante Mon, 12 Nov 2007 14:09:56 +0100 + +kaffeine (0.8.5-0ubuntu2) hardy; urgency=low + + * Added kubuntu_07_codecs_installation.patch: + - Let kaffeine install missing codecs + - Patch from Sergey Rudchenko + + -- Anthony Mercatante Fri, 09 Nov 2007 14:06:07 +0100 + +kaffeine (0.8.5-0ubuntu1) gutsy; urgency=low + + * New upstream release + + -- Anthony Mercatante Mon, 30 Jul 2007 13:01:45 +0200 + +kaffeine (0.8.4-0ubuntu3) gutsy; urgency=low + + * Removed kubuntu_07_player_parts_identification.diff + That patch is in the work, shouldn't have been upload, + as it creates a crash with the xine-part. + + -- Anthony Mercatante Thu, 28 Jun 2007 23:46:38 +0200 + +kaffeine (0.8.4-0ubuntu2) gutsy; urgency=low + + * Removed debian/tmp/usr/share/apps/kaffeine/xine_part from + kaffeine-xine.install - this is already being installed in kaffeine, and + fixes the file overwrite problem. + + -- Sarah Hobbs Wed, 06 Jun 2007 16:16:07 +1000 + +kaffeine (0.8.4-0ubuntu1) gutsy; urgency=low + + * New upstream release. + * Added libxcb builddep. + * Added back kaffeine-gstreamer package + * Removed obsolete kubuntu_05_restore_contrast.diff + * Add kubuntu_06_kparts_mimetype_checking.diff: + - Makes it possible to select the engine to use. + + -- Anthony Mercatante Wed, 05 Mai 2007 11:02:23 +0100 + +kaffeine (0.8.3-0ubuntu7) feisty; urgency=low + + * Add kubuntu_05_restore_contrast.diff from SVN, fixes contrast restore + nice to those affected by XV on i810 washout problem + fixes http://bugs.kde.org/show_bug.cgi?id=138340 + + -- Jonathan Riddell Thu, 8 Mar 2007 10:15:05 +0000 + +kaffeine (0.8.3-0ubuntu6) feisty; urgency=low + + * Added kubuntu_services_list.patch, lists the services with + avi mimetype instead of x-mp3. + Closes Malone #22902 + + -- Anthony Mercatante Fri, 14 Dec 2006 17:40:34 +0200 + +kaffeine (0.8.3-0ubuntu5) feisty; urgency=low + + * Include header files in kaffeine.install + * Add back kaffeineoggvorbis plugin + + -- Jonathan Riddell Fri, 19 Jan 2007 13:33:10 +0000 + +kaffeine (0.8.3-0ubuntu4) feisty; urgency=low + + * Make sure kubuntu_04_locate_wizard_stamp.diff patch applies cleanly + + -- Jonathan Riddell Mon, 15 Jan 2007 16:56:20 +0000 + +kaffeine (0.8.3-0ubuntu3) feisty; urgency=low + + * Add back kubuntu_04_locate_wizard_stamp.diff + + -- Jonathan Riddell Sun, 14 Jan 2007 13:34:26 +0000 + +kaffeine (0.8.3-0ubuntu2) feisty; urgency=low + + * Changed debian/control, kaffeine-xine depends on kaffeine + + -- Anthony Mercatante Fri, 14 Dec 2006 17:40:34 +0200 + +kaffeine (0.8.3-0ubuntu1) feisty; urgency=low + + * New upstream release + + -- Anthony Mercatante Mon, 12 Dec 2006 18:35:22 +0200 + +kaffeine (0.8.2-2ubuntu1) feisty; urgency=low + + * Merged packaging with debian + + -- Anthony Mercatante Thu, 16 Nov 2006 02:42:34 +0200 + +kaffeine (0.8.2-0ubuntu4) feisty; urgency=low + + * Removed kubuntu_70_no_audiocd_features.patch. + This as been rediscussed and the choice is to keep the audio + features for the moment. + Codeine is an candidate for feisty as the default + video player. + + -- Anthony Mercatante Thu, 16 Nov 2006 02:42:34 +0200 + +kaffeine (0.8.2-0ubuntu3) feisty; urgency=low + + * Add kubuntu_70_no_audio_features.patch to remove audio features + + -- Anthony Mercatante Fri, 20 Oct 2006 16:05:34 +0200 + +kaffeine (0.8.2-0ubuntu2) edgy; urgency=low + + * Add kubuntu_04_mimetypes.patch for complete mimetypes + + -- Anthony Mercatante Thu, 11 Sep 2006 14:45:43 +0200 + +kaffeine (0.8.2-0ubuntu1) edgy; urgency=low + + * New upstream release (closed Malone #61860) + + -- Anthony Mercatante Wed, 27 Sep 2006 02:37:43 +0200 + +kaffeine (0.8.1-3ubuntu3) edgy; urgency=low + + * Don't install x-mplayer2 mimetype, now part of KDE + + -- Jonathan Riddell Wed, 26 Jul 2006 19:06:08 +0100 + +kaffeine (0.8.1-3ubuntu2) edgy; urgency=low + + * Added missing kaffeine-xine.install + + -- Anthony Mercatante Thu, 18 Jul 2006 18:50:32 +0200 + +kaffeine (0.8.1-3ubuntu1) edgy; urgency=low + + * New upstream release. + * Removed obsolete patches. + * Porting existing and still required patches. + + -- Anthony Mercatante Mon, 03 Jul 2006 19:18:45 +0200 + +kaffeine (0.7.1-1.3ubuntu10) dapper; urgency=low + + * Add kubuntu_07_system_media.diff to fix the use of system:/ in kaffeine, + thanks to Bastian Holst (Closes: Malone #37131) + + -- Raphaël Pinson Mon, 22 May 2006 17:24:59 +0200 + +kaffeine (0.7.1-1.3ubuntu9) dapper; urgency=low + + * debian/cdbs/kde.mk: + - added dh_iconcache. + + -- Daniel Holbach Thu, 18 May 2006 20:59:38 +0200 + +kaffeine (0.7.1-1.3ubuntu8) dapper; urgency=low + + * Remove version on build-dep of libxine-dev so + Kaffeine can be backported + + -- Jonathan Riddell Thu, 13 Apr 2006 21:04:06 +0100 + +kaffeine (0.7.1-1.3ubuntu7) dapper; urgency=low + + * Add kubuntu_06_ioslave_protocols.diff, restrict protocols + KDE will pass to kaffeine, stop it copying system:/ files. + + -- Jonathan Riddell Wed, 12 Apr 2006 13:09:50 +0000 + +kaffeine (0.7.1-1.3ubuntu6) dapper; urgency=low + + * SECURITY UPDATE: fix buffer overflow + * Add kubuntu_05_buffer_overflow.diff + * Remotely supplied playlists can be used to execute + arbitrary code on the local machine using a buffer + overflow in http_peek() while creating HTTP requests + * kaffeine/player-parts/playlistimport.cpp: replace + custom made checks with those from KIO::NetAccess + * References: + CVE-2006-0051 + http://www.kde.org/info/security/advisory-20060404-1.txt + + -- Jonathan Riddell Thu, 6 Apr 2006 11:01:04 +0100 + +kaffeine (0.7.1-1.3ubuntu5) dapper; urgency=low + + * Add build-dep on libxtst-dev, should stop screensaver cutting in + + -- Jonathan Riddell Sun, 2 Apr 2006 20:38:14 +0100 + +kaffeine (0.7.1-1.3ubuntu4) dapper; urgency=low + + * Remove GStreamer 0.8 build-dep and kaffeine-gstreamer package + (GStreamer 0.8 now unsupported upstream, waiting on 0.10 support) + * Remove debian/patches/kubuntu_01_default_gstreamer.diff + * Remove GCC 3.4 usage on hppa,arm,m68k + + -- Jonathan Riddell Wed, 1 Feb 2006 12:01:23 +0000 + +kaffeine (0.7.1-1.3ubuntu3) dapper; urgency=low + + * rebuild to depend on libxine-main1 instead of libxine1c2 (and don't + break upgrades from breezy anymore) + + -- Michael Vogt Mon, 23 Jan 2006 10:50:15 +0100 + +kaffeine (0.7.1-1.3ubuntu2) dapper; urgency=low + + * Rebuild because libXft.la is gone + + -- Stephan Hermann Sat, 14 Jan 2006 13:48:30 +0100 + +kaffeine (0.7.1-1.3ubuntu1) dapper; urgency=low + + * Sync with Debian + * Rebuild for libstdc++ transition + * Alter rules file for .pot generation and add kubuntu_01_kdepot.diff + + -- Jonathan Riddell Tue, 6 Dec 2005 23:50:31 +0000 + kaffeine (0.7.1-1.3) unstable; urgency=low * NMU with maintainer's approval. All changes come straight from a patch @@ -301,6 +819,15 @@ -- Adeodato Simó Fri, 11 Nov 2005 00:06:35 +0100 +kaffeine (0.7.1-1.2ubuntu1) dapper; urgency=low + + * Sync with Debian + * Fix kubuntu_04_locate_wizard_stamp.diff for http://bugzilla.ubuntu.com/17109 + Kaffeine install wizard runs everytime I run kaffeine + * Alter kaffeine.install to install /usr/lib/libkmediapart.so + + -- Jonathan Riddell Fri, 28 Oct 2005 03:18:37 +0000 + kaffeine (0.7.1-1.2) unstable; urgency=low * Non-maintainer upload. @@ -375,6 +902,38 @@ -- Zack Cerza Mon, 13 Jun 2005 18:07:12 -0400 +kaffeine (0.7-0ubuntu4) breezy; urgency=low + + * Fix description of kaffeine-xine + + -- Jonathan Riddell Fri, 12 Aug 2005 19:36:47 +0000 + +kaffeine (0.7-0ubuntu3) breezy; urgency=low + + * Update kubuntu_03_gstreamer_stop.diff, sync with CVS + * Add kubuntu_04_locate_wizard_stamp.diff so wizard can be turned off globally + * Sync changelog with Debian + + -- Jonathan Riddell Fri, 12 Aug 2005 18:57:03 +0000 + +kaffeine (0.7-0ubuntu2) breezy; urgency=low + + * Add kubuntu_03_gstreamer_stop.diff to make a playing stop by stopping + not by playing the logo file + + -- Jonathan Riddell Wed, 10 Aug 2005 22:27:53 +0000 + +kaffeine (0.7-0ubuntu1) breezy; urgency=low + + * New upstream release + * Add DVB and GStreamer build-deps + * Split playing engines into kaffeine-gstreamer and kaffeine-xine + * Add kubuntu_01_default_gstreamer.diff to default to GStreamer + * Add kubuntu_02_gstreamer_service_menu.diff to use standard Kaffine icon for + GStreamer engine and open same media mimetypes. + + -- Jonathan Riddell Mon, 8 Aug 2005 13:13:39 +0000 + kaffeine (0.6-1) unstable; urgency=low * New upstream release. @@ -403,6 +962,43 @@ -- Zack Cerza Sun, 20 Mar 2005 12:29:08 -0500 +kaffeine (0.6-0ubuntu6) breezy; urgency=low + + * Rebuild package for new C++ ABI. + + -- Matthias Klose Mon, 30 May 2005 20:06:33 +0000 + +kaffeine (0.6-0ubuntu5) breezy; urgency=low + + * added --with-xorg compile option, in same special cases + kaffeine hangs on start, it will fix this issue. + + -- Andreas Mueller Thu, 12 May 2005 19:53:27 +0200 + +kaffeine (0.6-0ubuntu4) breezy; urgency=low + + * merge with debian + + -- Andreas Mueller Fri, 15 Apr 2005 22:58:03 +0200 + +kaffeine (0.6-0ubuntu2) hoary; urgency=low + + * added missing builddepend libqt3-compat-headers + + -- Andreas Mueller Sun, 27 Mar 2005 23:26:34 +0000 + +kaffeine (0.6-0ubuntu1) hoary; urgency=low + + * New upstream release + + -- Andreas Mueller Wed, 23 Mar 2005 00:18:48 +0000 + +kaffeine (0.5-1ubuntu1.1) hoary; urgency=low + + * sync with debian + + -- Andreas Mueller Sun, 13 Feb 2005 00:01:04 +0100 + kaffeine (0.5-1) unstable; urgency=low * New upstream release. Closes: #289488 @@ -509,3 +1105,4 @@ * Put the SuperKaramba theme in /usr/share/superkaramba/themes/kaffeine_bw/ -- Zack Cerza Mon, 05 Apr 2004 22:41:00 -0500 + diff -Nru kaffeine-1.2.2/debian/control kaffeine-1.2.2/debian/control --- kaffeine-1.2.2/debian/control 2011-05-01 11:24:07.000000000 +0200 +++ kaffeine-1.2.2/debian/control 2011-05-07 00:16:38.000000000 +0200 @@ -1,20 +1,21 @@ Source: kaffeine Section: video Priority: optional -Maintainer: Debian KDE Extras Team +Maintainer: Kubuntu Developers +XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Fathi Boudra , Mark Purcell , Michael Meskes Build-Depends: debhelper (>= 7.4.15), cmake, pkg-kde-tools (>= 0.9.0), kdelibs5-dev (>= 4:4.4.4), libxine-dev, libx11-dev, libxss-dev Standards-Version: 3.9.2 Homepage: http://kaffeine.kde.org -Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kaffeine/trunk -Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kaffeine/trunk +Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kaffeine/ubuntu +Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kaffeine/ubuntu Package: kaffeine Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libxine1-ffmpeg, libxine1-x, libqt4-sql-sqlite -Suggests: libdvdcss2 + libxine1-x, libqt4-sql-sqlite +Suggests: libdvdcss2, libxine1-ffmpeg Description: versatile media player for KDE Kaffeine is a media player for KDE. While It supports multiple Phonon backends, its default backend is Xine, giving Kaffeine a wide variety of diff -Nru kaffeine-1.2.2/debian/patches/kubuntu_01_kaffeine_restricted_install.diff kaffeine-1.2.2/debian/patches/kubuntu_01_kaffeine_restricted_install.diff --- kaffeine-1.2.2/debian/patches/kubuntu_01_kaffeine_restricted_install.diff 1970-01-01 01:00:00.000000000 +0100 +++ kaffeine-1.2.2/debian/patches/kubuntu_01_kaffeine_restricted_install.diff 2011-05-04 20:00:53.000000000 +0200 @@ -0,0 +1,31 @@ +Index: kaffeine-1.2.2-1ubuntu1/src/main.cpp +=================================================================== +--- kaffeine-1.2.2-1ubuntu1.orig/src/main.cpp 2011-05-04 19:59:49.028795894 +0200 ++++ kaffeine-1.2.2-1ubuntu1/src/main.cpp 2011-05-04 20:00:49.469814611 +0200 +@@ -24,6 +24,8 @@ + #include + #include "mainwindow.h" + #include "sqlhelper.h" ++#include ++#include + + class KaffeineApplication : public KUniqueApplication + { +@@ -76,5 +78,17 @@ + KCmdLineArgs::addTempFileOption(); + + KaffeineApplication app; ++ ++ //Added by Kubuntu for update-notifier-kde to prompt for restricted codec install ++ QDBusMessage m = QDBusMessage::createMethodCall("org.kubuntu.restrictedInstall", ++ "/org/kubuntu/restrictedInstall", ++ "org.kubuntu.restrictedInstall", ++ "installRestricted"); ++ QList dbusargs; ++ dbusargs.append("Kaffeine"); ++ dbusargs.append("gstreamer0.10-ffmpeg"); ++ m.setArguments(dbusargs); ++ bool queued = QDBusConnection::sessionBus().send(m); ++ + return app.exec(); + } diff -Nru kaffeine-1.2.2/debian/patches/series kaffeine-1.2.2/debian/patches/series --- kaffeine-1.2.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ kaffeine-1.2.2/debian/patches/series 2011-05-04 19:59:42.000000000 +0200 @@ -0,0 +1 @@ +kubuntu_01_kaffeine_restricted_install.diff diff -Nru kaffeine-1.2.2/debian/rules kaffeine-1.2.2/debian/rules --- kaffeine-1.2.2/debian/rules 2010-06-02 09:56:44.000000000 +0200 +++ kaffeine-1.2.2/debian/rules 2011-05-02 13:07:21.000000000 +0200 @@ -3,6 +3,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export KUBUNTU_DESKTOP_POT=extragear-multimedia_kaffeine + %: dh $@ --parallel --dbg-package=kaffeine-dbg --list-missing --with kde