[SCM] Qt 4 Debian packaging. branch, master, updated. debian/4.5.2-2-11-g36470aa

Fathi Boudra fabo at alioth.debian.org
Fri Oct 2 17:28:28 UTC 2009


The following commit has been merged in the master branch:
commit 36470aae4a8707e15ca40b108a23b48f66cdf74b
Author: Fathi Boudra <fabo at debian.org>
Date:   Fri Oct 2 19:27:38 2009 +0200

    Add 11_build_translations to fix build failure inside autobuilders.
---
 debian/changelog                          |    5 +-
 debian/patches/11_build_translations.diff |  167 +++++++++++++++++++++++++++++
 debian/patches/series                     |    1 +
 3 files changed, 172 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c06a7d..26bc9a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ qt4-x11 (4:4.5.3-1) UNRELEASED; urgency=low
 
   +++ Changes by Fathi Boudra:
 
+  * Add Debian patches:
+    - 99_build_translations
+      Fix translations build when sources comes from git.
   * Add qt-coy patches:
     - 0288-more-x-keycodes.diff
       Fill gap of X.org/XFree multimedia/special/launcher keys. Qt up to 4.5.x
@@ -57,7 +60,7 @@ qt4-x11 (4:4.5.2-2) unstable; urgency=low
   +++ Changes by Sune Vuorela:
 
   * Add qt4-dev-tools to -demo recommends just like qt4-doc to make it possible
