[SCM] juk packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-5-g51f4a2a
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Fri Dec 5 15:42:49 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-applications/juk.git;a=commitdiff;h=9704a99
The following commit has been merged in the kubuntu_vivid_archive branch:
commit 9704a9906a8924788f8a2d0b53ff32dc3ea1f16e
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 3e6d0c4..c9bc002 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-juk (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+juk (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
--
juk packaging
More information about the pkg-kde-commits
mailing list