[SCM] kdeclarative packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-4-gc3fa5ed

Jonathan Riddell jriddell-guest at moszumanska.debian.org
Tue May 19 12:57:19 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kdeclarative.git;a=commitdiff;h=1332443

The following commit has been merged in the kubuntu_wily_archive branch:
commit 1332443f674004545c65b95b921fa23ea18d567a
Merge: fec691d35f8c4eaeb074bb600413bead7e2ec14b c309df5a1c1053d073418f18cf3ad037336b1094
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Mar 21 20:48:32 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
    
    Conflicts:
    	debian/control
    	debian/libkf5declarative5.symbols
    	debian/patches/series

 debian/changelog                                |  6 ++++++
 debian/control                                  | 16 ++++++++++++++++
 debian/kpackagelauncherqml.install              |  1 +
 debian/libkf5declarative5.symbols               |  6 +++---
 debian/patches/series                           |  0
 debian/qml-module-org-kde-kwindowsystem.install |  2 ++
 6 files changed, 28 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 99d1038,d2df0c8..77c7a4a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,9 +1,23 @@@
 +kdeclarative (5.8.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +  * Remove upstream applied patch: kubuntu_fix_epoxy_vs_qopengl.diff
 +  * Update symbols files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 14 Mar 2015 10:25:08 +0100
 +
+ kdeclarative (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:36:18 +0100
+ 
 +kdeclarative (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 06 Mar 2015 22:57:48 +0100
 +
  kdeclarative (5.7.0-0ubuntu3) vivid; urgency=medium
  
    * Refine kubuntu_fix_epoxy_vs_qopengl.diff to prevent Qt from

-- 
kdeclarative packaging



More information about the pkg-kde-commits mailing list