[SCM] breeze packaging branch, kubuntu_vivid_backports, updated. ubuntu/4%5.3.2-0ubuntu1-10-gb429be1
Scarlett Clark
sgclark-guest at moszumanska.debian.org
Wed Aug 5 03:57:34 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/breeze.git;a=commitdiff;h=b429be1
The following commit has been merged in the kubuntu_vivid_backports branch:
commit b429be1d4b462bcc519940995f8f144a53d9cf71
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Tue Aug 4 20:57:28 2015 -0700
Manual merge.
---
debian/breeze-cursor-theme.install | 1 -
debian/changelog | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/breeze-cursor-theme.install b/debian/breeze-cursor-theme.install
index c46a1b8..07f5629 100644
--- a/debian/breeze-cursor-theme.install
+++ b/debian/breeze-cursor-theme.install
@@ -1,4 +1,3 @@
-
# Do NOT remove these files, they are required by the postinst maintscript
# These are generated by the wrapperthemes.sh call in debian/rules, please
# fix that instead if this breaks.
diff --git a/debian/changelog b/debian/changelog
index e5ca379..fa50936 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
breeze (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
* Vivid backport
+ * Manual merge.
-- Scarlett Clark <sgclark at kubuntu.org> Thu, 02 Jul 2015 11:21:36 -0700
--
breeze packaging
More information about the pkg-kde-commits
mailing list