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

[Fathi Boudra]

Author: fabo
Date: 2011-02-20 11:27:11 +0000 (Sun, 20 Feb 2011)
New Revision: 18796

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/patches/113_initial_preference.diff
   kde-extras/k3b/trunk/debian/patches/114_bug587996_bdr_capacity_fix.diff
Log:
New upstream release.
Turn off HAL support by default - patch cherry-picked upstream.
Drop hal dependency.
Update debian/k3b-data.install file.


Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog	2011-02-20 11:24:54 UTC (rev 18795)
+++ kde-extras/k3b/trunk/debian/changelog	2011-02-20 11:27:11 UTC (rev 18796)
@@ -1,10 +1,11 @@
-k3b (2.0.1-3) UNRELEASED; urgency=low
+k3b (2.0.2-1) unstable; urgency=low
 
-  * Release Team will accept a fix for #607950 [1] if it arrives. Hence no new
-    upstreams to unstable.
-    [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=608147#40
+  * New upstream release.
+  * Turn off HAL support by default - patch cherry-picked upstream.
+  * Drop hal dependency.
+  * Update debian/k3b-data.install file.
 
- -- Modestas Vainius <modax at debian.org>  Thu, 30 Dec 2010 11:15:03 +0200
+ -- Fathi Boudra <fabo at debian.org>  Sun, 30 Jan 2011 20:54:21 +0200
 
 k3b (2.0.1-2) unstable; urgency=medium
 

Modified: kde-extras/k3b/trunk/debian/control
===================================================================
--- kde-extras/k3b/trunk/debian/control	2011-02-20 11:24:54 UTC (rev 18795)
+++ kde-extras/k3b/trunk/debian/control	2011-02-20 11:27:11 UTC (rev 18796)
@@ -17,7 +17,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  k3b-data (= ${source:Version}), libk3b6 (= ${binary:Version}),
- wodim | cdrskin, cdparanoia, cdrdao [linux-any], genisoimage, hal
+ wodim | cdrskin, cdparanoia, cdrdao [linux-any], genisoimage
 Recommends: libk3b6-extracodecs, dvd+rw-tools, vcdimager
 Suggests: k3b-extrathemes, k3b-i18n, normalize-audio, sox, movixmaker-2
 Replaces: k3b-data (<< 1.66.0~alpha2-1)

Modified: kde-extras/k3b/trunk/debian/k3b-data.install
===================================================================
--- kde-extras/k3b/trunk/debian/k3b-data.install	2011-02-20 11:24:54 UTC (rev 18795)
+++ kde-extras/k3b/trunk/debian/k3b-data.install	2011-02-20 11:27:11 UTC (rev 18796)
@@ -134,6 +134,3 @@
 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/patches/113_initial_preference.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/113_initial_preference.diff	2011-02-20 11:24:54 UTC (rev 18795)
+++ kde-extras/k3b/trunk/debian/patches/113_initial_preference.diff	2011-02-20 11:27:11 UTC (rev 18796)
@@ -3,8 +3,8 @@
 
 --- a/src/k3b.desktop
 +++ b/src/k3b.desktop
-@@ -140,3 +140,4 @@ X-KDE-StartupNotify=true
+@@ -142,3 +142,4 @@ X-KDE-StartupNotify=true
  X-KDE-NativeMimeType=application/x-k3b;
- Categories=KDE;Qt;AudioVideo;DiscBurning;
+ Categories=KDE;Qt;AudioVideo;DiscBurning;System;Filesystem;
  X-DBUS-ServiceType=Unique
 +InitialPreference=5

Modified: kde-extras/k3b/trunk/debian/patches/114_bug587996_bdr_capacity_fix.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/114_bug587996_bdr_capacity_fix.diff	2011-02-20 11:24:54 UTC (rev 18795)
+++ kde-extras/k3b/trunk/debian/patches/114_bug587996_bdr_capacity_fix.diff	2011-02-20 11:27:11 UTC (rev 18796)
@@ -8,7 +8,7 @@
 
 --- a/libk3bdevice/k3bdevice_mmc.cpp
 +++ b/libk3bdevice/k3bdevice_mmc.cpp
-@@ -319,7 +319,7 @@ bool K3b::Device::Device::readTrackInfor
+@@ -322,7 +322,7 @@ bool K3b::Device::Device::readTrackInfor
      // DVD-DL: 48 (MMC5)
      // CD:     36 (MMC2)
      //