-    to actually use the documentation from the demo application. 
+    to actually use the documentation from the demo application.
     (Closes: #536558)
 
   +++ Changes by Modestas Vainius:
diff --git a/debian/patches/11_build_translations.diff b/debian/patches/11_build_translations.diff
new file mode 100644
index 0000000..f968b08
--- /dev/null
+++ b/debian/patches/11_build_translations.diff
@@ -0,0 +1,167 @@
+author: Fathi Boudra <fabo at debian.org>
+
+translations fails to build under autobuilders.
+Use case: Qt sources comes from git and we need to build them.
+
+--- a/tools/assistant/translations/qt_help.pro
++++ b/tools/assistant/translations/qt_help.pro
+@@ -39,12 +39,12 @@ HEADERS += ../lib/qhelpcollectionhandler
+            ../lib/qhelp_global.h
+ 
+ 
+-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qt_help_de.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/qt_help_ja.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/qt_help_pl.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/qt_help_ru.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/qt_help_untranslated.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/qt_help_zh_CN.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/qt_help_zh_TW.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/qt_help_da.ts
++TRANSLATIONS=../../../translations/qt_help_de.ts \
++             ../../../translations/qt_help_ja.ts \
++             ../../../translations/qt_help_pl.ts \
++             ../../../translations/qt_help_ru.ts \
++             ../../../translations/qt_help_untranslated.ts \
++             ../../../translations/qt_help_zh_CN.ts \
++             ../../../translations/qt_help_zh_TW.ts \
++             ../../../translations/qt_help_da.ts
+ error("This is a dummy profile to be used for translations ONLY.")
+--- a/tools/assistant/translations/translations.pro
++++ b/tools/assistant/translations/translations.pro
+@@ -40,11 +40,11 @@ HEADERS += ../tools/assistant/aboutdialo
+            ../tools/assistant/searchwidget.h \
+            ../tools/assistant/topicchooser.h \
+ 
+-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/assistant_de.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/assistant_ja.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/assistant_pl.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/assistant_ru.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/assistant_untranslated.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/assistant_zh_CN.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/assistant_zh_TW.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/assistant_da.ts
++TRANSLATIONS=../../../translations/assistant_de.ts \
++             ../../../translations/assistant_ja.ts \
++             ../../../translations/assistant_pl.ts \
++             ../../../translations/assistant_ru.ts \
++             ../../../translations/assistant_untranslated.ts \
++             ../../../translations/assistant_zh_CN.ts \
++             ../../../translations/assistant_zh_TW.ts \
++             ../../../translations/assistant_da.ts
+--- a/tools/assistant/translations/translations_adp.pro
++++ b/tools/assistant/translations/translations_adp.pro
+@@ -31,11 +31,11 @@ HEADERS += ../compat/helpwindow.h \
+            ../compat/fontsettingsdialog.h
+ 
+ 
+-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/assistant_adp_de.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_ja.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_pl.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_ru.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_untranslated.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_zh_CN.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_zh_TW.ts
++TRANSLATIONS=../../../translations/assistant_adp_de.ts \
++             ../../../translations/assistant_adp_ja.ts \
++             ../../../translations/assistant_adp_pl.ts \
++             ../../../translations/assistant_adp_ru.ts \
++             ../../../translations/assistant_adp_untranslated.ts \
++             ../../../translations/assistant_adp_zh_CN.ts \
++             ../../../translations/assistant_adp_zh_TW.ts
+ error("This is a dummy profile to be used for translations ONLY.")
+--- a/tools/designer/translations/translations.pro
++++ b/tools/designer/translations/translations.pro
+@@ -130,10 +130,10 @@ HEADERS += ../../shared/findwidget/abstr
+            ../../shared/findwidget/itemviewfindwidget.h \
+            ../../shared/findwidget/texteditfindwidget.h
+ 
+-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/designer_de.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/designer_ja.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/designer_pl.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/designer_zh_CN.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/designer_zh_TW.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/designer_untranslated.ts
++TRANSLATIONS=../../../translations/designer_de.ts \
++             ../../../translations/designer_ja.ts \
++             ../../../translations/designer_pl.ts \
++             ../../../translations/designer_zh_CN.ts \
++             ../../../translations/designer_zh_TW.ts \
++             ../../../translations/designer_untranslated.ts
+ 
+--- a/tools/linguist/linguist/linguist.pro
++++ b/tools/linguist/linguist/linguist.pro
+@@ -98,11 +98,11 @@ FORMS += statistics.ui \
+     finddialog.ui
+ RESOURCES += linguist.qrc
+ 
+-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/linguist_ja.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/linguist_pl.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/linguist_ru.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/linguist_untranslated.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/linguist_zh_CN.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/linguist_zh_TW.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/linguist_de.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/linguist_fr.ts
++TRANSLATIONS=../../../translations/linguist_ja.ts \
++             ../../../translations/linguist_pl.ts \
++             ../../../translations/linguist_ru.ts \
++             ../../../translations/linguist_untranslated.ts \
++             ../../../translations/linguist_zh_CN.ts \
++             ../../../translations/linguist_zh_TW.ts \
++             ../../../translations/linguist_de.ts \
++             ../../../translations/linguist_fr.ts
+--- a/tools/qtconfig/translations/translations.pro
++++ b/tools/qtconfig/translations/translations.pro
+@@ -7,8 +7,8 @@ HEADERS        += ../colorbutton.h ../pr
+ 
+ FORMS        = ../mainwindowbase.ui ../paletteeditoradvancedbase.ui ../previewwidgetbase.ui
+ 
+-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qtconfig_pl.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/qtconfig_ru.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/qtconfig_untranslated.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/qtconfig_zh_CN.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/qtconfig_zh_TW.ts
++TRANSLATIONS=../../../translations/qtconfig_pl.ts \
++             ../../../translations/qtconfig_ru.ts \
++             ../../../translations/qtconfig_untranslated.ts \
++             ../../../translations/qtconfig_zh_CN.ts \
++             ../../../translations/qtconfig_zh_TW.ts
+--- a/tools/qvfb/translations/translations.pro
++++ b/tools/qvfb/translations/translations.pro
+@@ -26,8 +26,8 @@ SOURCES =  ../qvfb.cpp \
+            ../qwssignalhandler.cpp \
+            ../../shared/deviceskin/deviceskin.cpp
+ 
+-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qvfb_pl.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/qvfb_ru.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/qvfb_untranslated.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/qvfb_zh_CN.ts \
+-             $$[QT_INSTALL_TRANSLATIONS]/qvfb_zh_TW.ts
++TRANSLATIONS=../../../translations/qvfb_pl.ts \
++             ../../../translations/qvfb_ru.ts \
++             ../../../translations/qvfb_untranslated.ts \
++             ../../../translations/qvfb_zh_CN.ts \
++             ../../../translations/qvfb_zh_TW.ts
+--- a/translations/translations.pri
++++ b/translations/translations.pri
+@@ -39,10 +39,10 @@ ts-qt.commands = (cd $$QT_SOURCE_TREE/sr
+                                     svg \
+                                     xml \
+                                     xmlpatterns \
+-                                -ts $$prependAll($$[QT_INSTALL_TRANSLATIONS]/qt_,$$QT_TS,.ts))
++                                -ts $$prependAll($$QT_SOURCE_TREE/translations/qt_,$$QT_TS,.ts))
+ ts-qt.depends = sub-tools
+ 
+-qm-qt.commands = $$LRELEASE $$prependAll($$[QT_INSTALL_TRANSLATIONS]/qt_,$$QT_TS,.ts)
++qm-qt.commands = $$LRELEASE $$prependAll($$QT_SOURCE_TREE/translations/qt_,$$QT_TS,.ts)
+ qm-qt.depends = sub-tools
+ 
+ ###### Designer
+--- a/tools/assistant/compat/translations/translations.pro
++++ b/tools/assistant/compat/translations/translations.pro
+@@ -31,4 +31,4 @@ HEADERS += ../helpwindow.h \
+            ../fontsettingsdialog.h
+ 
+ 
+-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/assistant_de.ts $$[QT_INSTALL_TRANSLATIONS]/assistant_untranslated.ts
++TRANSLATIONS=$$QT_SOURCE_TREE/translations/assistant_de.ts $$QT_SOURCE_TREE/translations/assistant_untranslated.ts
diff --git a/debian/patches/series b/debian/patches/series
index c376f33..9dcca04 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,6 +20,7 @@
 07_trust_dpkg-arch_over_uname-m.diff
 09_qmake_lflags_as-needed.diff
 10_config_tests_fixes.diff
+11_build_translations.diff
 14_add_libraries_to_gui_build_where_actually_needed.diff
 15_fix_qmake_makefile_generation.diff
 16_hide_std_symbols_on_qtwebkit.diff

-- 
Qt 4 Debian packaging.



More information about the pkg-kde-commits mailing list