Update debian/changelog - synced with Qt 4.5.3-1 upload.

Remove Brian Nelson from uploaders field.
 Thanks for his great work on Qt.
Drop cdbs build dependency.
Rewrite debian/rules, converted to dh usage.

4 files changed, 99 insertions, 129 deletions

diff --git a/debian/changelog b/debian/changelog
index 9daab44..a4ceb69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,22 +4,30 @@ qt4-x11 (4:4.6.0~~tp1+git1336+gc5c58c2-0fabo1) experimental-snapshot; urgency=lo
   * Refresh qt-copy patches: 0180 and 209.
   * Remove qt-copy patches: 0255, 0274, 0280 and 0287.
   * Refresh Debian patches: 01, 05, 09, 11, 16, 18, 19, 30, 40, 41, 50 and 81.
+  * Remove upstream patches:
+    - 0078-Fix-regressions-in-qeventloop-qtimer-and-qsocketnoti - stolen
+      upstream.
   * Remove Debian patches:
     - 14_add_libraries_to_gui_build_where_actually_needed - fixed upstream.
   * Update debian/control:
+    - Remove Brian Nelson from uploaders field.
+      Thanks for his great work on Qt.
+    - Drop cdbs build dependency.
     - Add libasound2-dev build dependency.
     - Add libqt4-multimedia package.
   * Update installed files and related lintian files.
+  * Rewrite debian/rules, converted to dh usage.
 
  -- Fathi Boudra <fabo@debian.org>  Sun, 04 Oct 2009 21:53:47 +0200
 
