diff -Nru meta-kde-71~pre15ubuntu10/debian/changelog meta-kde-71~pre15ubuntu11/debian/changelog --- meta-kde-71~pre15ubuntu10/debian/changelog 2012-01-25 16:15:36.000000000 +0000 +++ meta-kde-71~pre15ubuntu11/debian/changelog 2012-03-06 22:21:11.000000000 +0000 @@ -1,3 +1,12 @@ +meta-kde (5:71~pre15ubuntu11) precise; urgency=low + + * Replace suggests on koffice with calligra and adjust versioning + (LP: #941875) + * Don't suggest kde-l10n which doesn't exist in kubuntu + * Bump for SC 4.8.1 + + -- Philip Muškovac Sat, 03 Mar 2012 00:15:44 +0100 + meta-kde (5:71~pre15ubuntu10) precise; urgency=low * Bump for SC 4.8 release diff -Nru meta-kde-71~pre15ubuntu10/debian/control meta-kde-71~pre15ubuntu11/debian/control --- meta-kde-71~pre15ubuntu10/debian/control 2011-12-26 19:49:31.000000000 +0000 +++ meta-kde-71~pre15ubuntu11/debian/control 2012-03-02 23:17:01.000000000 +0000 @@ -17,7 +17,6 @@ udisks [linux-any], upower [linux-any], hal [!linux-any] Breaks: kde-minimal (<< 5:57) Recommends: kdm (>= ${kde:Version}), xserver-xorg -Suggests: kde-l10n (>= ${kde:Version}) Description: KDE Plasma Desktop and minimal set of applications KDE is the powerful, integrated, and easy-to-use Free Software desktop platform and suite of applications. @@ -34,7 +33,6 @@ kde-baseapps (>= ${kde:Version}), udisks [linux-any], upower [linux-any], hal [!linux-any] Recommends: kdm (>= ${kde:Version}), xserver-xorg -Suggests: kde-l10n (>= ${kde:Version}) Breaks: kde-minimal (<< 5:57) Description: KDE Plasma Netbook and minimal set of applications KDE is the powerful, integrated, and easy-to-use Free Software desktop @@ -57,7 +55,7 @@ okular (>= ${kde:Version}), plasma-desktopthemes-artwork (>= ${kde:Version}), sweeper (>= ${kde:Version}), khelpcenter4 (>= ${kde:Version}) Recommends: konq-plugins (>= ${konqPlugins:Version}), plasma-widget-networkmanagement, freespacenotifier, -Suggests: kde-l10n (>= ${kde:Version}), kde-plasma-desktop (>= ${source:Version}), +Suggests: kde-plasma-desktop (>= ${source:Version}), kde-plasma-netbook (>= ${source:Version}), skanlite Breaks: kde-minimal (<< 5:57) Description: KDE Plasma Desktop and standard set of applications @@ -77,7 +75,7 @@ Recommends: kde-standard (>= ${source:Version}), kdeaccessibility (>= ${kde:Version}), kdesdk (>= ${kde:Version}), kdetoys (>= ${kde:Version}), kdewebdev (>= ${kde:Version}) -Suggests: kde-l10n (>= ${kde:Version}), koffice (>= ${koffice:Version}), xorg +Suggests: calligra (>= ${calligra:Version}), xorg Provides: kde-software-compilation Breaks: kde-minimal (<< 5:57) Description: complete KDE Software Compilation for end users diff -Nru meta-kde-71~pre15ubuntu10/debian/rules meta-kde-71~pre15ubuntu11/debian/rules --- meta-kde-71~pre15ubuntu10/debian/rules 2012-01-19 10:35:59.000000000 +0000 +++ meta-kde-71~pre15ubuntu11/debian/rules 2012-03-02 23:17:05.000000000 +0000 @@ -1,11 +1,11 @@ #!/usr/bin/make -f -MINIMUM_KDE_VERSION := 4:4.8.0 -MINIMUM_KDEPIM_VERSION := 4:4.7.2+git111007-0ubuntu1 +MINIMUM_KDE_VERSION := 4:4.8.1 +MINIMUM_KDEPIM_VERSION := 4:4.8.1 KONQ_PLUGINS_VERSION := $(MINIMUM_KDE_VERSION) -KOFFICE_VERSION := 1:2.3.3 -DEV_LATEST_VERSION := 4:4.8.0 -DEV_PREV_VERSION := 4:4.8.0 +CALLIGRA_VERSION := 1:2.3.87 +DEV_LATEST_VERSION := 4:4.8.1 +DEV_PREV_VERSION := 4:4.8.1 KDE_VERSION_METAPKGS := kdeedu kdegraphics kdegraphics-libs-data @@ -25,7 +25,7 @@ dh_gencontrol --remaining-packages -- \ -VkonqPlugins:Version='$(KONQ_PLUGINS_VERSION)' \ -Vkdepim:Version='$(MINIMUM_KDEPIM_VERSION)' \ - -Vkoffice:Version='$(KOFFICE_VERSION)' \ + -Vcalligra:Version='$(CALLIGRA_VERSION)' \ -Vkde:Version='$(MINIMUM_KDE_VERSION)' %: