summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2014-05-22 01:34:08 -0300
committerLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2014-05-22 01:34:08 -0300
commita5524bee6710f6ca7958da014eb49a7bc888424f (patch)
treee3ba2306895767d12ef5721ccde48af7809f0ed6
parentd82b5fbbc37f8ec5f89d52be21310fbf6fb8e466 (diff)
downloadqtdeclarative-a5524bee6710f6ca7958da014eb49a7bc888424f.tar.gz
Merge the changelogs.
The previous package has been rejected from NEW at my request.
-rw-r--r--debian/changelog17
1 files changed, 6 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index ab5e8f5..4278ff5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,4 @@
-qtdeclarative-opensource-src (5.3.0-2) UNRELEASED; urgency=medium
-
- [ Lisandro Damián Nicanor Pérez Meyer ]
- * 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.
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 22 May 2014 00:43:29 -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.
@@ -31,6 +21,11 @@ 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