[SCM] KDE Base Applications module packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-8-g34157ee
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Fri Dec 5 15:43:32 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-applications/kde-baseapps.git;a=commitdiff;h=014ce41
The following commit has been merged in the kubuntu_vivid_archive branch:
commit 014ce41b01568145295a60c111d6baa461af7116
Author: Jonathan Riddell <jr at jriddell.org>
Date: Fri Dec 5 16:34:55 2014 +0100
update to 14.11.97
---
debian/.gitattributes | 1 -
debian/changelog | 5 +++--
debian/source/local-options | 1 -
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 9d1108b..380ff52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kde-baseapps (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+kde-baseapps (4:14.11.97-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
* Merge with debian unstable, remaining changes:
- lower the konqueror priority to 30 as it's not our default.
@@ -9,8 +9,9 @@ kde-baseapps (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
* Fix watch urls for new release location.
* Update Vcs urls for the new repository location.
* Update the maintainer.
+ * PPA build
- -- Philip Muškovac <yofel at kubuntu.org> Sun, 23 Nov 2014 14:33:44 +0100
+ -- Philip Muškovac <yofel at kubuntu.org> Fri, 28 Nov 2014 21:36:11 +0100
kde-baseapps (4:4.14.2-0ubuntu1) vivid; urgency=medium
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 2ee6f0f..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-abort-on-upstream-changes
--
KDE Base Applications module packaging
More information about the pkg-kde-commits
mailing list