[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.2.1-5-36-g016654e

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=4be1df4

The following commit has been merged in the experimental branch:
commit 4be1df4b7a9c69dd4aab5445ff9ff4234912a351
Merge: 200511c49acf87493d64af193bee2cee378100d2 a5524bee6710f6ca7958da014eb49a7bc888424f
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu May 22 01:39:38 2014 -0300

    Merge branch 'experimental' of git+ssh://git.debian.org/git/pkg-kde/qt/qtdeclarative into experimental
    
    Conflicts:
    	debian/changelog

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

diff --cc debian/changelog
index 5992eda,4278ff5..d692c2d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -30,7 -21,12 +21,11 @@@ qtdeclarative-opensource-src (5.3.0-1) 
      - Run mark_private_symbols.sh from debian/rules.
    * Don't override dh_builddeb, xz compression is now the default method.
    * Development packages are now Arch: any and Multi-Arch: same.
+   * qml-model-qtqml-models2 should have been named qml-module-qtqml-models2.
+     Create qml-module-qtqml-models2 and make qml-model-qtqml-models2 a
+     transitional dummy package.
+   * Update debian/copyright.
  
 -
   -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Thu, 22 May 2014 00:19:44 -0300
  
  qtdeclarative-opensource-src (5.2.1-5) unstable; urgency=medium

-- 
qtdeclarative packaging