[SCM] plasma-desktop packaging branch, kubuntu_xenial_archive, updated. debian/5.4.3-1-38-g9437f1b

Philip Muškovac yofel-guest at moszumanska.debian.org
Thu Jan 14 23:30:24 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-desktop.git;a=commitdiff;h=0fdd052

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 0fdd0525152285b3e011cdd7ab6b57b6fcae4512
Author: Philip Muškovac <yofel at gmx.net>
Date:   Fri Jan 15 00:29:18 2016 +0100

    Put the file back in
---
 debian/changelog      | 1 +
 debian/patches/series | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3f1f921..b3ade24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ plasma-desktop (4:5.5.3-0ubuntu1) UNRELEASED; urgency=medium
   * Build-depend on pkg-kde-tools >= 0.15.18 for l10n-packages.mk support
   * Rename the pam-kwallet recommends to libpam-kwallet as the packages were
     renamed
+  * Cherry pick upstream_fix_panel_shrinking.diff from git
 
   [ Scarlett Clark ]
   * Debian merge, No remaining changes. 
diff --git a/debian/patches/series b/debian/patches/series
index 830bdcc..357a0dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 allow_uxterm_overrides.diff
+upstream_fix_panel_shrinking.diff

-- 
plasma-desktop packaging



More information about the pkg-kde-commits mailing list