[SCM] Qt Mobility packaging branch, master, updated. debian/1.0.2-1-10-g9ad64ea

[Fathi Boudra]

The following commit has been merged in the master branch:
commit ce0c5173b67227d1d7d4a78e25391767c562ef6b
Author: Fathi Boudra <fabo at debian.org>
Date:   Wed Mar 9 11:23:58 2011 +0200

    Refresh patches
---
 debian/patches/fix_translations_install_path.patch |   14 +++---
 debian/patches/no_rpath.patch                      |   41 ++++++++++----------
 debian/patches/use_isabspath.patch                 |    6 +-
 3 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/debian/patches/fix_translations_install_path.patch b/debian/patches/fix_translations_install_path.patch
index 7f9bf39..83c1320 100644
--- a/debian/patches/fix_translations_install_path.patch
+++ b/debian/patches/fix_translations_install_path.patch
@@ -3,12 +3,12 @@ Description: install translations in /usr/share/qtmobility/translations/
 Author: Fathi Boudra <fabo at debian.org>
 --- a/translations/translations.pro
 +++ b/translations/translations.pro
-@@ -42,7 +42,7 @@ isEmpty(vcproj) {
-     QMAKE_EXTRA_COMPILERS += phony_src
+@@ -99,7 +99,7 @@ isEmpty(vcproj) {
  }
  
--translations.path = $${QT_MOBILITY_PREFIX}/translations
-+translations.path = $${QT_MOBILITY_PREFIX}/share/qtmobility/translations
- translations.files = $$TRANSLATIONS
- translations.files ~= s,\\.ts$,.qm,g
- translations.files ~= s,^,$$OUT_PWD/,g
+ qmfiles.files = $$prependAll(LANGUAGES, $$OUT_PWD/qtmobility_,.qm)
+-meego|maemo6 {
++meego|maemo6|linux-* {
+     qmfiles.path = $${QT_MOBILITY_PREFIX}/share/qtmobility/translations
+ } else {
+     qmfiles.path = $${QT_MOBILITY_PREFIX}/translations
diff --git a/debian/patches/no_rpath.patch b/debian/patches/no_rpath.patch
index d8007c7..f7d4f2d 100644
--- a/debian/patches/no_rpath.patch
+++ b/debian/patches/no_rpath.patch
@@ -2,15 +2,15 @@ Description: Remove rpath
 Author: Fathi Boudra <fabo at debian.org>
 --- a/common.pri
 +++ b/common.pri
-@@ -114,7 +114,6 @@ contains(build_unit_tests, yes) {
+@@ -115,7 +115,6 @@ contains(build_unit_tests, yes) {
      MOC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/moc
      RCC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/rcc
      UI_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/ui
 -    QMAKE_RPATHDIR += $$QT_MOBILITY_LIB
  } else {
      # Unit test code (no plugins! test plugins are just normal plugins installed elsewhere)
-     QT *= testlib
-@@ -125,7 +124,6 @@ contains(build_unit_tests, yes) {
+     testcase:QT *= testlib
+@@ -126,7 +125,6 @@ contains(build_unit_tests, yes) {
      MOC_DIR = $$OUTPUT_DIR/build/tests/$$SUBDIRPART/$$TARGET/moc
      RCC_DIR = $$OUTPUT_DIR/build/tests/$$SUBDIRPART/$$TARGET/rcc
      UI_DIR = $$OUTPUT_DIR/build/tests/$$SUBDIRPART/$$TARGET/ui
@@ -73,17 +73,6 @@ Author: Fathi Boudra <fabo at debian.org>
  HEADERS = \
      radio.h
    
---- a/examples/videographicsitem/videographicsitem.pro
-+++ b/examples/videographicsitem/videographicsitem.pro
-@@ -7,8 +7,6 @@ include(../examples.pri)
- CONFIG += mobility
- MOBILITY = multimedia
- 
--QMAKE_RPATHDIR += $$DESTDIR
--
- contains(QT_CONFIG, opengl): QT += opengl
- 
- HEADERS   += videoplayer.h \
 --- a/examples/videowidget/videowidget.pro
 +++ b/examples/videowidget/videowidget.pro
 @@ -7,8 +7,6 @@ include(../examples.pri)
@@ -95,22 +84,32 @@ Author: Fathi Boudra <fabo at debian.org>
  HEADERS = \
      videoplayer.h \
      videowidget.h \
+--- a/examples/videographicsitem/videographicsitem.pro
++++ b/examples/videographicsitem/videographicsitem.pro
+@@ -7,7 +7,6 @@ include(../examples.pri)
+ CONFIG += mobility
+ MOBILITY = multimedia
+ 
+-QMAKE_RPATHDIR += $$DESTDIR
+ 
+ !symbian:contains(QT_CONFIG, opengl): QT += opengl
+ 
 --- a/features/basic_examples_setup.pri
 +++ b/features/basic_examples_setup.pri
-@@ -24,7 +24,6 @@ UI_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART
- OBJECTS_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET
- mac:LIBS+= -F$$OUTPUT_DIR/lib
- LIBS+= -L$$OUTPUT_DIR/lib
+@@ -42,7 +42,6 @@ mac:contains(QT_CONFIG,qt_framework) {
+ }
+ QMAKE_LIBDIR = $$OUTPUT_DIR/lib
+ 
 -QMAKE_RPATHDIR+=$$QT_MOBILITY_LIB
  INCLUDEPATH+= $$QT_MOBILITY_SOURCE_TREE/src/global
  
  maemo6 {
 --- a/features/mobility.prf.template
 +++ b/features/mobility.prf.template
-@@ -12,7 +12,6 @@
- mac: LIBS += -F$${MOBILITY_LIB}
+@@ -36,7 +36,6 @@ defineTest(qtMobilityAddLibrary) {
+     LIBS+= -L$${MOBILITY_LIB}
+ }
  
- LIBS+= -L$${MOBILITY_LIB}
 -QMAKE_RPATHDIR+=$${MOBILITY_LIB}
  
  # versit depends on contacts
diff --git a/debian/patches/use_isabspath.patch b/debian/patches/use_isabspath.patch
index d89b0d8..e3b1da5 100644
--- a/debian/patches/use_isabspath.patch
+++ b/debian/patches/use_isabspath.patch
@@ -3,12 +3,12 @@ pathhelper uses abs_path and returns undef for non-existent path.
 Author: Fathi Boudra <fabo at debian.org>
 --- a/configure
 +++ b/configure
-@@ -64,7 +64,7 @@ isAbsPath() {
+@@ -58,7 +58,7 @@ isAbsPath() {
  # maemo we do not want to follow symbolic links that are
  # introduced by scratchbox
  absPath() {
--    if [ "$2" = "maemo5" -o "$2" = "maemo6" ]; then
-+    if [ "$2" = "maemo5" -o "$2" = "maemo6" -o "$2" = "" ]; then
+-    if [ "$2" = "maemo5" -o "$2" = "maemo6" -o "$2" = "meego" ]; then
++    if [ "$2" = "maemo5" -o "$2" = "maemo6" -o "$2" = "meego" -o "$2" = "" ]; then
          if [ `isAbsPath $1` = '1' ]; then
              echo $1;
          else

-- 
Qt Mobility packaging