rev 18642 - in kde-extras/k3b/trunk/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Tue Aug 17 07:10:01 UTC 2010 

Author: fabo
Date: 2010-08-17 07:09:56 +0000 (Tue, 17 Aug 2010)
New Revision: 18642

Added:
   kde-extras/k3b/trunk/debian/patches/113_initial_preference.diff
Modified:
   kde-extras/k3b/trunk/debian/changelog
   kde-extras/k3b/trunk/debian/control
   kde-extras/k3b/trunk/debian/k3b-data.install
   kde-extras/k3b/trunk/debian/k3b-i18n.install
   kde-extras/k3b/trunk/debian/patches/series
Log:
Update installed files.
Merge Ubuntu changes: set k3b as the default handler for iso files
rather than ark.


Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog	2010-08-14 08:36:05 UTC (rev 18641)
+++ kde-extras/k3b/trunk/debian/changelog	2010-08-17 07:09:56 UTC (rev 18642)
@@ -1,4 +1,4 @@
-k3b (2.0.1-1) UNRELEASED; urgency=low
+k3b (2.0.1-1) unstable; urgency=low
 
   * New upstream release:
     - Freeze on ripping Audio CD using external encoder to MP3 or FLAC
@@ -14,8 +14,11 @@
   [ Fathi Boudra ]
   * Remove patches to improve dvd+rw-tools output parsing functions - merged
     upstream.
+  * Update installed files.
+  * Merge Ubuntu changes: set k3b as the default handler for iso files rather
+    than ark.
 
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 11 Jul 2010 10:29:07 +0300
+ -- Fathi Boudra <fabo at debian.org>  Tue, 17 Aug 2010 09:05:35 +0300
 
 k3b (2.0.0-1) unstable; urgency=low
 

Modified: kde-extras/k3b/trunk/debian/control
===================================================================
--- kde-extras/k3b/trunk/debian/control	2010-08-14 08:36:05 UTC (rev 18641)
+++ kde-extras/k3b/trunk/debian/control	2010-08-17 07:09:56 UTC (rev 18642)
@@ -8,7 +8,7 @@
  libflac-dev, libkcddb-dev, libmad0-dev, libmpcdec-dev, libmusicbrainz4-dev,
  libsamplerate0-dev, libsndfile1-dev, libtag1-dev, shared-mime-info,
  libvorbis-dev, libcam-dev [kfreebsd-i386 kfreebsd-amd64]
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Homepage: http://www.k3b.org
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/k3b/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/k3b/trunk/

Modified: kde-extras/k3b/trunk/debian/k3b-data.install
===================================================================
--- kde-extras/k3b/trunk/debian/k3b-data.install	2010-08-14 08:36:05 UTC (rev 18641)
+++ kde-extras/k3b/trunk/debian/k3b-data.install	2010-08-17 07:09:56 UTC (rev 18642)
@@ -1,6 +1,12 @@
 etc/dbus-1/system.d/org.kde.kcontrol.k3bsetup.conf
 usr/share/dbus-1/system-services/org.kde.kcontrol.k3bsetup.service
-usr/share/polkit-1/actions/org.kde.kcontrol.k3bsetup.policy
+usr/share/icons/hicolor/128x128/apps/k3b.png
+usr/share/icons/hicolor/16x16/apps/k3b.png
+usr/share/icons/hicolor/22x22/apps/k3b.png
+usr/share/icons/hicolor/32x32/apps/k3b.png
+usr/share/icons/hicolor/48x48/apps/k3b.png
+usr/share/icons/hicolor/64x64/apps/k3b.png
+usr/share/icons/hicolor/scalable/apps/k3b.svgz
 usr/share/kde4/apps/k3b/cdi/cdi_imag.rtf
 usr/share/kde4/apps/k3b/cdi/cdi_text.fnt
 usr/share/kde4/apps/k3b/cdi/cdi_vcd.app
