[SCM] kdf packaging branch, kubuntu_vivid_archive, updated. debian/4.14.0-1-5-gca5004e
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Fri Dec 5 15:44:04 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-applications/kdf.git;a=commitdiff;h=7bbf6cd
The following commit has been merged in the kubuntu_vivid_archive branch:
commit 7bbf6cd0c6cc788e3ec4a717fa64560c85d8ec72
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 | 2 +-
debian/source/local-options | 1 -
3 files changed, 1 insertion(+), 3 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 317f10f..9c95358 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kdf (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+kdf (4:14.11.97-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
* New upstream release candidate
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
--
kdf packaging
More information about the pkg-kde-commits
mailing list