[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.12.4-1

Maximiliano Curia maxy at moszumanska.debian.org
Tue Apr 29 14:21:03 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=92ac7c0

The following commit has been merged in the master branch:
commit 92ac7c07db370c28d04fe18700edcd6d9521bd08
Merge: e8d87b8dea95dd3b891c0a76e6c9509903b192f4 d86dc5040575310545e3c0c2ebe725ef661c65ba
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Apr 10 14:28:56 2014 -0300

    Merge branch 'master' into kde4.12
    
    Conflicts:
    	debian/libkde3support4.symbols
    	debian/libkdecore5.symbols
    	debian/libkdeui5.symbols
    	debian/libkfile4.symbols
    	debian/libkhtml5.symbols
    	debian/libkio5.symbols
    	debian/libkjsapi4.symbols
    	debian/libkjsembed4.symbols
    	debian/libkmediaplayer4.symbols
    	debian/libkparts4.symbols
    	debian/libkrossui4.symbols
    	debian/libktexteditor4.symbols
    	debian/libplasma3.symbols
    
    Symbols were kept as they where in 4.12.

 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --cc debian/changelog
index 3c66d2d,b4edc93..6cb4530
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,10 +1,28 @@@
 +kde4libs (4:4.12.3-1) experimental; urgency=medium
 +
 +  * New upstream release.
 +  * Update symbols files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 04 Mar 2014 00:06:06 +0100
 +
 +kde4libs (4:4.12.2-1) experimental; urgency=medium
 +
 +  * New upstream release.
 +  * Confirm symbols.
 +  * Bump Standards-Version to 3.9.5, no changes needed.
 +  * Remove patch: fix_kptyprocesstest.diff
 +  * Refresh patches.
 +  * Update symbols files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 10 Feb 2014 11:32:25 +0100
 +
+ kde4libs (4:4.11.5-3) UNRELEASED; urgency=medium
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Update symbols files with buildd's logs (Closes: #741290).
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 09 Apr 2014 15:05:17 -0300
+ 
  kde4libs (4:4.11.5-2) unstable; urgency=medium
  
    [ Maximiliano Curia ]

-- 
KDE Development Platform Libraries module packaging



More information about the pkg-kde-commits mailing list