[SCM] Qt 4 packaging branch, master, updated. debian/4.8.1-1-12-g45c2825

Pino Toscano pino at alioth.debian.org
Mon May 28 13:29:09 UTC 2012


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=9458dc6

The following commit has been merged in the master branch:
commit 9458dc6f37a721e0dca34bded93fe3aa9e75fc63
Author: Pino Toscano <pino at debian.org>
Date:   Mon May 28 15:26:34 2012 +0200

    fix a hypen-as-minus issue in moc-qt4 man page
---
 debian/changelog          |    1 +
 debian/manpages/moc-qt4.1 |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 989720d..2784e20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ qt4-x11 (4:4.8.1-2) UNRELEASED; urgency=low
     libqt4-script-dbg, libqt4-xmlpatterns-dbg, qt4-bin-dbg, and qt4-demos-dbg.
   * Override the two lintian warnings for dbg-package-missing-depends, since
     they are false positives.
+  * Fix a hypen-as-minus issue in moc-qt4 man page.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 03 May 2012 21:58:22 +0200
 
diff --git a/debian/manpages/moc-qt4.1 b/debian/manpages/moc-qt4.1
index 85555bb..9bcd6c0 100644
--- a/debian/manpages/moc-qt4.1
+++ b/debian/manpages/moc-qt4.1
@@ -170,7 +170,7 @@ a makefile rule like this:
 NAME.o: mNAME.cpp
 
 mNAME.cpp: NAME.cpp
-        moc -i $< \-o $@
+        moc \-i $< \-o $@
 .fi
 .in -4
 .PP

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list