[SCM] KDE metapackages branch, master, updated. debian/75

[Modestas Vainius]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/meta-kde.git;a=commitdiff;h=e00bb11

The following commit has been merged in the master branch:
commit e00bb116cbfae2b736058b3cc10ec805aca71237
Merge: c872389c23b516d0962eaca1d8f49976804dcff4 91127b360c39deb87282807cd1d6e4d3bc08312a
Author: Modestas Vainius <modax at debian.org>
Date:   Sat May 26 18:33:13 2012 +0300

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

 debian/changelog |    4 ++++
 debian/control   |    2 +-
 debian/rules     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 6bf7d13,df7c6cc..7f35362
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,12 +1,24 @@@
 -meta-kde (5:75~pre5) UNRELEASED; urgency=low
 +meta-kde (5:75) UNRELEASED; urgency=low
  
    [ José Manuel Santamaría Lema ]
 +  * Set Priority to extra for these dummy transitional packages:
 +    - kdegraphics-libs-data
 +    - kdegraphics-strigi-plugins
 +  * Bump minimum KDE SC version to 4.7.4.
+   * Bump dev:latestVersion to 4.8.3.
+   * Add breaks to kde-sc-dev-latest against libkactivities-dev.
+   * Make kde-sc-dev-latest break kdelibs5-dev (<< ${devLatest:Version}) but not
+     against of (<< 4:4.7.4-3~); see the 5:74 changelog entry of this package.
  
 - -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 18 Mar 2012 16:27:31 +0100
 +  [ Pino Toscano ]
 +  * Drop konqPlugins:Version and make konq-plugins use kde:Version, since
 +    it is part of kde-baseapps.
 +  * freespacenotifier is part of kdebase-workspace/kde-workspace since 4.6,
 +    so make its recommend versioned with kde:Version.
 +  * Copy the kdeaccessibility and kdeutils metapackages from the homonymous
 +    sources.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 07 Mar 2012 03:22:03 +0100
  
  meta-kde (5:74) unstable; urgency=low
  
diff --cc debian/rules
index 5e3d45e,e4abf08..8257671
--- a/debian/rules
+++ b/debian/rules
@@@ -1,12 -1,13 +1,12 @@@
  #!/usr/bin/make -f
  
 -MINIMUM_KDE_VERSION := 4:4.6.3
 +MINIMUM_KDE_VERSION := 4:4.7.4
  MINIMUM_KDEPIM_VERSION := 4:4.4.11
 -KONQ_PLUGINS_VERSION := $(MINIMUM_KDE_VERSION)
  KOFFICE_VERSION := 1:2.3.3
- DEV_LATEST_VERSION := 4:4.7.4
+ DEV_LATEST_VERSION := 4:4.8.3
  DEV_PREV_VERSION := 4:4.7.4
  
 -KDE_VERSION_METAPKGS := kdeedu kdegraphics kdegraphics-libs-data kdegraphics-strigi-plugins
 +KDE_VERSION_METAPKGS := kdeaccessibility kdeedu kdegraphics kdegraphics-libs-data kdegraphics-strigi-plugins kdeutils
  
  BINARY_VERSION_NO_EPOCH := $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(\([[:digit:]]\+\):\)\?/./')
  DEV_LATEST_PACKAGE_VERSION := $(DEV_LATEST_VERSION)+$(BINARY_VERSION_NO_EPOCH)

-- 
KDE metapackages