* lrelease and lupdate have been moved. fix 05_ patch

* Update *.install files
* Add debian/not-installed
* Avoid calling ./configure repeatedly

Qt 4.4 RC1 should be fully buildable.

7 files changed, 62 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index 923bfb7..6f1f8f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qt4-x11 (4.4.0~rc1-1~pre1) experimental; urgency=low
+qt4-x11 (4.4.0~rc1-1~pre2) experimental; urgency=low
 
   * New upstream release.
 
@@ -23,14 +23,23 @@ qt4-x11 (4.4.0~rc1-1~pre1) experimental; urgency=low
     * 0220-no-x-recursion-in-xerrhandler.diff - adjust offsets.
   * Refresh Debian patches:
     * 02_launch_assistant-qt4.diff - adjust offsets.
-    * 05_append_qt4_target.diff - adopt to upstream changes.
+    * 05_append_qt4_target.diff - adopt to upstream changes. lrelease and
+      lupdate have been moved to tools/linguist/, adjust offsets.
     * 50_kfreebsd_build_fix.diff - adjust offsets.
     * 80_hurd_max_path.diff - adjust offsets.
   * Remove Debian patches:
     * 08_load_ssl.diff - different fix applied upstream.
+  * Update *.install files:
+    * libqt4-script.install: remove libqtscriptdbus.so
+    * qt4-dev-tools.install: a few renames of the language files,
+      s/assistant-qt3/assistant-qt4/, add usr/bin/xmlpatterns
   * Add libqt4-core transitional package.
+  * Add debian/not-installed to document files which are deliberately not
+    installed
+  * Avoid calling ./configure repeatedly during build/install: tie ./configure
+    to config.status
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 03 Apr 2008 21:44:50 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 04 Apr 2008 03:34:39 +0300
 
 qt4-x11 (4.4.0~beta1-1) experimental; urgency=low
 
diff --git a/debian/libqt4-dbg.install b/debian/libqt4-dbg.install
index 06e7517..086f8bc 100644
--- a/debian/libqt4-dbg.install
+++ b/debian/libqt4-dbg.install
@@ -30,6 +30,5 @@ usr/lib/qt4/plugins/imageformats/libqmng.so.debug
 usr/lib/qt4/plugins/imageformats/libqsvg.so.debug
 usr/lib/qt4/plugins/imageformats/libqtiff.so.debug
 usr/lib/qt4/plugins/inputmethods/libqimsw-multi.so.debug
-usr/lib/qt4/plugins/script/libqtscriptdbus.so.debug
 usr/lib/qt4/plugins/sqldrivers/libqsql*.so.debug
 
diff --git a/debian/libqt4-script.install b/debian/libqt4-script.install
index d8c73d1..d0dd84d 100644
--- a/debian/libqt4-script.install
+++ b/debian/libqt4-script.install
@@ -1,3 +1 @@
 usr/lib/libQtScript.so.*
-usr/lib/qt4/plugins/script/libqtscriptdbus.so
-
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..1f5cafe
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,19 @@
+usr/share/qt4/translations/qvfb_pl.qm
+usr/share/qt4/translations/qvfb_zh_TW.qm
+usr/share/qt4/translations/qvfb_zh_CN.qm
+usr/lib/libQtSvg.la
+usr/lib/libQtXml.la
+usr/lib/libQtSql.la
+usr/lib/libQtWebKit.la
+usr/lib/libQtOpenGL.la
+usr/lib/libQtNetwork.la
+usr/lib/libQtGui.la
+usr/lib/libQt3Support.la
+usr/lib/libQtTest.la
+usr/lib/libQtCLucene.la
+usr/lib/libQtScript.la
+usr/lib/libQtXmlPatterns.la
+usr/lib/libQtHelp.la
+usr/lib/libQtCore.la
+usr/lib/libQtDBus.la
+
diff --git a/debian/patches/05_append_qt4_target.diff b/debian/patches/05_append_qt4_target.diff
index aa40398..66e4d5c 100644
--- a/debian/patches/05_append_qt4_target.diff
+++ b/debian/patches/05_append_qt4_target.diff
@@ -135,6 +135,28 @@ author: Fathi Boudra <fabo@debian.org>
  
  depend:
  	makedepend -D__MAKEDEPEND__ $(CPPFLAGS) $(DEPEND_SRC)
+--- a/tools/linguist/lrelease/lrelease.pro
++++ b/tools/linguist/lrelease/lrelease.pro
+@@ -29,7 +29,7 @@
+ SOURCES += $$PROPARSERPATH/proitems.cpp \
+         $$PROPARSERPATH/proreader.cpp
+ 
+-TARGET          = lrelease
++TARGET          = lrelease-qt4
+ INCLUDEPATH     += ../shared
+ DESTDIR         = ../../../bin
+ 
+--- a/tools/linguist/lupdate/lupdate.pro
++++ b/tools/linguist/lupdate/lupdate.pro
+@@ -42,7 +42,7 @@
+         $$PROPARSERPATH/proreader.cpp
+ 
+ 
+-TARGET          = lupdate
++TARGET          = lupdate-qt4
+ INCLUDEPATH     += ../shared
+ DESTDIR          = ../../../bin
+ 
 --- a/src/tools/moc/moc.pro
 +++ b/src/tools/moc/moc.pro
 @@ -1,5 +1,5 @@
diff --git a/debian/qt4-dev-tools.install b/debian/qt4-dev-tools.install
index 26fcc1e..f44fb5a 100644
--- a/debian/qt4-dev-tools.install
+++ b/debian/qt4-dev-tools.install
@@ -6,18 +6,17 @@ usr/bin/assistant_adp
 usr/bin/qcollectiongenerator
 usr/bin/qhelpconverter
 usr/bin/qhelpgenerator
+usr/bin/xmlpatterns
 usr/share/qt4/phrasebooks/*
+usr/share/qt4/translations/assistant_adp_de.qm
+usr/share/qt4/translations/assistant_adp_ja.qm
+usr/share/qt4/translations/assistant_adp_pl.qm
+usr/share/qt4/translations/assistant_adp_zh_CN.qm
+usr/share/qt4/translations/assistant_adp_zh_TW.qm
 usr/share/qt4/translations/assistant_de.qm
-usr/share/qt4/translations/assistant_ja.qm
 usr/share/qt4/translations/assistant_pl.qm
-usr/share/qt4/translations/assistant_zh_CN.qm
-usr/share/qt4/translations/assistant_zh_TW.qm
 usr/share/qt4/translations/linguist_de.qm
 usr/share/qt4/translations/linguist_ja.qm
 usr/share/qt4/translations/linguist_pl.qm
 usr/share/qt4/translations/linguist_zh_CN.qm
 usr/share/qt4/translations/linguist_zh_TW.qm
-# This is a bug. It must be assistant_adp.
-# Reported to Trolltech
-usr/share/qt4/translations/assistant_new_de.qm
-usr/share/qt4/translations/assistant_new_pl.qm
diff --git a/debian/rules b/debian/rules
index 2913c8d..fb02b7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,9 @@ else
         PLATFORM_ARG = glibc-g++
 endif
 
-common-configure-arch::
+common-configure-arch:: config.status
+
+config.status:
 ifeq ($(DEB_HOST_ARCH),hppa)
 	mkdir -p debian/hppa-tmp
 	echo "Testing whether getdents kernel bug is present on this buildd - see #433768"