diff -Nru ibus-qt-1.3.2/debian/changelog ibus-qt-1.3.2/debian/changelog --- ibus-qt-1.3.2/debian/changelog 2014-02-07 12:53:57.000000000 +0000 +++ ibus-qt-1.3.2/debian/changelog 2014-02-08 06:57:11.000000000 +0000 @@ -1,13 +1,9 @@ -ibus-qt (1.3.2-1ubuntu1) trusty; urgency=low +ibus-qt (1.3.2-2) unstable; urgency=medium - * Merge from Debian unstable. (LP: #1277273) Remaining changes: - - debian/rules: Set -DCMAKE_CXX_FLAGS="-DQT_NO_DEBUG_OUTPUT - -DQT_NO_WARNING_OUTPUT" to stop annoying debug output for - every application. - * debian/patches/upstream_DISPLAY_crash_fix.diff: - - Dropped, fixed upstream. + * Remove recommends: qt4-qtconfig. Closes: #611190 + * Quiet Qt via DEB_CFLAGS_MAINT_APPEND. Closes: #738136 - -- Artur Rona Thu, 06 Feb 2014 23:26:42 +0100 + -- Osamu Aoki Sat, 01 Feb 2014 02:35:34 +0900 ibus-qt (1.3.2-1) unstable; urgency=medium @@ -36,34 +32,6 @@ -- Osamu Aoki Wed, 11 Sep 2013 23:37:11 +0900 -ibus-qt (1.3.1-2.1ubuntu4) trusty; urgency=medium - - * No change rebuild against libicu52 - - -- Dimitri John Ledkov Fri, 27 Dec 2013 04:20:05 +0000 - -ibus-qt (1.3.1-2.1ubuntu3) saucy; urgency=low - - * Add upstream_DISPLAY_crash_fix.diff preventing a crash when -display - was passed but no DISPLAY environment variable is actually defined - (LP: #927167) - - -- Harald Sitter Wed, 25 Sep 2013 11:58:46 +0200 - -ibus-qt (1.3.1-2.1ubuntu2) saucy; urgency=low - - * No-change rebuild against ibus 1.5 - - -- Jeremy Bicha Sun, 28 Jul 2013 21:46:42 -0400 - -ibus-qt (1.3.1-2.1ubuntu1) quantal; urgency=low - - * Resynchronise with Debian. Remaining changes: - - Set -DCMAKE_CXX_FLAGS="-DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT" to - stop annoying debug output for every application. - - -- Colin Watson Mon, 28 May 2012 10:08:40 +0100 - ibus-qt (1.3.1-2.1) unstable; urgency=low * Non-maintainer upload. @@ -72,22 +40,6 @@ -- Scott Kitterman Tue, 15 May 2012 02:44:44 -0400 -ibus-qt (1.3.1-2ubuntu2) precise; urgency=low - - * Rebuild for libicu48. - - -- Colin Watson Mon, 21 Nov 2011 16:07:41 +0000 - -ibus-qt (1.3.1-2ubuntu1) precise; urgency=low - - * Resynchronise with Debian. Remaining changes: - - Set -DCMAKE_CXX_FLAGS="-DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT" to - stop annoying debug output for every application. - - Fix FTBFS due to multi-arch by adjusting install path in - debian/ibus-qt4.install. - - -- Colin Watson Tue, 18 Oct 2011 18:40:32 +0100 - ibus-qt (1.3.1-2) unstable; urgency=low * Fix "FTBFS: FTBFS on latest unstable." @@ -99,32 +51,6 @@ -- Asias He Mon, 05 Sep 2011 09:23:12 +0800 -ibus-qt (1.3.1-1ubuntu3) oneiric; urgency=low - - * Depend/build-depend on libibus-1.0-dev rather than libibus-dev. - - -- Colin Watson Tue, 23 Aug 2011 12:15:44 +0100 - -ibus-qt (1.3.1-1ubuntu2) oneiric; urgency=low - - * Fix FTBFS due to multi-arch by adjusting install path in - debian/ibus-qt4.install (LP: #829459) - - -- Scott Kitterman Sat, 20 Aug 2011 10:32:59 -0400 - -ibus-qt (1.3.1-1ubuntu1) natty; urgency=low - - * Set -DCMAKE_CXX_FLAGS="-DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT" - to stop annoying debug output for every application - - -- Jonathan Riddell Mon, 14 Feb 2011 13:51:10 +0000 - -ibus-qt (1.3.1-1build1) natty; urgency=low - - * No-change rebuild against current libicu44. - - -- Martin Pitt Sun, 12 Dec 2010 20:51:24 +0100 - ibus-qt (1.3.1-1) unstable; urgency=low [ Asias He ] diff -Nru ibus-qt-1.3.2/debian/control ibus-qt-1.3.2/debian/control --- ibus-qt-1.3.2/debian/control 2014-02-07 12:53:57.000000000 +0000 +++ ibus-qt-1.3.2/debian/control 2014-02-08 06:56:44.000000000 +0000 @@ -1,8 +1,7 @@ Source: ibus-qt Section: utils Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: IME Packaging Team +Maintainer: IME Packaging Team Uploaders: LI Daobing , Asias He , Osamu Aoki @@ -23,7 +22,6 @@ Package: ibus-qt4 Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} -Recommends: qt4-qtconfig Description: qt-immodule for ibus (QT4) (plugin) IBus is an Intelligent Input Bus. It is a new input framework for Linux OS. It provides full featured and user friendly input method user interface. diff -Nru ibus-qt-1.3.2/debian/rules ibus-qt-1.3.2/debian/rules --- ibus-qt-1.3.2/debian/rules 2014-02-07 12:53:57.000000000 +0000 +++ ibus-qt-1.3.2/debian/rules 2014-02-08 06:57:11.000000000 +0000 @@ -4,7 +4,7 @@ #export DEB_BUILD_MAINT_OPTIONS = hardening=+all # see ENVIRONMENT in dpkg-buildflags(1) # package maintainers to append CFLAGS -export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT # package maintainers to append LDFLAGS export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed @@ -14,8 +14,7 @@ dh $@ override_dh_auto_configure: - cmake \ - -DCMAKE_CXX_FLAGS="-DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT" \ + dh_auto_configure -- \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)