[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.0-1-6-gff5bd77

Fathi Boudra fabo at alioth.debian.org
Fri Jan 6 10:21:54 UTC 2012


The following commit has been merged in the experimental branch:
commit ff5bd77f39564a32d0c5cd76a01eabe3a37ce0dd
Merge: 3a8437368fc94f03d171ace20b355746fdf945d3 583392dfa83f54bdf1de7c5f28f4b2ebf3e0e3ff
Author: Fathi Boudra <fabo at debian.org>
Date:   Fri Jan 6 12:20:43 2012 +0200

    Merge commit '583392dfa83f54bdf1de7c5f28f4b2ebf3e0e3ff' into experimental

 debian/changelog |    7 +++++++
 debian/rules     |   14 +++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index b7fd2d1,bff01ad..80e735f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,81 -1,10 +1,88 @@@
 -qt4-x11 (4:4.7.4-2) UNRELEASED; urgency=low
 +qt4-x11 (4:4.8.0-2) UNRELEASED; urgency=low
 +
 +  * Revert debian/compat to 8:
 +    - drop mv-qt4-bin-dbg.sh script.
 +    - drop elfutils build dependency.
 +  * Use multiarch for importsdir:
 +    - update debian/libqt4-declarative-*.install files.
 +    - mark QML plugin packages as Multi-Arch: same.
 +
 + -- Fathi Boudra <fabo at debian.org>  Wed, 04 Jan 2012 22:15:56 +0200
 +
 +qt4-x11 (4:4.8.0-1) experimental; urgency=low
 +
 +  * New upstream release.
 +
 +  [ Fathi Boudra ]
 +  * Drop patches (stolen upstream):
 +    - Fix_builds_with_compilers_without_--with-fpu_neon_as_default.patch
 +    - Update_createwindow_in_qgl_x11egl.patch
 +    - Improve-performance-of-partial-updates-in-raster-win.patch
 +    - Fix_transformIsSimple_in_QGraphicsScene.patch
 +    - Micro-optimization_for_QSpanData.patch
 +    - Some_Optimizations_for_the_gray_raster.patch
 +    - Make_use_of_the_fast_image_paths.patch
 +    - Fixed_bug_in_X11_backend_when_creating_translucent_windows.patch
 +    - Take_Xft.hintstyle_by_default_to_match_the_behavior_of_GTK+.patch
 +    - Fix_fontconfig_usage_in_X11_font_database.patch
 +    - Bug-fix-Allow-QTDIR-to-contain-regex-metacharacters.patch
 +    - armv6_Include_explicitly_IT_instructions.patch
 +    - armv6_Add_support_for_ARMv7_atomic_operations.patch
 +    - s390x_jscore.diff
 +    - blacklist-diginotar-cert.diff
 +    - Remove_QtHelp_dependency_on_QtXml.patch
 +  * Drop openssl_no_ssl2.patch - fixed upstream.
 +  * Add patches:
 +    - qt-multiarch-plugin-path-compat.diff - include legacy pre-multiarch
 +      plugin path.
 +    - fix_ftbfs_format-security.patch - due to debian/compat bump to 9, Qt is
 +      built with -Werror=format-security and trigger an error: format not a
 +      string literal and no format arguments.
 +    - fix_qvfb_build.patch - fix qvfb build on Qt 4.8.0
 +    - QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch
 +    - QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_
 +      gnome-shell.patch
 +    - add_missing_method_for_QBasicAtomicPointer_on_s390.patch
 +  * Update debian/compat: bump to 9 for multiarch.
 +  * Update debian/control:
 +    - mark Qt libraries as Multi-Arch.
 +    - build-depends on firebird-dev package. (Closes: #653378)
 +    - suggests libthai0 to libqtcore4. (Closes: #652712)
 +    - build-depends on elfutils for mv-qt4-bin-dbg.sh script.
 +    - build-depends on libicu-dev package.
 +    - bump debhelper build-dependency to 8.9.13.
 +    - build-depends on dpkg-dev >= 1.16.1.
 +    - bump pkg-kde-tools build-dependency to 0.14.2.
 +    - recommends imagemagick or gifsicle to qmlviewer.
 +  * Update debian/rules:
 +    - add DEB_HOST_MULTIARCH support for libdir/plugindir.
 +    - remove -qt-gif configure option - removed upstream.
 +    - use ts-all target. The ts target has been removed.
 +    - call mv-qt4-bin-dbg.sh to move the binaries in qt4-bin-dbg package.
 +    - replace LDFLAGS by DEB_LDFLAGS_MAINT_APPEND usage.
 +    - add -icu configure option.
 +  * Update debian/*.install files:
 +    - update paths for multiarch.
 +    - headers, translations, qmlplugindump.
 +  * Update debian/*.symbol files.
 +  * Add mv-qt4-bin-dbg.sh script: with debhelper compat 9, dh_strip puts
 +    separated debug symbols in a location based on their build-id. The script
 +    moves the debug files for the binaries in the qt4-bin-dbg package.
 +
 +  [ Pino Toscano ]
 +  * Use the hurd-g++ mkspec when building on Hurd:
 +    - add mkspecs/hurd-g++/qmake.conf in 01_debian_append_qt4_suffix.diff
 +    - update the platform_arg in debian/rules
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 22 Dec 2011 17:50:13 +0200
 +
++qt4-x11 (4:4.7.4-2) unstable; urgency=low
+ 
+   * Update debian/rules: build documentation in dh_auto_install so it is only
+     built when arch-all packages are generated. (Closes: #653427)
+ 
+  -- Fathi Boudra <fabo at debian.org>  Thu, 05 Jan 2012 22:23:02 +0200
+ 
  qt4-x11 (4:4.7.4-1) unstable; urgency=low
  
    * New upstream release.
diff --cc debian/rules
index 177fea6,832b7e7..d09818c
--- a/debian/rules
+++ b/debian/rules
@@@ -155,13 -149,8 +155,8 @@@ endi
  
  override_dh_auto_build:
  	dh_auto_build
- 	# Build documentations
- 	dh_auto_build -Smakefile -- docs
  	# Build translations
 -	dh_auto_build -Smakefile -- ts
 +	dh_auto_build -Smakefile -- -C translations ts-all
- 	# Workaround: It's a known qmake limitation.
- 	# It can't generate install rules for files that don't exist yet like docs.
- 	./config.status
  
  override_dh_auto_clean:
  	[ ! -f Makefile ] || $(MAKE) confclean distclean

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list