[SCM] Qt Mobility packaging branch, master, updated. debian/1.2.0-beta0+git3174-2-7-g3e3acb5

[Fathi Boudra]

The following commit has been merged in the master branch:
commit fbdd9850d7ed6a8ee347b5b3fd175e374bae4802
Author: Fathi Boudra <fabo at debian.org>
Date:   Sun Jun 19 21:07:15 2011 +0300

    Refresh patches
---
 debian/patches/fix_translations_install_path.patch |    4 ++
 debian/patches/no_rpath.patch                      |   37 ++++++++++++++++----
 debian/patches/use_isabspath.patch                 |    4 ++
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/debian/patches/fix_translations_install_path.patch b/debian/patches/fix_translations_install_path.patch
index 83c1320..5550fd5 100644
--- a/debian/patches/fix_translations_install_path.patch
+++ b/debian/patches/fix_translations_install_path.patch
@@ -1,6 +1,10 @@
 Description: install translations in /usr/share/qtmobility/translations/
              instead of /usr/translations/
 Author: Fathi Boudra <fabo at debian.org>
+---
+ translations/translations.pro |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/translations/translations.pro
 +++ b/translations/translations.pro
 @@ -99,7 +99,7 @@ isEmpty(vcproj) {
diff --git a/debian/patches/no_rpath.patch b/debian/patches/no_rpath.patch
index f7d4f2d..022667f 100644
--- a/debian/patches/no_rpath.patch
+++ b/debian/patches/no_rpath.patch
@@ -1,5 +1,19 @@
 Description: Remove rpath
 Author: Fathi Boudra <fabo at debian.org>
+---
+ common.pri                                        |    2 --
+ examples/audiodevices/audiodevices.pro            |    2 --
+ examples/audioinput/audioinput.pro                |    2 --
+ examples/audiooutput/audiooutput.pro              |    2 --
+ examples/audiorecorder/audiorecorder.pro          |    2 --
+ examples/declarative-systeminfo/device/device.pro |    3 ---
+ examples/radio/radio.pro                          |    2 --
+ examples/videographicsitem/videographicsitem.pro  |    1 -
+ examples/videowidget/videowidget.pro              |    2 --
+ features/basic_examples_setup.pri                 |    1 -
+ features/mobility.prf.template                    |    1 -
+ 11 files changed, 20 deletions(-)
+
 --- a/common.pri
 +++ b/common.pri
 @@ -115,7 +115,6 @@ contains(build_unit_tests, yes) {
@@ -20,7 +34,7 @@ Author: Fathi Boudra <fabo at debian.org>
  contains(TEMPLATE,.*lib):DEFINES += QT_SHARED
 --- a/examples/audiodevices/audiodevices.pro
 +++ b/examples/audiodevices/audiodevices.pro
-@@ -7,8 +7,6 @@ include(../examples.pri)
+@@ -7,8 +7,6 @@ include(../mobility_examples.pri)
  CONFIG += mobility
  MOBILITY = multimedia
  
@@ -31,7 +45,7 @@ Author: Fathi Boudra <fabo at debian.org>
  SOURCES       = audiodevices.cpp \
 --- a/examples/audioinput/audioinput.pro
 +++ b/examples/audioinput/audioinput.pro
-@@ -7,8 +7,6 @@ include(../examples.pri)
+@@ -7,8 +7,6 @@ include(../mobility_examples.pri)
  CONFIG += mobility
  MOBILITY = multimedia
  
@@ -42,7 +56,7 @@ Author: Fathi Boudra <fabo at debian.org>
  SOURCES       = audioinput.cpp \
 --- a/examples/audiooutput/audiooutput.pro
 +++ b/examples/audiooutput/audiooutput.pro
-@@ -7,8 +7,6 @@ include(../examples.pri)
+@@ -7,8 +7,6 @@ include(../mobility_examples.pri)
  CONFIG += mobility
  MOBILITY = multimedia
  
@@ -53,7 +67,7 @@ Author: Fathi Boudra <fabo at debian.org>
  SOURCES       = audiooutput.cpp \
 --- a/examples/audiorecorder/audiorecorder.pro
 +++ b/examples/audiorecorder/audiorecorder.pro
-@@ -7,8 +7,6 @@ include(../examples.pri)
+@@ -7,8 +7,6 @@ include(../mobility_examples.pri)
  CONFIG += mobility
  MOBILITY = multimedia
  
@@ -64,7 +78,7 @@ Author: Fathi Boudra <fabo at debian.org>
    
 --- a/examples/radio/radio.pro
 +++ b/examples/radio/radio.pro
-@@ -7,8 +7,6 @@ include(../examples.pri)
+@@ -7,8 +7,6 @@ include(../mobility_examples.pri)
  CONFIG += mobility
  MOBILITY = multimedia
  
@@ -75,7 +89,7 @@ Author: Fathi Boudra <fabo at debian.org>
    
 --- a/examples/videowidget/videowidget.pro
 +++ b/examples/videowidget/videowidget.pro
-@@ -7,8 +7,6 @@ include(../examples.pri)
+@@ -7,8 +7,6 @@ include(../mobility_examples.pri)
  CONFIG += mobility
  MOBILITY = multimedia
  
@@ -86,7 +100,7 @@ Author: Fathi Boudra <fabo at debian.org>
      videowidget.h \
 --- a/examples/videographicsitem/videographicsitem.pro
 +++ b/examples/videographicsitem/videographicsitem.pro
-@@ -7,7 +7,6 @@ include(../examples.pri)
+@@ -7,7 +7,6 @@ include(../mobility_examples.pri)
  CONFIG += mobility
  MOBILITY = multimedia
  
@@ -114,3 +128,12 @@ Author: Fathi Boudra <fabo at debian.org>
  
  # versit depends on contacts
  contains(MOBILITY, versit) {
+--- a/examples/declarative-systeminfo/device/device.pro
++++ b/examples/declarative-systeminfo/device/device.pro
+@@ -17,6 +17,3 @@ symbian {
+ }
+ RESOURCES += device.qrc
+ 
+-QMAKE_LFLAGS_DEBUG += "-Wl,-rpath,/home/user/qt/lib"
+-QMAKE_LFLAGS_RPATH += "-Wl,-rpath,/home/user/qt/lib"
+-QMAKE_LFLAGS_RELEASE += "-Wl,-rpath,/home/user/qt/lib"
diff --git a/debian/patches/use_isabspath.patch b/debian/patches/use_isabspath.patch
index e3b1da5..bb8b8a7 100644
--- a/debian/patches/use_isabspath.patch
+++ b/debian/patches/use_isabspath.patch
@@ -1,6 +1,10 @@
 Description: use isAbsPath() for Debian instead of pathhelper.
 pathhelper uses abs_path and returns undef for non-existent path.
 Author: Fathi Boudra <fabo at debian.org>
+---
+ configure |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/configure
 +++ b/configure
 @@ -58,7 +58,7 @@ isAbsPath() {

-- 
Qt Mobility packaging