rev 11086 - kde-extras/k3b/trunk/debian

Francois Marier francois at alioth.debian.org
Thu Jun 19 22:40:58 UTC 2008


Author: francois
Date: 2008-06-19 22:40:57 +0000 (Thu, 19 Jun 2008)
New Revision: 11086

Modified:
   kde-extras/k3b/trunk/debian/changelog
   kde-extras/k3b/trunk/debian/control
Log:
Acknowledge and merge NMU


Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog	2008-06-18 20:37:48 UTC (rev 11085)
+++ kde-extras/k3b/trunk/debian/changelog	2008-06-19 22:40:57 UTC (rev 11086)
@@ -1,10 +1,17 @@
-k3b (1.0.5-3) UNRELEASED; urgency=low
+k3b (1.0.5-3) unstable; urgency=high
 
-  * TODO: Acknowledge NMU (closes: #486112)
+  * Acknowledge NMU (closes: #486112)
   * k3b: Add a versioned dependency on libk3b3 (closes: #486093)
 
- -- Francois Marier <francois at debian.org>  Thu, 19 Jun 2008 08:33:25 +1200
+ -- Francois Marier <francois at debian.org>  Fri, 20 Jun 2008 10:40:19 +1200
 
+k3b (1.0.5-2.1) unstable; urgency=high
+
+  * Non-maintainer upload, acked by uploader Fathi Boudra.
+  * Add various missing replaces. (Closes: #486112)
+
+ -- Adeodato Simó <dato at net.com.org.es>  Wed, 18 Jun 2008 18:37:36 +0200
+
 k3b (1.0.5-2) unstable; urgency=low
 
   [ Michael Meskes ]

Modified: kde-extras/k3b/trunk/debian/control
===================================================================
--- kde-extras/k3b/trunk/debian/control	2008-06-18 20:37:48 UTC (rev 11085)
+++ kde-extras/k3b/trunk/debian/control	2008-06-19 22:40:57 UTC (rev 11086)
@@ -14,6 +14,7 @@
 Depends: ${shlibs:Depends}, wodim | cdrskin, cdparanoia (>= 3a9.8), genisoimage, kdelibs-data (>= 4:3.1.4-2), cdrdao (>= 1.1.7-5), k3b-data (= ${source:Version}), libk3b3 (= ${binary:Version})
 Recommends: vcdimager (>= 0.7), dvd+rw-tools, kdebase-kio-plugins, kcontrol, libk3b3-extracodecs
 Suggests: k3b-i18n, normalize-audio, toolame, sox, movixmaker-2
+Replaces: libk3b3 (<< 1.0.5-2)
 Description: A sophisticated KDE CD burning application 
  K3b is a GUI frontend to the CD recording programs cdrdao and cdrecord.
  Its aim is to provide a very user friendly interface to all the tasks
@@ -29,7 +30,7 @@
 
 Package: k3b-data
 Conflicts: k3b (<< 1.0.4-4)
-Replaces: k3b (<< 1.0.4-4)
+Replaces: k3b (<< 1.0.5-2)
 Architecture: all
 Description: A sophisticated KDE CD burning application - data files
  K3b is a GUI frontend to the CD recording programs cdrdao and cdrecord.
@@ -55,7 +56,7 @@
 Architecture: any
 Conflicts: libk3bcore, libk3bplugin, libk3btools, libk3bproject, k3blibs, libk3b2
 Depends: ${shlibs:Depends}
-Replaces: libk3b2
+Replaces: libk3b2, libk3b-dev (<< 1.0.5-2)
 Description: The KDE cd burning application library - runtime files
  K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord.
  Its aim is to provide a very user friendly interface to all the tasks
@@ -68,7 +69,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: libk3b2-mp3
-Replaces: libk3b2-mp3, libk3b2-extracodecs
+Replaces: libk3b2-mp3, libk3b2-extracodecs, libk3b3 (<< 1.0.5-2)
 Description: The KDE cd burning application library - extra decoders
  K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord.
  Its aim is to provide a very user friendly interface to all the tasks




More information about the pkg-kde-commits mailing list