diff options
| author | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2014-05-22 01:39:38 -0300 |
|---|---|---|
| committer | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2014-05-22 01:39:38 -0300 |
| commit | 4be1df4b7a9c69dd4aab5445ff9ff4234912a351 (patch) | |
| tree | 3f6e4dd65cb25973965d3b292c0766736c102931 | |
| parent | 200511c49acf87493d64af193bee2cee378100d2 (diff) | |
| parent | a5524bee6710f6ca7958da014eb49a7bc888424f (diff) | |
| download | qtdeclarative-4be1df4b7a9c69dd4aab5445ff9ff4234912a351.tar.gz | |
Merge branch 'experimental' of git+ssh://git.debian.org/git/pkg-kde/qt/qtdeclarative into experimental
Conflicts:
debian/changelog
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 6 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index 5992eda..d692c2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,4 @@ -qtdeclarative-opensource-src (5.3.0-2) experimental; urgency=medium - - * 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@debian.org> Thu, 22 May 2014 01:09:47 -0300 - -qtdeclarative-opensource-src (5.3.0-1) experimental; urgency=medium +qtdeclarative-opensource-src (5.3.0-1) UNRELEASED; urgency=medium * New upstream release. * Update symbols files with buildds' and current logs. @@ -30,6 +21,10 @@ qtdeclarative-opensource-src (5.3.0-1) experimental; urgency=medium - 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@debian.org> Thu, 22 May 2014 00:19:44 -0300 diff --git a/debian/control b/debian/control index fae17b1..a679f3c 100644 --- a/debian/control +++ b/debian/control @@ -288,7 +288,7 @@ Architecture: any Multi-Arch: same Section: x11 Pre-Depends: ${misc:Pre-Depends} -Depends: qml-model-qtqml-models2, +Depends: qml-module-qtqml-models2, qml-module-qtquick-dialogs, qml-module-qtquick-localstorage, qml-module-qtquick-particles2, |