← Back to branch summary

~ubuntu-branches/ubuntu/quantal/qtmobility/quantal

« back to all changes in this revision

Viewing changes to debian/patches/no_rpath.patch

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-11-16 16:18:07 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20101116161807-k2dzt2nyse975r3l
Tags: 1.1.0-0ubuntu1
* New upstream release
* Syncronise with Debian, no remaining changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/no_rpath.patch
1
1
Description: Remove rpath
2
2
Author: Fathi Boudra <fabo@debian.org>
3
 
--- a/common.pri
4
 
+++ b/common.pri
5
 
@@ -114,7 +114,6 @@ contains(build_unit_tests, yes) {
 
3
Index: qt-mobility-opensource-src-1.1.0/common.pri
 
4
===================================================================
 
5
--- qt-mobility-opensource-src-1.1.0.orig/common.pri    2010-11-01 06:36:11.000000000 +0000
 
6
+++ qt-mobility-opensource-src-1.1.0/common.pri 2010-11-16 16:23:35.131286420 +0000
 
7
@@ -114,7 +114,6 @@
6
8
     MOC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/moc
7
9
     RCC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/rcc
8
10
     UI_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/ui
10
12
 } else {
11
13
     # Unit test code (no plugins! test plugins are just normal plugins installed elsewhere)
12
14
     QT *= testlib
13
 
@@ -125,7 +124,6 @@ contains(build_unit_tests, yes) {
 
15
@@ -125,7 +124,6 @@
14
16
     MOC_DIR = $$OUTPUT_DIR/build/tests/$$SUBDIRPART/$$TARGET/moc
15
17
     RCC_DIR = $$OUTPUT_DIR/build/tests/$$SUBDIRPART/$$TARGET/rcc
16
18
     UI_DIR = $$OUTPUT_DIR/build/tests/$$SUBDIRPART/$$TARGET/ui
18
20
 }
19
21
 
20
22
 contains(TEMPLATE,.*lib):DEFINES += QT_SHARED
21
 
--- a/examples/audiodevices/audiodevices.pro
22
 
+++ b/examples/audiodevices/audiodevices.pro
23
 
@@ -7,8 +7,6 @@ include(../examples.pri)
 
23
Index: qt-mobility-opensource-src-1.1.0/examples/audiodevices/audiodevices.pro
 
24
===================================================================
 
25
--- qt-mobility-opensource-src-1.1.0.orig/examples/audiodevices/audiodevices.pro        2010-11-01 06:36:10.000000000 +0000
 
26
+++ qt-mobility-opensource-src-1.1.0/examples/audiodevices/audiodevices.pro     2010-11-16 16:23:35.131286420 +0000
 
27
@@ -7,8 +7,6 @@
24
28
 CONFIG += mobility
25
29
 MOBILITY = multimedia
26
30
 
29
33
 HEADERS       = audiodevices.h
30
34
 
31
35
 SOURCES       = audiodevices.cpp \
32
 
--- a/examples/audioinput/audioinput.pro
33
 
+++ b/examples/audioinput/audioinput.pro
34
 
@@ -7,8 +7,6 @@ include(../examples.pri)
 
36
Index: qt-mobility-opensource-src-1.1.0/examples/audioinput/audioinput.pro
 
37
===================================================================
 
38
--- qt-mobility-opensource-src-1.1.0.orig/examples/audioinput/audioinput.pro    2010-11-01 06:36:10.000000000 +0000
 
39
+++ qt-mobility-opensource-src-1.1.0/examples/audioinput/audioinput.pro 2010-11-16 16:23:35.135286420 +0000
 
40
@@ -7,8 +7,6 @@
35
41
 CONFIG += mobility
36
42
 MOBILITY = multimedia
37
43
 
40
46
 HEADERS       = audioinput.h
41
47
 
42
48
 SOURCES       = audioinput.cpp \
43
 
--- a/examples/audiooutput/audiooutput.pro
44
 
+++ b/examples/audiooutput/audiooutput.pro
45
 
@@ -7,8 +7,6 @@ include(../examples.pri)
 
49
Index: qt-mobility-opensource-src-1.1.0/examples/audiooutput/audiooutput.pro
 
50
===================================================================
 
51
--- qt-mobility-opensource-src-1.1.0.orig/examples/audiooutput/audiooutput.pro  2010-11-01 06:36:10.000000000 +0000
 
52
+++ qt-mobility-opensource-src-1.1.0/examples/audiooutput/audiooutput.pro       2010-11-16 16:23:35.135286420 +0000
 
53
@@ -7,8 +7,6 @@
46
54
 CONFIG += mobility
47
55
 MOBILITY = multimedia
48
56
 
51
59
 HEADERS       = audiooutput.h
52
60
 
53
61
 SOURCES       = audiooutput.cpp \
54
 
--- a/examples/audiorecorder/audiorecorder.pro
55
 
+++ b/examples/audiorecorder/audiorecorder.pro
56
 
@@ -7,8 +7,6 @@ include(../examples.pri)
 
62
Index: qt-mobility-opensource-src-1.1.0/examples/audiorecorder/audiorecorder.pro
 
63
===================================================================
 
64
--- qt-mobility-opensource-src-1.1.0.orig/examples/audiorecorder/audiorecorder.pro      2010-11-01 06:36:10.000000000 +0000
 
65
+++ qt-mobility-opensource-src-1.1.0/examples/audiorecorder/audiorecorder.pro   2010-11-16 16:23:35.135286420 +0000
 
66
@@ -7,8 +7,6 @@
57
67
 CONFIG += mobility
58
68
 MOBILITY = multimedia
59
69
 
62
72
 HEADERS = \
63
73
     audiorecorder.h
64
74
   
65
 
--- a/examples/radio/radio.pro
66
 
+++ b/examples/radio/radio.pro
67
 
@@ -7,8 +7,6 @@ include(../examples.pri)
 
75
Index: qt-mobility-opensource-src-1.1.0/examples/radio/radio.pro
 
76
===================================================================
 
77
--- qt-mobility-opensource-src-1.1.0.orig/examples/radio/radio.pro      2010-11-01 06:36:10.000000000 +0000
 
78
+++ qt-mobility-opensource-src-1.1.0/examples/radio/radio.pro   2010-11-16 16:23:35.135286420 +0000
 
79
@@ -7,8 +7,6 @@
68
80
 CONFIG += mobility
69
81
 MOBILITY = multimedia
70
82
 
73
85
 HEADERS = \
74
86
     radio.h
75
87
   
76
 
--- a/examples/videographicsitem/videographicsitem.pro
77
 
+++ b/examples/videographicsitem/videographicsitem.pro
78
 
@@ -7,8 +7,6 @@ include(../examples.pri)
 
88
Index: qt-mobility-opensource-src-1.1.0/examples/videographicsitem/videographicsitem.pro
 
89
===================================================================
 
90
--- qt-mobility-opensource-src-1.1.0.orig/examples/videographicsitem/videographicsitem.pro      2010-11-01 06:36:10.000000000 +0000
 
91
+++ qt-mobility-opensource-src-1.1.0/examples/videographicsitem/videographicsitem.pro   2010-11-16 16:23:35.139286420 +0000
 
92
@@ -7,8 +7,6 @@
79
93
 CONFIG += mobility
80
94
 MOBILITY = multimedia
81
95
 
84
98
 contains(QT_CONFIG, opengl): QT += opengl
85
99
 
86
100
 HEADERS   += videoplayer.h \
87
 
--- a/examples/videowidget/videowidget.pro
88
 
+++ b/examples/videowidget/videowidget.pro
89
 
@@ -7,8 +7,6 @@ include(../examples.pri)
 
101
Index: qt-mobility-opensource-src-1.1.0/examples/videowidget/videowidget.pro
 
102
===================================================================
 
103
--- qt-mobility-opensource-src-1.1.0.orig/examples/videowidget/videowidget.pro  2010-11-01 06:36:10.000000000 +0000
 
104
+++ qt-mobility-opensource-src-1.1.0/examples/videowidget/videowidget.pro       2010-11-16 16:23:35.139286420 +0000
 
105
@@ -7,8 +7,6 @@
90
106
 CONFIG += mobility
91
107
 MOBILITY = multimedia
92
108
 
95
111
 HEADERS = \
96
112
     videoplayer.h \
97
113
     videowidget.h \
98
 
--- a/features/basic_examples_setup.pri
99
 
+++ b/features/basic_examples_setup.pri
100
 
@@ -24,7 +24,6 @@ UI_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART
 
114
Index: qt-mobility-opensource-src-1.1.0/features/basic_examples_setup.pri
 
115
===================================================================
 
116
--- qt-mobility-opensource-src-1.1.0.orig/features/basic_examples_setup.pri     2010-11-01 06:36:10.000000000 +0000
 
117
+++ qt-mobility-opensource-src-1.1.0/features/basic_examples_setup.pri  2010-11-16 16:23:35.139286420 +0000
 
118
@@ -36,7 +36,6 @@
101
119
 OBJECTS_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET
102
120
 mac:LIBS+= -F$$OUTPUT_DIR/lib
103
121
 LIBS+= -L$$OUTPUT_DIR/lib
105
123
 INCLUDEPATH+= $$QT_MOBILITY_SOURCE_TREE/src/global
106
124
 
107
125
 maemo6 {
108
 
--- a/features/mobility.prf.template
109
 
+++ b/features/mobility.prf.template
 
126
Index: qt-mobility-opensource-src-1.1.0/features/mobility.prf.template
 
127
===================================================================
 
128
--- qt-mobility-opensource-src-1.1.0.orig/features/mobility.prf.template        2010-11-01 06:36:10.000000000 +0000
 
129
+++ qt-mobility-opensource-src-1.1.0/features/mobility.prf.template     2010-11-16 16:23:35.139286420 +0000
110
130
@@ -12,7 +12,6 @@
111
131
 mac: LIBS += -F$${MOBILITY_LIB}
112
132