rev 13316 - in branches/qt4-x11/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Mon Jan 12 12:46:21 UTC 2009 

Author: fabo
Date: 2009-01-12 12:46:20 +0000 (Mon, 12 Jan 2009)
New Revision: 13316

Removed:
   branches/qt4-x11/debian/patches/12_fix_qmake_pkgconfig.diff
Modified:
   branches/qt4-x11/debian/changelog
   branches/qt4-x11/debian/control
   branches/qt4-x11/debian/libqt4-assistant.install
   branches/qt4-x11/debian/libqt4-dbg.install
   branches/qt4-x11/debian/libqt4-dbus.install
   branches/qt4-x11/debian/libqt4-designer.install
   branches/qt4-x11/debian/libqt4-help.install
   branches/qt4-x11/debian/libqt4-network.install
   branches/qt4-x11/debian/libqt4-qt3support.install
   branches/qt4-x11/debian/libqt4-sql-ibase.install
   branches/qt4-x11/debian/libqt4-sql-mysql.install
   branches/qt4-x11/debian/libqt4-sql-odbc.install
   branches/qt4-x11/debian/libqt4-sql-psql.install
   branches/qt4-x11/debian/libqt4-sql-sqlite.install
   branches/qt4-x11/debian/libqt4-sql-sqlite2.install
   branches/qt4-x11/debian/libqt4-sql.install
   branches/qt4-x11/debian/libqt4-svg.install
   branches/qt4-x11/debian/libqt4-test.install
   branches/qt4-x11/debian/libqt4-webkit-dbg.install
   branches/qt4-x11/debian/libqt4-webkit.install
   branches/qt4-x11/debian/libqt4-xmlpatterns-dbg.install
   branches/qt4-x11/debian/libqt4-xmlpatterns.install
   branches/qt4-x11/debian/libqtgui4.install
   branches/qt4-x11/debian/patches/series
   branches/qt4-x11/debian/qt4-demos.install
   branches/qt4-x11/debian/qt4-dev-tools.install
   branches/qt4-x11/debian/qt4-doc-html.install
   branches/qt4-x11/debian/qt4-doc.install
   branches/qt4-x11/debian/rules
Log:
 * Clean up the prl postprocessing.
 * Add Debian patches:
   - 18_enable_qt3support_qtwebkit_debug_info.diff
     On Qt >= 4.5, debug info are disabled for Qt3Support and QtWebkit.
     This patch enable them.
 * Remove Debian patches:
   - 12_fix_qmake_pkgconfig.diff

Update TODO list; Remove:
  * The prl postprocessing might not be needed any more.
    Maybe also the pkg-config generation patch to qmake.



Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/changelog	2009-01-12 12:46:20 UTC (rev 13316)
@@ -6,15 +6,21 @@
   * Add libgtk2.0-dev build dependency to enable GTK theme support.
   * Add package libqt4-scripttools: The QtScriptTools module provides
     additional components for applications that use Qt Script.
-  * Add/Remove/Refresh/Update patches.
+  * Clean up the prl postprocessing.
+  * Refresh patches.
+  * Update patches.
+  * Add Debian patches:
+    - 18_enable_qt3support_qtwebkit_debug_info.diff
+      On Qt >= 4.5, debug info are disabled for Qt3Support and QtWebkit.
+      This patch enable them.
+  * Remove Debian patches:
+    - 12_fix_qmake_pkgconfig.diff
 
   +++ TODO:
 
   * Split mkspecs in their own package to be able to use qt4-qmake standalone.
   * Add symbols files support.
   * Enable Qt Eclipse Integration for C++. See debian/rules.
-  * The prl postprocessing might not be needed any more.
-    Maybe also the pkg-config generation patch to qmake.
   * Merge Ubuntu changes ? (IMHO, no)
     - Fix binary-post-install/libqt4-dev:: to install qt.tags to libqt4-dev
     - Add missing depends to libqt4-dev based on Qt build dependencies
