[SCM] oxygen packaging branch, master, updated. 909b74ca087007b0cf008ec8a1633f8bfe6da54b

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/oxygen.git;a=commitdiff;h=9f74c44

The following commit has been merged in the master branch:
commit 9f74c447adbdbb67a67a06e74eb3409fcf98ad5f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Jul 1 14:22:32 2015 +0200

    Fix changelog after merge.
---
 debian/changelog | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 90e178d..66addef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,12 +6,6 @@ oxygen (4:5.3.2-1~) UNRELEASED; urgency=medium
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 12:25:57 +0200
 
-oxygen (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
-
-  * New upstream release
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:31:56 +0200
-
 oxygen (4:5.3.1-0ubuntu1) wily; urgency=medium
 
   * New upstream release
@@ -35,11 +29,11 @@ oxygen (4:5.2.2-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
   * Add oxygen_kwin_deco.mo files to not-installed due to
-    kwin-decoration-oxygen package being removed. 
+    kwin-decoration-oxygen package being removed.
   * Re- remove kwin-decoration-oxygen package, it no longer builds
-  * Remove missing file. 
-  * Fix stubvar external package for removed package. 
-  * Add missing file. 
+  * Remove missing file.
+  * Fix stubvar external package for removed package.
+  * Add missing file.
   * Re add missing files to make ci happy.
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 24 Mar 2015 07:37:03 -0700

-- 
oxygen packaging