[SCM] Qt Assistant compatibility version packaging branch, master, updated. debian/4.6.3-3-7-gab696cb

[Fathi Boudra]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt-assistant-compat.git;a=commitdiff;h=ab696cb

The following commit has been merged in the master branch:
commit ab696cb169827e139e631ad9661cf2a3fee1fcf2
Author: Fathi Boudra <fathi.boudra at linaro.org>
Date:   Wed May 2 11:08:51 2012 +0300

    Upload to Sid.
---
 debian/changelog |    7 ++++---
 debian/control   |    8 ++++----
 debian/copyright |    4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6ef39dd..2275017 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qt-assistant-compat (4.6.3-4) UNRELEASED; urgency=low
+qt-assistant-compat (4.6.3-4) unstable; urgency=low
 
   [ Felix Geyer ]
   * Use dh_auto_* instead of calling (q)make directly for the library.
@@ -7,9 +7,10 @@ qt-assistant-compat (4.6.3-4) UNRELEASED; urgency=low
   * Append -Wl,--as-needed to LDFLAGS.
   * Remove lib/lib/ when cleaning the package.
   * Convert for multiarch.
-    - Build-depend on libqt4-dev 4:4.8.0.
+    - build-depend on libqt4-dev 4:4.8.1.
+    - update install paths.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 09 Mar 2012 11:32:59 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 02 May 2012 11:08:59 +0300
 
 qt-assistant-compat (4.6.3-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f6162a5..775a7de 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: qt-assistant-compat
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Modestas Vainius <modax at debian.org>
-Build-Depends: debhelper (>= 9), libqt4-dev (>= 4:4.8.0~), pkg-kde-tools (>= 0.6)
+Build-Depends: debhelper (>= 9), libqt4-dev (>= 4:4.8.1), pkg-kde-tools (>= 0.6)
 Standards-Version: 3.9.3
 Section: devel
 Homepage: http://doc.qt.nokia.com/4.6/qassistantclient.html
@@ -11,7 +11,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-kde/qt/qt-assistant-compat.git;a=summa
 
 Package: qt-assistant-compat
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: qt4-dev-tools (<< 4:4.7.0~)
 Replaces: qt4-dev-tools (<< 4:4.7.0~)
 Description: Qt Assistant compatibility binary (legacy)
@@ -28,7 +28,7 @@ Description: Qt Assistant compatibility binary (legacy)
 Package: libqtassistantclient-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libqtassistantclient4 (= ${binary:Version})
+Depends: libqtassistantclient4 (= ${binary:Version}), ${misc:Depends}
 Breaks: libqt4-dev (<< 4:4.7.0~), qt4-qmake (<< 4:4.7.0~)
 Replaces: libqt4-dev (<< 4:4.7.0~), qt4-qmake (<< 4:4.7.0~)
 Description: Qt Assistant client library (development)
@@ -49,7 +49,7 @@ Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-assistant (<< 4:4.7.0~)
 Replaces: libqt4-assistant (<< 4:4.7.0~)
 Description: Qt Assistant client library (runtime)
diff --git a/debian/copyright b/debian/copyright
index 37593ac..8ecfdf2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -54,7 +54,7 @@ As an additional permission to the GNU Lesser General Public License version
 2.1, the object code form of a "work that uses the Library" may incorporate
 material from a header file that is part of the Library.  You may distribute
 such object code under terms of your choice, provided that:
-    (i)   the header files of the Library have not been modified; and 
+    (i)   the header files of the Library have not been modified; and
     (ii)  the incorporated material is limited to numerical parameters, data
           structure layouts, accessors, macros, inline functions and
           templates; and
@@ -73,6 +73,6 @@ modified version of the Library.
 
 The Debian packaging is:
 
-    Copyright (C) 2010 Fathi Boudra <fabo at debian.org>
+    Copyright (C) 2010-2012 Fathi Boudra <fabo at debian.org>
 
 and is licensed under the LGPL version 2.1, see above.

-- 
Qt Assistant compatibility version packaging