[SCM] qtdeclarative packaging branch, master, updated. debian/5.0.2-4-17-g20d1743

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 20d1743252804fe7f38a957ee71a029249beca5e
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Jun 19 20:40:03 2013 -0300

    Fix typo.
    
    And fix the mess I did :-(
---
 debian/changelog |   17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8adf684..5d412fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,26 +1,12 @@
 qtdeclarative-opensource-src (5.0.2-5) UNRELEASED; urgency=low
 
-<<<<<<<
-  [ Lisandro Damián Nicanor Pérez Meyer ]
+ [ Lisandro Damián Nicanor Pérez Meyer ]
   * Make every package that ships a binary managed by qtchooser depend on it.
   * Build the documentation shipped with this submodule as a build-indep task:
     - Add the necessary indep build dependencies:
       * qttools5-dev-tools to use qhelpgenerator.
       * libqt5sql5-sqlite to generate qch doc.
     - Build and create packages for qch and HTML doc formats.
-
-  [ Timo Jyrinki ]
-  * Depend on libgl1-mesa-dri from the qtquick2 QML plugin
-    - Not depending may cause crashes due to lack of VBO support
-      (https://bugs.launchpad.net/bugs/1176199)
-=======
-  [ Lisandro Damián Nicanor Pérez Meyer ]
-  * Make every package that ships a binary managed by qtchooser depend on it.
-  * Build the documentation shipped with this submodule as a build-indep task:
-    - Add the necessary indep build dependencies:
-      * qttools5-dev-tools to use qhelpgenerator.
-      * libqt5sql5-sqlite to generate qch doc.
-    - Build and create a packages for qch and HTML doc formats.
   * Update symbols files.
   * Set qtdeclarative5-dbg as M-A same, so it can be coinstalled with other
     archs debugging symbols.
@@ -29,7 +15,6 @@ qtdeclarative-opensource-src (5.0.2-5) UNRELEASED; urgency=low
   * Depend on libgl1-mesa-dri from the qtquick2 QML plugin
     - Not depending may cause crashes due to lack of VBO support
       (https://bugs.launchpad.net/bugs/1176199)
->>>>>>>
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 23 May 2013 21:27:24 -0300
 

-- 
qtdeclarative packaging