@@ -195,7 +201,7 @@
   +++ Changes by Sune Vuorela:
 
   * Fix generic atomic header. (Closes: #475767)
-    This is enough to fix building of kdelibs, but there should be a proper 
+    This is enough to fix building of kdelibs, but there should be a proper
     hppa fix modelled over the other "real" archs.
 
   +++ Changes by Fathi Boudra:
@@ -210,7 +216,7 @@
 
   * Steal 73_from4.4.1_no_AAAA_when_ipv6_disabled.diff patch from 4.4.1
     snapshot, which disables IPv6 DNS queries (AAAA) when IPv6 is disabled on
-    the system. 
+    the system.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 08 Jun 2008 13:17:02 +0300
 
@@ -380,7 +386,7 @@
 
   * Add patch for Explicit template specialization cannot have a storage class
     with gcc-4.3. Specializations of templates cannot explicitly specify
-    a storage class, and have the same storage as the primary template. 
+    a storage class, and have the same storage as the primary template.
 
  -- Fathi Boudra <fabo at debian.org>  Wed, 09 Apr 2008 09:40:00 +0200
 
@@ -893,7 +899,7 @@
 
 qt4-x11 (4.2.1-1) unstable; urgency=high
 
-  * New upstream release    
+  * New upstream release
     - Fixes integer overflow in pixmap handling [CVE-2006-4811]
       (Closes: #394192)
 
@@ -930,7 +936,7 @@
     - No longer includes "CONFIG = ... debug" in the mkspecs/qconfig.pri
       (Closes: #357136)
     - Fixes QFontDialog assert() failures (Closes: #380418)
-    
+
   * debian/control: made libqt4-gui conflict/replace libqt4-designer, to
     ensure that old package is removed (Closes: #380253)
 
@@ -1136,7 +1142,7 @@
   * New upstream release
     - Fixes missing QBitArray operators (Closes: #341658)
     - Fixes qmake problem with including bad build path (Closes: #327359)
-  
+
   * Added the new QTestLib unit testing framework to the libqt4-core
     package
 
@@ -1225,11 +1231,11 @@
     qmake.conf so that qmake generates Makefiles that use the -qt4 tools.
     This way, it can cope with systems that have alternatives set to use
     the -qt3 versions.
-  
+
   * Increased the conflicting Qt3 package versions to <= 3.3.4-7, since
     the Qt3 packages still don't use the alternatives system as needed to
     coexist with Qt4.
-  
+
   * debian/libqt4-core.install: added /usr/lib/qt4/plugins/codecs
 
   * debian/patches/11_launch_assistant-qt4: new patch that modifies the
@@ -1258,7 +1264,7 @@
   * New upstream release
 
   * Install changes-4.0.1 as upstream changelog
-  
+
   * debian/manpages/assistant-qt4.1: new manpage written from scratch
     based on the output of "assistant -help"
 
@@ -1302,7 +1308,7 @@
     plugin (Closes: #321582)
 
   * debian/libqt4-debug.install: added the libqjpeg_debug.so plugin
-  
+
   * debian/rules: don't hardcode the /usr/include/postgresql/8.0 path,
     instead of the output of `pg_config --includedir`, stolen from Qt3
     packages

Modified: branches/qt4-x11/debian/control
===================================================================
--- branches/qt4-x11/debian/control	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/control	2009-01-12 12:46:20 UTC (rev 13316)
@@ -342,11 +342,10 @@
  libqtgui4 (= ${binary:Version}), libqt4-svg (= ${binary:Version}),
  libqt4-webkit (= ${binary:Version}), libqt4-xml (= ${binary:Version}),
  libqt4-sql (= ${binary:Version}), libqt4-script (= ${binary:Version}),
- libqt4-scripttools (= ${binary:Version}),
- libqt4-xmlpatterns (= ${binary:Version}), libqt4-qt3support (= ${binary:Version}),
- libqt4-designer (= ${binary:Version}), libqt4-help (= ${binary:Version}),
- libqt4-assistant (= ${binary:Version}), libqt4-test (= ${binary:Version}),
- qt4-qmake (= ${binary:Version})
+ libqt4-scripttools (= ${binary:Version}), libqt4-xmlpatterns (= ${binary:Version}),
+ libqt4-qt3support (= ${binary:Version}), libqt4-designer (= ${binary:Version}),
+ libqt4-help (= ${binary:Version}), libqt4-assistant (= ${binary:Version}),
+ libqt4-test (= ${binary:Version}), qt4-qmake (= ${binary:Version})
 Recommends: libqt4-opengl-dev (= ${binary:Version})
 Conflicts: qt3-dev-tools (<= 3:3.3.4-7), libqtwebkit-dev
 Replaces: libqtwebkit-dev, libqt4-opengl-dev (<< 4.4.0-2)

Modified: branches/qt4-x11/debian/libqt4-assistant.install
===================================================================
--- branches/qt4-x11/debian/libqt4-assistant.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/libqt4-assistant.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -1,2 +1 @@
 usr/lib/libQtAssistantClient.so.*
-

Modified: branches/qt4-x11/debian/libqt4-dbg.install
===================================================================
--- branches/qt4-x11/debian/libqt4-dbg.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/libqt4-dbg.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -1,7 +1,4 @@
-# Disable for unofficial release like snapshots
-# Note: libQt3Support.so.*.debug are missing.
-#       It's probably a bug. Reported upstream.
-#usr/lib/libQt3Support.so.*.debug
+usr/lib/libQt3Support.so.*.debug
 usr/lib/libQtAssistantClient.so.*.debug
 usr/lib/libQtCLucene.so.*.debug
 usr/lib/libQtCore.so.*.debug
@@ -18,7 +15,6 @@
 usr/lib/libQtSvg.so.*.debug
 usr/lib/libQtTest.so.*.debug
 usr/lib/libQtXml.so.*.debug
-
 usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so.debug
 usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so.debug
 usr/lib/qt4/plugins/codecs/libqcncodecs.so.debug
@@ -36,4 +32,3 @@
 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
-

Modified: branches/qt4-x11/debian/libqt4-dbus.install
===================================================================
--- branches/qt4-x11/debian/libqt4-dbus.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/libqt4-dbus.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -1,3 +1,2 @@
 usr/lib/libQtDBus.so.*
 usr/bin/qdbus
-

Modified: branches/qt4-x11/debian/libqt4-designer.install
===================================================================
--- branches/qt4-x11/debian/libqt4-designer.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/libqt4-designer.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -1,3 +1,2 @@
 usr/lib/libQtDesigner.so.*
 usr/lib/libQtDesignerComponents.so.*
-

Modified: branches/qt4-x11/debian/libqt4-help.install
===================================================================
--- branches/qt4-x11/debian/libqt4-help.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/libqt4-help.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -4,4 +4,3 @@
 # Disable for unofficial release like snapshots
 #usr/share/qt4/translations/qt_help_zh_CN.qm
 #usr/share/qt4/translations/qt_help_zh_TW.qm
-

Modified: branches/qt4-x11/debian/libqt4-network.install
===================================================================
--- branches/qt4-x11/debian/libqt4-network.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/libqt4-network.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -1,2 +1 @@
 usr/lib/libQtNetwork.so.*
-

Modified: branches/qt4-x11/debian/libqt4-qt3support.install
===================================================================
--- branches/qt4-x11/debian/libqt4-qt3support.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/libqt4-qt3support.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -1,4 +1,3 @@
 usr/lib/libQt3Support.so.*
 usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so
 usr/lib/qt4/plugins/designer/libqt3supportwidgets.so
-

Modified: branches/qt4-x11/debian/libqt4-sql-ibase.install
===================================================================
--- branches/qt4-x11/debian/libqt4-sql-ibase.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/libqt4-sql-ibase.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -1,2 +1 @@
 usr/lib/qt4/plugins/sqldrivers/libqsqlibase.so
-

Modified: branches/qt4-x11/debian/libqt4-sql-mysql.install
===================================================================
--- branches/qt4-x11/debian/libqt4-sql-mysql.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/libqt4-sql-mysql.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -1,2 +1 @@
 usr/lib/qt4/plugins/sqldrivers/libqsqlmysql.so
-

Modified: branches/qt4-x11/debian/libqt4-sql-odbc.install
===================================================================
--- branches/qt4-x11/debian/libqt4-sql-odbc.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/libqt4-sql-odbc.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -1,2 +1 @@
 usr/lib/qt4/plugins/sqldrivers/libqsqlodbc.so
-

Modified: branches/qt4-x11/debian/libqt4-sql-psql.install
===================================================================
--- branches/qt4-x11/debian/libqt4-sql-psql.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/libqt4-sql-psql.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -1,2 +1 @@
 usr/lib/qt4/plugins/sqldrivers/libqsqlpsql.so
-

Modified: branches/qt4-x11/debian/libqt4-sql-sqlite.install
===================================================================
--- branches/qt4-x11/debian/libqt4-sql-sqlite.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/libqt4-sql-sqlite.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -1,2 +1 @@
 usr/lib/qt4/plugins/sqldrivers/libqsqlite.so
-

Modified: branches/qt4-x11/debian/libqt4-sql-sqlite2.install
===================================================================
--- branches/qt4-x11/debian/libqt4-sql-sqlite2.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/libqt4-sql-sqlite2.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -1,2 +1 @@
 usr/lib/qt4/plugins/sqldrivers/libqsqlite2.so
-

Modified: branches/qt4-x11/debian/libqt4-sql.install
===================================================================
--- branches/qt4-x11/debian/libqt4-sql.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/libqt4-sql.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -1,2 +1 @@
 usr/lib/libQtSql.so.*
-

Modified: branches/qt4-x11/debian/libqt4-svg.install
===================================================================
--- branches/qt4-x11/debian/libqt4-svg.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/libqt4-svg.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -1,4 +1,3 @@
 usr/lib/libQtSvg.so.*
 usr/lib/qt4/plugins/iconengines/libqsvgicon.so
 usr/lib/qt4/plugins/imageformats/libqsvg.so
-

Modified: branches/qt4-x11/debian/libqt4-test.install
===================================================================
--- branches/qt4-x11/debian/libqt4-test.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/libqt4-test.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -1,2 +1 @@
 usr/lib/libQtTest.so.*
-

Modified: branches/qt4-x11/debian/libqt4-webkit-dbg.install
===================================================================
--- branches/qt4-x11/debian/libqt4-webkit-dbg.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/libqt4-webkit-dbg.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -1,4 +1,2 @@
-# Disable for unofficial release like snapshots
-#usr/lib/libQtWebKit.so.*.debug
+usr/lib/libQtWebKit.so.*.debug
 usr/lib/qt4/plugins/designer/libqwebview.so.debug
-

Modified: branches/qt4-x11/debian/libqt4-webkit.install
===================================================================
--- branches/qt4-x11/debian/libqt4-webkit.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/libqt4-webkit.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -1,3 +1,2 @@
 usr/lib/libQtWebKit.so.*
 usr/lib/qt4/plugins/designer/libqwebview.so
-

Modified: branches/qt4-x11/debian/libqt4-xmlpatterns-dbg.install
===================================================================
--- branches/qt4-x11/debian/libqt4-xmlpatterns-dbg.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/libqt4-xmlpatterns-dbg.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -1,2 +1 @@
 usr/lib/libQtXmlPatterns.so.*.debug
-

Modified: branches/qt4-x11/debian/libqt4-xmlpatterns.install
===================================================================
--- branches/qt4-x11/debian/libqt4-xmlpatterns.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/libqt4-xmlpatterns.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -1,2 +1 @@
 usr/lib/libQtXmlPatterns.so.*
-

Modified: branches/qt4-x11/debian/libqtgui4.install
===================================================================
--- branches/qt4-x11/debian/libqtgui4.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/libqtgui4.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -6,4 +6,3 @@
 usr/lib/qt4/plugins/imageformats/libqmng.so
 usr/lib/qt4/plugins/imageformats/libqtiff.so
 usr/lib/qt4/plugins/inputmethods/libqimsw-multi.so
-

Deleted: branches/qt4-x11/debian/patches/12_fix_qmake_pkgconfig.diff

Modified: branches/qt4-x11/debian/patches/series
===================================================================
--- branches/qt4-x11/debian/patches/series	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/patches/series	2009-01-12 12:46:20 UTC (rev 13316)
@@ -32,11 +32,11 @@
 07_trust_dpkg-arch_over_uname-m.diff
 09_qmake_lflags_as-needed.diff
 10_config_tests_fixes.diff
-#12_fix_qmake_pkgconfig.diff
 14_add_libraries_to_gui_build_where_actually_needed.diff
 15_fix_qmake_makefile_generation.diff
 #16_hide_std_symbols_on_qtwebkit.diff
 17_add_postgresql_8.3_support.diff
+18_enable_qt3support_qtwebkit_debug_info.diff
 #20_mips_atomic_ops.diff
 #30_webkit_unaligned_access.diff
 40_alpha_ice.diff
@@ -46,3 +46,4 @@
 71_hppa_unaligned_access_fix_458133.diff
 80_hurd_max_path.diff
 81_hurd_more_max_path.diff
+

Modified: branches/qt4-x11/debian/qt4-demos.install
===================================================================
--- branches/qt4-x11/debian/qt4-demos.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/qt4-demos.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -6,4 +6,3 @@
 usr/lib/qt4/plugins/designer/libcustomwidgetplugin.so
 usr/lib/qt4/plugins/designer/libtaskmenuextension.so
 usr/lib/qt4/plugins/designer/libworldtimeclockplugin.so
-

Modified: branches/qt4-x11/debian/qt4-dev-tools.install
===================================================================
--- branches/qt4-x11/debian/qt4-dev-tools.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/qt4-dev-tools.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -23,4 +23,3 @@
 usr/share/qt4/translations/linguist_pl.qm
 usr/share/qt4/translations/linguist_zh_CN.qm
 usr/share/qt4/translations/linguist_zh_TW.qm
-

Modified: branches/qt4-x11/debian/qt4-doc-html.install
===================================================================
--- branches/qt4-x11/debian/qt4-doc-html.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/qt4-doc-html.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -1,3 +1,2 @@
 # Disable for unofficial release like snapshots
 #usr/share/qt4/doc/html
-

Modified: branches/qt4-x11/debian/qt4-doc.install
===================================================================
--- branches/qt4-x11/debian/qt4-doc.install	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/qt4-doc.install	2009-01-12 12:46:20 UTC (rev 13316)
@@ -1,4 +1,3 @@
 # Disable for unofficial release like snapshots
 #usr/share/qt4/doc/qch
 usr/share/qt4/doc/src
-

Modified: branches/qt4-x11/debian/rules
===================================================================
--- branches/qt4-x11/debian/rules	2009-01-12 12:20:14 UTC (rev 13315)
+++ branches/qt4-x11/debian/rules	2009-01-12 12:46:20 UTC (rev 13316)
@@ -4,9 +4,11 @@
 export PATH := $(QTDIR)/bin:$(PATH)
 # workaround to use lrelease.
 export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
+# workaround to use qhelpgenerator
+export QT_PLUGIN_PATH := $(QTDIR)/plugins
 
 QTVERSION := $(shell ls changes-* | cut -f2 -d '-')
-CURRENTVERSION := $(shell head -1 debian/changelog  | sed 's/[^(]*(\([^)]*\)).*/\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
@@ -18,6 +20,10 @@
 DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 
+#ifeq (snapshot, $(findstring snapshot, $(CURRENTVERSION)))
+#	DEB_MAKE_BUILD_TARGET += docs
+#endif
+
 # Ensure the *.debug files aren't included in any package other than libqt4-dbg
 DEB_DH_INSTALL_ARGS := --exclude=.debug
 
@@ -33,8 +39,7 @@
 
 DEB_DH_SHLIBDEPS_ARGS_ALL := --exclude=.debug
 
-# Disable for unofficial release like snapshots
-#DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)
+DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)
 
 DEB_INSTALL_DOCS_ALL := GPL_EXCEPTION_ADDENDUM.TXT
 
@@ -130,7 +135,7 @@
 
 clean::
 # Extra stuff missed by confclean/distclean
-	
+
 	# Misc. files
 	rm -f \
 	  config.status \
@@ -139,16 +144,17 @@
 	  mkspecs/qconfig.pri \
 	  src/corelib/global/qconfig.* \
 	;
-	
+
 	# Misc. directories
 	rm -rf \
+	  doc-build/ \
 	  examples/tools/plugandpaint/plugins/ \
 	  examples/tools/styleplugin/styles/ \
 	  lib/ \
 	  mkspecs/glibc-g++/ \
 	  plugins/ \
 	;
-	
+
 	# hppa test directory
 	rm -rf debian/hppa-tmp
 
@@ -166,7 +172,7 @@
 	  -o -name release-static \
 	  -o -name .uic \
 	\) -print0 | xargs -0 rm -rf
-		
+
 	# Leftover files and all symlinks
 	find \( -false \
 	  -o -name \*.a \
@@ -178,14 +184,14 @@
 	  -o -name \*.so.debug \
 	  -o -type l \
 	\) -delete
-	
+
 	# Delete all Makefiles, excluding some from src/3rdparty
 	find $(CURDIR) -name Makefile \
 	  ! -path $(CURDIR)/src/3rdparty/Makefile \
 	  ! -path $(CURDIR)/src/3rdparty/freetype/\* \
 	  ! -path $(CURDIR)/src/3rdparty/zlib/\* \
 	-delete
-	
+
 	# Any remaining executables
 	find $(CURDIR) -type f -exec file -i '{}' \; | grep \
 	  -e application/x-executable \
@@ -201,8 +207,6 @@
 		-exec perl -pi -e "s, -L$(CURDIR)/?\S+,,g" {} \;
 # Fix wrong path in prl files
 	find $(DEB_DESTDIR)/usr/lib -type f -name '*.prl' \
-		-exec perl -pi -e "s, -L$(CURDIR)/\S+,,g" {} \;
-	find $(DEB_DESTDIR)/usr/lib -type f -name '*.prl' \
 		-exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/" {} \;
 
 install/libqtcore4::

More information about the pkg-kde-commits mailing list