[SCM] oxygen packaging branch, master, updated. ubuntu/4%5.3.2-0ubuntu1-12-g6ab4a80

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit d98377199a3d09684ef67f8fbf127477cd3dbbc5
Merge: c9d179bbdab177f01ec792b66c0afaf1e6636dfb 06a90e6ca85bda6d62fe98b5ee19c901d78dc797
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jul 3 13:40:04 2015 +0200

    Merge tag 'ubuntu/4%5.3.2-0ubuntu1'
    
    'oxygen Ubuntu release 4:5.3.2-0ubuntu1'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/plasma-theme-oxygen.install

 debian/changelog | 18 ++++++++++++------
 debian/control   |  2 ++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 55e98d3,9dc2611..71fa141
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,4 +1,24 @@@
 +oxygen (4:5.3.2-3~) UNRELEASED; urgency=medium
 +
 +  * 
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 03 Jul 2015 13:33:27 +0200
 +
 +oxygen (4:5.3.2-2) unstable; urgency=medium
 +
 +  * Update install files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 02 Jul 2015 12:09:54 +0200
 +
 +oxygen (4:5.3.2-1) unstable; urgency=medium
 +
 +  * New upstream release (5.3.0).
 +  * New upstream release (5.3.1).
 +  * New upstream release (5.3.2).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 01 Jul 2015 14:22:45 +0200
 +
- oxygen (4:5.3.1-0ubuntu1) wily; urgency=medium
+ oxygen (4:5.3.2-0ubuntu1) wily; urgency=medium
  
    * New upstream release
  
@@@ -37,6 -16,20 +36,13 @@@ oxygen (4:5.2.2-0ubuntu2) vivid; urgenc
  
   -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 25 Mar 2015 00:11:23 +0100
  
 -oxygen (4:5.3.1-1~) UNRELEASED; urgency=medium
 -
 -  * New upstream release (5.3.0).
 -  * New upstream release (5.3.1).
 -
 - -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:57:15 +0200
 -
+ oxygen (4:5.2.2-1) experimental; urgency=medium
+ 
+   * New upstream release (5.2.1).
+   * New upstream release (5.2.2).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 25 Mar 2015 23:17:55 +0100
+ 
  oxygen (4:5.2.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
oxygen packaging