@@ -14,7 +20,6 @@
 usr/share/kde4/apps/k3b/icons/oxygen/128x128/actions/tools-rip-audio-cd.png
 usr/share/kde4/apps/k3b/icons/oxygen/128x128/actions/tools-rip-video-cd.png
 usr/share/kde4/apps/k3b/icons/oxygen/128x128/actions/tools-rip-video-dvd.png
-usr/share/kde4/apps/k3b/icons/oxygen/128x128/apps/k3b.png
 usr/share/kde4/apps/k3b/icons/oxygen/128x128/devices/media-optical-audio.png
 usr/share/kde4/apps/k3b/icons/oxygen/128x128/devices/media-optical-cd-video.png
 usr/share/kde4/apps/k3b/icons/oxygen/128x128/devices/media-optical-dvd-video.png
@@ -24,7 +29,6 @@
 usr/share/kde4/apps/k3b/icons/oxygen/16x16/actions/tools-rip-audio-cd.png
 usr/share/kde4/apps/k3b/icons/oxygen/16x16/actions/tools-rip-video-cd.png
 usr/share/kde4/apps/k3b/icons/oxygen/16x16/actions/tools-rip-video-dvd.png
-usr/share/kde4/apps/k3b/icons/oxygen/16x16/apps/k3b.png
 usr/share/kde4/apps/k3b/icons/oxygen/16x16/devices/media-optical-audio.png
 usr/share/kde4/apps/k3b/icons/oxygen/16x16/devices/media-optical-cd-video.png
 usr/share/kde4/apps/k3b/icons/oxygen/16x16/devices/media-optical-data.png
@@ -33,7 +37,6 @@
 usr/share/kde4/apps/k3b/icons/oxygen/22x22/actions/tools-rip-audio-cd.png
 usr/share/kde4/apps/k3b/icons/oxygen/22x22/actions/tools-rip-video-cd.png
 usr/share/kde4/apps/k3b/icons/oxygen/22x22/actions/tools-rip-video-dvd.png
-usr/share/kde4/apps/k3b/icons/oxygen/22x22/apps/k3b.png
 usr/share/kde4/apps/k3b/icons/oxygen/22x22/devices/media-optical-audio.png
 usr/share/kde4/apps/k3b/icons/oxygen/22x22/devices/media-optical-cd-video.png
 usr/share/kde4/apps/k3b/icons/oxygen/22x22/devices/media-optical-data.png
@@ -42,7 +45,6 @@
 usr/share/kde4/apps/k3b/icons/oxygen/32x32/actions/tools-rip-audio-cd.png
 usr/share/kde4/apps/k3b/icons/oxygen/32x32/actions/tools-rip-video-cd.png
 usr/share/kde4/apps/k3b/icons/oxygen/32x32/actions/tools-rip-video-dvd.png
-usr/share/kde4/apps/k3b/icons/oxygen/32x32/apps/k3b.png
 usr/share/kde4/apps/k3b/icons/oxygen/32x32/devices/media-optical-audio.png
 usr/share/kde4/apps/k3b/icons/oxygen/32x32/devices/media-optical-cd-video.png
 usr/share/kde4/apps/k3b/icons/oxygen/32x32/devices/media-optical-data.png
@@ -53,7 +55,6 @@
 usr/share/kde4/apps/k3b/icons/oxygen/48x48/actions/tools-rip-audio-cd.png
 usr/share/kde4/apps/k3b/icons/oxygen/48x48/actions/tools-rip-video-cd.png
 usr/share/kde4/apps/k3b/icons/oxygen/48x48/actions/tools-rip-video-dvd.png
-usr/share/kde4/apps/k3b/icons/oxygen/48x48/apps/k3b.png
 usr/share/kde4/apps/k3b/icons/oxygen/48x48/devices/media-optical-audio.png
 usr/share/kde4/apps/k3b/icons/oxygen/48x48/devices/media-optical-cd-video.png
 usr/share/kde4/apps/k3b/icons/oxygen/48x48/devices/media-optical-data.png
@@ -64,7 +65,6 @@
 usr/share/kde4/apps/k3b/icons/oxygen/64x64/actions/tools-rip-audio-cd.png
 usr/share/kde4/apps/k3b/icons/oxygen/64x64/actions/tools-rip-video-cd.png
 usr/share/kde4/apps/k3b/icons/oxygen/64x64/actions/tools-rip-video-dvd.png