-qt4-x11 (4:4.5.3-1) UNRELEASED; urgency=low
+qt4-x11 (4:4.5.3-1) unstable; urgency=low
 
   * New upstream release:
     - Fix CVE-2009-2700 - QSSlCertificate  incorrect verification of SSL
       certificate with NUL in subjectAltName. (Closes: #545793)
     - Fix a regresion in Qt 4.5.2 causing a broken clipboard with scim.
       (Closes: #544764, #546282)
+    - Fix phonon wrong #include paths. (Closes: #537304)
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
@@ -34,6 +42,9 @@ qt4-x11 (4:4.5.3-1) UNRELEASED; urgency=low
 
   +++ Changes by Fathi Boudra:
 
+  * Add upstream patches:
+    - 0078-Fix-regressions-in-qeventloop-qtimer-and-qsocketnoti.patch
+      Fix regressions in qeventloop, qtimer, and qsocketnotifier autotests.
   * Add Debian patches:
     - 99_build_translations
       Fix translations build when sources comes from git.
@@ -59,7 +70,7 @@ qt4-x11 (4:4.5.3-1) UNRELEASED; urgency=low
   * Update debian/copyright:
     - Update Nokia Qt url.
     - Update Nokia Qt LGPL Exception from version 1.0 to version 1.1.
-  * Update *.install files and *.lintian files.
+  * Update *.install and *.lintian files.
   * Update debian/rules:
     - Build translations
     - Generate include directory before configure call.
diff --git a/debian/control b/debian/control
index ef78fdb..dc9c493 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: qt4-x11
 Section: libs
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-Uploaders: Brian Nelson <pyro@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Modestas Vainius <modestas@vainius.eu>
-Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-kde-tools (>= 0.4), flex, sharutils,
+Uploaders: Fathi Boudra <fabo@debian.org>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Modestas Vainius <modestas@vainius.eu>, Sune Vuorela <debian@pusling.com>,
+Build-Depends: debhelper (>= 7.2), quilt, pkg-kde-tools (>= 0.4), flex, sharutils,
  firebird2.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 amd64 sparc powerpc],
  libasound2-dev, libaudio-dev, libcups2-dev, libdbus-1-dev, libfreetype6-dev,
  libgl1-mesa-dev | libgl-dev, libglib2.0-dev, libglu1-mesa-dev | libglu-dev,
diff --git a/debian/libqtcore4.install b/debian/libqtcore4.install
index 4f2e53a..904ef71 100644
--- a/debian/libqtcore4.install
+++ b/debian/libqtcore4.install
@@ -2,7 +2,6 @@ usr/lib/libQtCLucene.so.*
 usr/lib/libQtCore.so.*
 usr/lib/qt4/plugins/codecs/*.so
 usr/share/qt4/translations/qt_ar.qm
-usr/share/qt4/translations/qt_ca.qm
 usr/share/qt4/translations/qt_da.qm
 usr/share/qt4/translations/qt_de.qm
 usr/share/qt4/translations/qt_es.qm
diff --git a/debian/rules b/debian/rules
index 1e7cc77..1a81323 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,88 +1,45 @@
 #!/usr/bin/make -f
 
-export DH_VERBOSE=1
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
 export QTDIR := $(shell pwd)
 export PATH := $(QTDIR)/bin:$(PATH)
 # workaround to use lrelease.
 export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
-# workaround to use qhelpgenerator
+# workaround to use qhelpgenerator.
 export QT_PLUGIN_PATH := $(QTDIR)/plugins
 
-# Qt upstream version (e.g.: 4.5.2)
-QTVERSION := $(shell ls changes-* | cut -f2 -d '-')
+pkgs_dbg := $(filter %-dbg,$(shell dh_listpackages))
+pkgs_lib := $(filter-out %-dev %-dbg,$(filter lib%,$(shell dh_listpackages)))
+# Upstream changelog
+upstream_changes := $(wildcard changes-*)
 # Current debian version (e.g.: 4:4.5.2-1)
-CURRENTVERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/utils.mk
-
-DEB_MAKE_INVOKE := $(MAKE)
-DEB_MAKE_BUILD_TARGET := sub-src
-DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-
-# Ensure the *.debug files aren't included in any package other than *-dbg
-DEB_DH_INSTALL_ARGS := --exclude=.debug
-
-DEB_MAKE_CLEAN_TARGET := confclean distclean
-
-# Shlibs of the current upstream version
-#DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+current_version := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 # Specific shlibs version (e.g.: 4:4.5.2)
-SHLIBSVERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | cut -f1 -d '-')
-$(foreach libpkg,$(filter-out %-dev %-dbg,$(filter lib%,$(DEB_ARCH_PACKAGES))),$(eval DEB_DH_MAKESHLIBS_ARGS_$(libpkg) := -V'$(libpkg) (>= $(SHLIBSVERSION))'))
-
-DEB_DH_STRIP_ARGS_libqt4-dbg := --exclude=.debug
-DEB_DH_STRIP_ARGS_libqt4-webkit-dbg := --exclude=.debug
-DEB_DH_STRIP_ARGS_libqt4-xmlpatterns-dbg := --exclude=.debug
-DEB_DH_STRIP_ARGS_phonon-dbg := --exclude=.debug
-DEB_DH_STRIP_ARGS_qt4-demos-dbg := --exclude=.debug
-
-DEB_DH_SHLIBDEPS_ARGS_ALL := --exclude=.debug
-
-# Disable for rc
-#DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)
-
-DEB_INSTALL_DOCS_ALL := LGPL_EXCEPTION.txt
+shlibs_version := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | cut -f1 -d '-')
 
 ibase_architectures := i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(ibase_architectures)))
-	EXTRA_CONFIGURE_OPTS += -plugin-sql-ibase
+	extra_configure_opts += -plugin-sql-ibase
 else
-	EXTRA_CONFIGURE_OPTS += -no-sql-ibase
+	extra_configure_opts += -no-sql-ibase
 endif
 
 ifeq ($(DEB_HOST_ARCH),arm)
-	EXTRA_CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
+	extra_configure_opts += -DQT_QLOCALE_USES_FCVT
 endif
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-        PLATFORM_ARG = linux-g++
+	platform_arg = linux-g++
 else
-        PLATFORM_ARG = glibc-g++
+	platform_arg = glibc-g++
 endif
 
-common-build-arch::  debian/stamp-makefile-build-tools
-
-debian/stamp-makefile-build-tools: debian/stamp-makefile-build
-	$(MAKE) sub-tools
-	# Build documentations
-	$(MAKE) docs
-	# Build translations
-	$(MAKE) ts
-	$(MAKE) qm
-	# Workaround: It's a known qmake limitation.
-	# It can't generate install rules for files that don't exist yet like docs.
-	./config.status
-
-	touch $@
-
-common-configure-arch:: config.status
+%:
+	dh --with quilt $@
 
-config.status:
+override_dh_auto_configure:
 	# Test broken hppa kernel with glibc >= 2.5
 ifeq ($(DEB_HOST_ARCH),hppa)
 	mkdir -p debian/hppa-tmp
@@ -104,7 +61,7 @@ endif
 	cp -a mkspecs/linux-g++ mkspecs/glibc-g++
 
 	# Generate include
-	rm -rf include && QTDIR=. perl bin/syncqt
+	rm -rf include && QTDIR="." perl bin/syncqt
 
 	./configure -confirm-license \
 	            -prefix "/usr" \
@@ -118,7 +75,7 @@ endif
 	            -sysconfdir "/etc/xdg" \
 	            -demosdir "/usr/lib/qt4/demos" \
 	            -examplesdir "/usr/lib/qt4/examples" \
-	            -platform $(PLATFORM_ARG) \
+	            -platform $(platform_arg) \
 	            -opensource \
 	            -fast \
 	            -optimized-qmake \
@@ -146,10 +103,25 @@ endif
 	            -svg \
 	            -webkit \
 	            -xmlpatterns \
-	            $(EXTRA_CONFIGURE_OPTS)
+	            $(extra_configure_opts)
 
-clean::
-# Extra stuff missed by confclean/distclean
+override_dh_auto_build:
+	$(MAKE) sub-src
+	# Build tools
+	$(MAKE) sub-tools
+	# Build documentations
+	$(MAKE) docs
+	# Build translations
+	$(MAKE) ts
+	$(MAKE) qm
+	# 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
+
+	# Extra stuff missed by confclean/distclean
 
 	# Misc. files
 	rm -f \
@@ -217,86 +189,74 @@ clean::
 	rm -f debian/shlibs.local
 	rm -f debian/stamp-makefile-build-tools
 
-common-install-arch::
-# Fix wrong path in pkgconfig files
-	find $(DEB_DESTDIR)/usr/lib/pkgconfig -type f -name '*.pc' \
+override_dh_auto_install:
+	$(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/tmp/
+
+	# Fix wrong path in pkgconfig files
+	find $(CURDIR)/debian/tmp/usr/lib/pkgconfig -type f -name '*.pc' \
 		-exec perl -pi -e "s, -L$(CURDIR)/?\S+,,g" {} \;
-# Fix wrong path in prl files
-	find $(DEB_DESTDIR)/usr/lib -type f -name '*.prl' \
+	# Fix wrong path in prl files
+	find $(CURDIR)/debian/tmp/usr/lib -type f -name '*.prl' \
 		-exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/" {} \;
 
-install/libqtcore4::
-	mkdir -p $(DEB_DESTDIR)/usr/share/qt4/translations
+	mkdir -p debian/libqtcore4/usr/share/qt4/translations
 	$(CURDIR)/bin/lrelease-qt4 debian/translations/qt_ca.ts \
-		-qm $(DEB_DESTDIR)/usr/share/qt4/translations/qt_ca.qm
+		-qm $(CURDIR)/debian/libqtcore4/usr/share/qt4/translations/qt_ca.qm
 
-install/qt4-demos::
-	mkdir -p debian/$(cdbs_curpkg)/usr/lib/qt4/demos/qtdemo
-	uudecode -o debian/$(cdbs_curpkg)/usr/lib/qt4/demos/qtdemo/qtdemo.qhc \
+	mkdir -p debian/qt4-demos/usr/lib/qt4/demos/qtdemo
+	uudecode -o debian/qt4-demos/usr/lib/qt4/demos/qtdemo/qtdemo.qhc \
 		debian/collection/qtdemo.qhc.uu
 
-install/qt4-designer::
 	install -D -p -m0644 debian/desktop/designer-qt4.desktop \
-		debian/$(cdbs_curpkg)/usr/share/applications/designer-qt4.desktop
-	mkdir -p debian/$(cdbs_curpkg)/usr/share/pixmaps
-	uudecode -o debian/$(cdbs_curpkg)/usr/share/pixmaps/designer.png \
+		debian/qt4-designer/usr/share/applications/designer-qt4.desktop
+	mkdir -p debian/qt4-designer/usr/share/pixmaps
+	uudecode -o debian/qt4-designer/usr/share/pixmaps/designer.png \
 		debian/desktop/designer.png.uu
 
-install/qt4-dev-tools::
 	install -D -p -m0644 debian/desktop/assistant-qt4.desktop \
-		debian/$(cdbs_curpkg)/usr/share/applications/assistant-qt4.desktop
+		debian/qt4-dev-tools/usr/share/applications/assistant-qt4.desktop
 	install -D -p -m0644 debian/desktop/linguist-qt4.desktop \
-		debian/$(cdbs_curpkg)/usr/share/applications/linguist-qt4.desktop
-	mkdir -p debian/$(cdbs_curpkg)/usr/share/pixmaps
-	uudecode -o debian/$(cdbs_curpkg)/usr/share/pixmaps/assistant.png \
+		debian/qt4-dev-tools/usr/share/applications/linguist-qt4.desktop
+	mkdir -p debian/qt4-dev-tools/usr/share/pixmaps
+	uudecode -o debian/qt4-dev-tools/usr/share/pixmaps/assistant.png \
 		debian/desktop/assistant.png.uu
-	uudecode -o debian/$(cdbs_curpkg)/usr/share/pixmaps/linguist.png \
+	uudecode -o debian/qt4-dev-tools/usr/share/pixmaps/linguist.png \
 		debian/desktop/linguist.png.uu
 
-install/qt4-qtconfig::
 	install -D -p -m0644 debian/desktop/qt4config.desktop \
-		debian/$(cdbs_curpkg)/usr/share/applications/qt4config.desktop
-	mkdir -p debian/$(cdbs_curpkg)/usr/share/pixmaps
-	uudecode -o debian/$(cdbs_curpkg)/usr/share/pixmaps/qtconfig.png \
+		debian/qt4-qtconfig/usr/share/applications/qt4config.desktop
+	mkdir -p debian/qt4-qtconfig/usr/share/pixmaps
+	uudecode -o debian/qt4-qtconfig/usr/share/pixmaps/qtconfig.png \
 		debian/desktop/qtconfig.png.uu
 
-binary-install/libqt4-dbg::
-# Run dh_install without the default DEB_DH_INSTALL_ARGS to install the *.debug files
-	dh_install -plibqt4-dbg --sourcedir=$(DEB_DH_INSTALL_SOURCEDIR)
-
-binary-install/libqt4-webkit-dbg::
-# Run dh_install without the default DEB_DH_INSTALL_ARGS to install the *.debug files
-	dh_install -plibqt4-webkit-dbg --sourcedir=$(DEB_DH_INSTALL_SOURCEDIR)
+override_dh_install:
+	# Run dh_install without the exclude argument to install the *.debug files
+	$(foreach pkg,$(pkgs_dbg),dh_install -p$(pkg) --sourcedir=debian/tmp;)
+	# Ensure the *.debug files aren't included in any package other than *-dbg
+	dh_install --remaining-packages --sourcedir=debian/tmp --exclude=.debug
 
-binary-install/libqt4-xmlpatterns-dbg::
-# Run dh_install without the default DEB_DH_INSTALL_ARGS to install the *.debug files
-	dh_install -plibqt4-xmlpatterns-dbg --sourcedir=$(DEB_DH_INSTALL_SOURCEDIR)
+override_dh_installdocs:
+	dh_installdocs --all LGPL_EXCEPTION.txt
 
-binary-install/phonon-dbg::
-# Run dh_install without the default DEB_DH_INSTALL_ARGS to install the *.debug files
-	dh_install -pphonon-dbg --sourcedir=$(DEB_DH_INSTALL_SOURCEDIR)
+override_dh_installchangelogs:
+	dh_installchangelogs $(upstream_changes)
 
-binary-install/qt4-demos-dbg::
-# Run dh_install without the default DEB_DH_INSTALL_ARGS to install the *.debug files
-	dh_install -pqt4-demos-dbg --sourcedir=$(DEB_DH_INSTALL_SOURCEDIR)
-
-binary-post-install/libqt4-dev::
-	install -D -p -m0644 doc/html/qt.tags \
-		$(DEB_DESTDIR)/usr/share/qt4/doc/html/qt.tags
-
-binary-strip/libphonon4::
+override_dh_strip:
+	$(foreach pkg,$(pkgs_dbg),dh_strip -p$(pkg) --exclude=.debug;)
+	dh_strip --remaining-packages
 	pkgkde-symbolshelper symbolfile -p libphonon4 -o debian/libphonon4.symbols
 
-# Automatically install lintian overrides, stolen from debian-qt-kde.mk
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-	    install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-	    debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-        fi
-
-# Generate shlibs local files
-$(patsubst %,binary-fixup/%,$(DEB_ALL_PACKAGES)) :: binary-fixup/%: binary-strip/%
-	if test -e debian/$(cdbs_curpkg)/DEBIAN/shlibs ; then \
-		sed 's/>=[^)]*/= $(CURRENTVERSION)/' debian/$(cdbs_curpkg)/DEBIAN/shlibs >> debian/shlibs.local ;\
-	fi
+override_dh_makeshlibs:
+	# Specific shlibs version (e.g.: 4:4.5.2)
+	$(foreach pkg,$(pkgs_lib),dh_makeshlibs -p$(pkg) -V '$(pkg) (>= $(shlibs_version))';)
+	# Generate shlibs local files
+	for pkg in $(pkgs_lib); do \
+		if test -e debian/$${pkg}/DEBIAN/shlibs ; then \
+			sed 's/>=[^)]*/= $(current_version)/' debian/$${pkg}/DEBIAN/shlibs >> debian/shlibs.local ;\
+		fi \
+	done
+
+override_dh_shlibdeps:
+	dh_shlibdeps --exclude=.debug
 
+.PHONY: override_dh_auto_test