[SCM] KDE Multimedia module packaging branch, kde4.8, updated. debian/4.7.4-2-8-g164cc05

Eshat Cakar eshat-guest at alioth.debian.org
Mon Mar 19 15:21:16 UTC 2012


The following commit has been merged in the kde4.8 branch:
commit 164cc05f70c617826ea971a0bd9c530baa402931
Merge: d31e5b36fc83e3f878ced86976fc69cc97dd8b44 e3a1fb2ebc90787b332cf68ed79967722f706099
Author: Eshat Cakar <info at eshat.de>
Date:   Mon Mar 19 16:21:06 2012 +0100

    Merge branch 'master' into kde4.8
    
    Conflicts:
    	debian/changelog

 debian/changelog |   12 ++++++++++++
 debian/control   |    5 ++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 1144ed5,3c73203..0841400
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,15 +1,27 @@@
 +kdemultimedia (4:4.8.1-0r0) UNRELEASED; urgency=low
 +
 +  * New upstream release.
 +
 +  [ Eshat Cakar ]
 +  * Remove kscd_dont_crash_if_device_is_emtpy.diff, applied upstream.
 +  * Update installed files.
 +  * Bump kdelibs5-dev build dependency to version 4:4.8.
 +  * Bump Standards-Version to 3.9.3, no changes needed.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 09 Mar 2012 00:22:19 +0100
 +
+ kdemultimedia (4:4.7.4-2) unstable; urgency=low
+ 
+   * Team upload. Upload to unstable.
+   * Update uploaders, remove Armin.
+ 
+   [ Pino Toscano ]
+   * libtunepimp is long deprecated and will be removed soon from Debian, so:
+     - drop the build dependency on libtunepimp-dev (Closes: #657016)
+     - do not mention the MusicBrainz support in juk's description
+ 
+  -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Tue, 06 Mar 2012 20:17:47 +0100
+ 
  kdemultimedia (4:4.7.4-1) experimental; urgency=low
  
    * New upstream release.
diff --cc debian/control
index 230eef8,d4491ba..4d05904
--- a/debian/control
+++ b/debian/control
@@@ -9,12 -9,12 +9,12 @@@ Uploaders: Sune Vuorela <sune at debian.or
   Eshat Cakar <info at eshat.de>
  Build-Depends: kde-sc-dev-latest (>= 4:4.7.4),
   cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
 - kdelibs5-dev (>= 4:4.7), libphonon-dev (>= 4:4.6.0really4.3.80),
 + kdelibs5-dev (>= 4:4.8), libphonon-dev (>= 4:4.6.0really4.3.80),
   libasound2-dev (>= 1.0.14a) [linux-any],
   libcdparanoia-dev, libflac-dev, libmusicbrainz3-dev, libpulse-dev (>= 0.9.12), libxine-dev (>= 1.1.16.3),
-  libogg-dev, libtag1-dev (>= 1.6), libtheora-dev, libtunepimp-dev, libvorbis-dev, libx11-dev,
+  libogg-dev, libtag1-dev (>= 1.6), libtheora-dev, libvorbis-dev, libx11-dev,
   libavcodec-dev, libswscale-dev, libavformat-dev, libavutil51
 -Standards-Version: 3.9.2
 +Standards-Version: 3.9.3
  Homepage: http://www.kde.org/
  Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kdemultimedia.git
  Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kdemultimedia.git

-- 
KDE Multimedia module packaging



More information about the pkg-kde-commits mailing list