-usr/share/kde4/apps/k3b/icons/oxygen/64x64/apps/k3b.png
 usr/share/kde4/apps/k3b/icons/oxygen/64x64/devices/media-optical-audio.png
 usr/share/kde4/apps/k3b/icons/oxygen/64x64/devices/media-optical-cd-video.png
 usr/share/kde4/apps/k3b/icons/oxygen/64x64/devices/media-optical-dvd-video.png
@@ -74,7 +74,6 @@
 usr/share/kde4/apps/k3b/icons/oxygen/scalable/actions/tools-rip-audio-cd.svgz
 usr/share/kde4/apps/k3b/icons/oxygen/scalable/actions/tools-rip-video-cd.svgz
 usr/share/kde4/apps/k3b/icons/oxygen/scalable/actions/tools-rip-video-dvd.svgz
-usr/share/kde4/apps/k3b/icons/oxygen/scalable/apps/k3b.svgz
 usr/share/kde4/apps/k3b/icons/oxygen/scalable/devices/media-optical-audio.svgz
 usr/share/kde4/apps/k3b/icons/oxygen/scalable/devices/media-optical-cd-video.svgz
 usr/share/kde4/apps/k3b/icons/oxygen/scalable/devices/media-optical-data.svgz
@@ -134,6 +133,7 @@
 usr/share/kde4/services/videodvd.protocol
 usr/share/kde4/servicetypes/k3bplugin.desktop
 usr/share/mime/packages/x-k3b.xml
+usr/share/polkit-1/actions/org.kde.kcontrol.k3bsetup.policy
 usr/share/sounds/k3b_error1.wav
 usr/share/sounds/k3b_success1.wav
 usr/share/sounds/k3b_wait_media1.wav

Modified: kde-extras/k3b/trunk/debian/k3b-i18n.install
===================================================================
--- kde-extras/k3b/trunk/debian/k3b-i18n.install	2010-08-14 08:36:05 UTC (rev 18641)
+++ kde-extras/k3b/trunk/debian/k3b-i18n.install	2010-08-17 07:09:56 UTC (rev 18642)
@@ -1,4 +1,5 @@
 usr/share/locale/*/LC_MESSAGES/k3b.mo
 usr/share/locale/*/LC_MESSAGES/k3bsetup.mo
+usr/share/locale/*/LC_MESSAGES/kio_videodvd.mo
 usr/share/locale/*/LC_MESSAGES/libk3b.mo
 usr/share/locale/*/LC_MESSAGES/libk3bdevice.mo

Added: kde-extras/k3b/trunk/debian/patches/113_initial_preference.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/113_initial_preference.diff	                        (rev 0)
+++ kde-extras/k3b/trunk/debian/patches/113_initial_preference.diff	2010-08-17 07:09:56 UTC (rev 18642)
@@ -0,0 +1,10 @@
+Description: set K3b as the default handler for iso files rather than ark
+Author: Jonathan Thomas <echidnaman at kubuntu.org>
+
+--- a/src/k3b.desktop
++++ b/src/k3b.desktop
+@@ -140,3 +140,4 @@ X-KDE-StartupNotify=true
+ X-KDE-NativeMimeType=application/x-k3b;
+ Categories=KDE;Qt;AudioVideo;DiscBurning;
+ X-DBUS-ServiceType=Unique
++InitialPreference=5

Modified: kde-extras/k3b/trunk/debian/patches/series
===================================================================
--- kde-extras/k3b/trunk/debian/patches/series	2010-08-14 08:36:05 UTC (rev 18641)
+++ kde-extras/k3b/trunk/debian/patches/series	2010-08-17 07:09:56 UTC (rev 18642)
@@ -3,3 +3,4 @@
 110_disable_no_problems_found_popup.diff
 111_advice_debian_libk3b3-extracodes.diff
 112_dont_require_mp3.diff
+113_initial_preference.diff

More information about the pkg-kde-commits mailing list