[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.0-rc1-1-17-g34f91cf

Didier Raboud odyx-guest at alioth.debian.org
Fri Oct 15 09:47:12 UTC 2010


The following commit has been merged in the experimental-snapshots branch:
commit 34f91cf44952a39eec05da7934592a0c1754b6d2
Author: Fathi Boudra <fabo at debian.org>
Date:   Wed Jul 14 09:59:59 2010 +0300

    Cherry-pick: Fix qdbus manpage install. It is misplaced. (Closes: #588985)
---
 debian/changelog            |    3 +++
 debian/libqt4-dbus.manpages |    1 +
 debian/libqt4-dev.manpages  |    1 -
 3 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ce452e2..a987a65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,9 @@ qt4-x11 (4:4.7.1-1) UNRELEASED; urgency=low
     - 04_launch_uic-qt4.diff
     - 05_append_qt4_target.diff
 
+  [ Didier Raboud ]
+  * Cherry-pick "Fix qdbus manpage install. It is misplaced." from unstable.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 06 Oct 2010 14:55:15 +0200
 
 qt4-x11 (4:4.7.0~rc1-1) experimental; urgency=low
diff --git a/debian/libqt4-dbus.manpages b/debian/libqt4-dbus.manpages
new file mode 100644
index 0000000..f3ef030
--- /dev/null
+++ b/debian/libqt4-dbus.manpages
@@ -0,0 +1 @@
+debian/manpages/qdbus.1
diff --git a/debian/libqt4-dev.manpages b/debian/libqt4-dev.manpages
index a53c7da..5750068 100644
--- a/debian/libqt4-dev.manpages
+++ b/debian/libqt4-dev.manpages
@@ -1,4 +1,3 @@
 debian/manpages/lrelease-qt4.1
 debian/manpages/lupdate-qt4.1
 debian/manpages/moc-qt4.1
-debian/manpages/qdbus.1

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list