[Pkg-voip-commits] r2402 - in wengophone/trunk/debian: . patches
Marco Nenciarini
mnencia at costa.debian.org
Sun Sep 17 20:06:20 UTC 2006
Author: mnencia
Date: 2006-09-17 20:06:20 +0000 (Sun, 17 Sep 2006)
New Revision: 2402
Added:
wengophone/trunk/debian/patches/011_install-sfp-plugin-so.patch
Modified:
wengophone/trunk/debian/changelog
wengophone/trunk/debian/patches/003_wengoscons-qtplugindir.patch
wengophone/trunk/debian/patches/004_external-ffmpeg.patch
wengophone/trunk/debian/patches/007_wengophone-resourcedir.patch
wengophone/trunk/debian/patches/010_wengophone-phapi.patch
wengophone/trunk/debian/patches/200_add_rpath.patch
wengophone/trunk/debian/patches/series
Log:
Added patch 011_install-sfp-plugin-so.patch
Regenerated needing patches
Prepared for 2.0.0~rc3-svn7552-2
Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog 2006-09-17 16:37:48 UTC (rev 2401)
+++ wengophone/trunk/debian/changelog 2006-09-17 20:06:20 UTC (rev 2402)
@@ -1,3 +1,9 @@
+wengophone (2.0.0~rc3-svn7552-2) experimental; urgency=low
+
+ * Added patch to install missing libsfp-plugin.so
+
+ -- Marco Nenciarini <mnencia at debian.org> Sun, 17 Sep 2006 21:05:15 +0200
+
wengophone (2.0.0~rc3-svn7552-1) experimental; urgency=low
* New upstream snapshot.
Modified: wengophone/trunk/debian/patches/003_wengoscons-qtplugindir.patch
===================================================================
--- wengophone/trunk/debian/patches/003_wengoscons-qtplugindir.patch 2006-09-17 16:37:48 UTC (rev 2401)
+++ wengophone/trunk/debian/patches/003_wengoscons-qtplugindir.patch 2006-09-17 20:06:20 UTC (rev 2402)
@@ -1,8 +1,8 @@
-Index: wengophone-2.0.0~rc2-svn7476/wengophone/src/presentation/qt/SConscript
+Index: wengophone-2.0.0~rc3-svn7552/wengophone/src/presentation/qt/SConscript
===================================================================
---- wengophone-2.0.0~rc2-svn7476.orig/wengophone/src/presentation/qt/SConscript 2006-09-12 12:03:17.000000000 +0200
-+++ wengophone-2.0.0~rc2-svn7476/wengophone/src/presentation/qt/SConscript 2006-09-12 14:49:41.000000000 +0200
-@@ -447,7 +447,10 @@
+--- wengophone-2.0.0~rc3-svn7552.orig/wengophone/src/presentation/qt/SConscript 2006-09-17 21:39:22.000000000 +0200
++++ wengophone-2.0.0~rc3-svn7552/wengophone/src/presentation/qt/SConscript 2006-09-17 21:39:30.000000000 +0200
+@@ -460,7 +460,10 @@
print "Copying Qt's mng plugin to build dir..."
try:
os.mkdir(os.path.join(env.WengoGetRootBuildDir(), 'imageformats'))
Modified: wengophone/trunk/debian/patches/004_external-ffmpeg.patch
===================================================================
--- wengophone/trunk/debian/patches/004_external-ffmpeg.patch 2006-09-17 16:37:48 UTC (rev 2401)
+++ wengophone/trunk/debian/patches/004_external-ffmpeg.patch 2006-09-17 20:06:20 UTC (rev 2402)
@@ -1,7 +1,7 @@
-Index: wengophone-2.0.0~rc2-svn7476/wengoscons/wengoscons/wengoenv.py
+Index: wengophone-2.0.0~rc3-svn7552/wengoscons/wengoscons/wengoenv.py
===================================================================
---- wengophone-2.0.0~rc2-svn7476.orig/wengoscons/wengoscons/wengoenv.py 2006-09-12 14:49:37.000000000 +0200
-+++ wengophone-2.0.0~rc2-svn7476/wengoscons/wengoscons/wengoenv.py 2006-09-12 14:49:56.000000000 +0200
+--- wengophone-2.0.0~rc3-svn7552.orig/wengoscons/wengoscons/wengoenv.py 2006-09-17 21:39:29.000000000 +0200
++++ wengophone-2.0.0~rc3-svn7552/wengoscons/wengoscons/wengoenv.py 2006-09-17 21:39:44.000000000 +0200
@@ -1167,7 +1167,7 @@
self.Depends(project, vcproj)
@@ -32,10 +32,10 @@
return list
def setVariable(self, variable, value):
-Index: wengophone-2.0.0~rc2-svn7476/libs/pixertool/SConscript
+Index: wengophone-2.0.0~rc3-svn7552/libs/pixertool/SConscript
===================================================================
---- wengophone-2.0.0~rc2-svn7476.orig/libs/pixertool/SConscript 2006-03-22 03:10:43.000000000 +0100
-+++ wengophone-2.0.0~rc2-svn7476/libs/pixertool/SConscript 2006-09-12 14:49:56.000000000 +0200
+--- wengophone-2.0.0~rc3-svn7552.orig/libs/pixertool/SConscript 2006-09-17 21:39:21.000000000 +0200
++++ wengophone-2.0.0~rc3-svn7552/libs/pixertool/SConscript 2006-09-17 21:39:44.000000000 +0200
@@ -2,8 +2,13 @@
libs = [
@@ -51,11 +51,11 @@
lib_path = []
defines = {}
include_path = ['include']
-Index: wengophone-2.0.0~rc2-svn7476/wifo/phapi/SConscript
+Index: wengophone-2.0.0~rc3-svn7552/wifo/phapi/SConscript
===================================================================
---- wengophone-2.0.0~rc2-svn7476.orig/wifo/phapi/SConscript 2006-08-21 19:10:23.000000000 +0200
-+++ wengophone-2.0.0~rc2-svn7476/wifo/phapi/SConscript 2006-09-12 14:49:56.000000000 +0200
-@@ -183,10 +183,13 @@
+--- wengophone-2.0.0~rc3-svn7552.orig/wifo/phapi/SConscript 2006-09-17 21:39:21.000000000 +0200
++++ wengophone-2.0.0~rc3-svn7552/wifo/phapi/SConscript 2006-09-17 21:39:44.000000000 +0200
+@@ -190,10 +190,13 @@
if WengoGetConsoleArgument('enable-video'):
libs += [
@@ -70,10 +70,10 @@
defines['PHAPI_VIDEO_SUPPORT'] = 1
sources += [
-Index: wengophone-2.0.0~rc2-svn7476/SConscript
+Index: wengophone-2.0.0~rc3-svn7552/SConscript
===================================================================
---- wengophone-2.0.0~rc2-svn7476.orig/SConscript 2006-08-11 13:14:41.000000000 +0200
-+++ wengophone-2.0.0~rc2-svn7476/SConscript 2006-09-12 14:49:56.000000000 +0200
+--- wengophone-2.0.0~rc3-svn7552.orig/SConscript 2006-09-17 21:39:21.000000000 +0200
++++ wengophone-2.0.0~rc3-svn7552/SConscript 2006-09-17 21:39:44.000000000 +0200
@@ -23,7 +23,6 @@
'libs/idle',
'libs/skinstyle',
Modified: wengophone/trunk/debian/patches/007_wengophone-resourcedir.patch
===================================================================
--- wengophone/trunk/debian/patches/007_wengophone-resourcedir.patch 2006-09-17 16:37:48 UTC (rev 2401)
+++ wengophone/trunk/debian/patches/007_wengophone-resourcedir.patch 2006-09-17 20:06:20 UTC (rev 2402)
@@ -1,7 +1,7 @@
-Index: wengophone-2.0.0~rc2-svn7476/wengophone/src/SConscript
+Index: wengophone-2.0.0~rc3-svn7552/wengophone/src/SConscript
===================================================================
---- wengophone-2.0.0~rc2-svn7476.orig/wengophone/src/SConscript 2006-08-30 15:07:35.000000000 +0200
-+++ wengophone-2.0.0~rc2-svn7476/wengophone/src/SConscript 2006-09-12 14:58:53.000000000 +0200
+--- wengophone-2.0.0~rc3-svn7552.orig/wengophone/src/SConscript 2006-09-17 21:39:18.000000000 +0200
++++ wengophone-2.0.0~rc3-svn7552/wengophone/src/SConscript 2006-09-17 21:40:00.000000000 +0200
@@ -1,3 +1,5 @@
+import os
+
@@ -25,11 +25,11 @@
envBuildId = WengoGetEnvironment()
if WengoGetConsoleArgument('nobuildid'):
envBuildId.Append(
-Index: wengophone-2.0.0~rc2-svn7476/wengophone/src/model/config/Config.cpp
+Index: wengophone-2.0.0~rc3-svn7552/wengophone/src/model/config/Config.cpp
===================================================================
---- wengophone-2.0.0~rc2-svn7476.orig/wengophone/src/model/config/Config.cpp 2006-09-07 12:33:27.000000000 +0200
-+++ wengophone-2.0.0~rc2-svn7476/wengophone/src/model/config/Config.cpp 2006-09-12 14:58:53.000000000 +0200
-@@ -166,6 +166,8 @@
+--- wengophone-2.0.0~rc3-svn7552.orig/wengophone/src/model/config/Config.cpp 2006-09-17 21:39:18.000000000 +0200
++++ wengophone-2.0.0~rc3-svn7552/wengophone/src/model/config/Config.cpp 2006-09-17 21:40:00.000000000 +0200
+@@ -169,6 +169,8 @@
resourcesPath = Path::getApplicationDirPath();
#elif defined(OS_MACOSX)
resourcesPath = Path::getApplicationResourcesDirPath();
Modified: wengophone/trunk/debian/patches/010_wengophone-phapi.patch
===================================================================
--- wengophone/trunk/debian/patches/010_wengophone-phapi.patch 2006-09-17 16:37:48 UTC (rev 2401)
+++ wengophone/trunk/debian/patches/010_wengophone-phapi.patch 2006-09-17 20:06:20 UTC (rev 2402)
@@ -1,8 +1,8 @@
-Index: wengophone-2.0.0~rc2-svn7476/wifo/phapi/SConscript
+Index: wengophone-2.0.0~rc3-svn7552/wifo/phapi/SConscript
===================================================================
---- wengophone-2.0.0~rc2-svn7476.orig/wifo/phapi/SConscript 2006-09-17 13:22:48.000000000 +0200
-+++ wengophone-2.0.0~rc2-svn7476/wifo/phapi/SConscript 2006-09-17 13:22:57.000000000 +0200
-@@ -283,14 +283,16 @@
+--- wengophone-2.0.0~rc3-svn7552.orig/wifo/phapi/SConscript 2006-09-17 21:39:58.000000000 +0200
++++ wengophone-2.0.0~rc3-svn7552/wifo/phapi/SConscript 2006-09-17 21:40:19.000000000 +0200
+@@ -290,14 +290,16 @@
env.WengoUseLibraries(libs)
env.WengoAddDoxyfile()
Added: wengophone/trunk/debian/patches/011_install-sfp-plugin-so.patch
===================================================================
--- wengophone/trunk/debian/patches/011_install-sfp-plugin-so.patch (rev 0)
+++ wengophone/trunk/debian/patches/011_install-sfp-plugin-so.patch 2006-09-17 20:06:20 UTC (rev 2402)
@@ -0,0 +1,28 @@
+Index: wengophone-2.0.0~rc3-svn7552/wengophone/src/presentation/qt/QtWengoPhoneInstall
+===================================================================
+--- wengophone-2.0.0~rc3-svn7552.orig/wengophone/src/presentation/qt/QtWengoPhoneInstall 2006-09-17 21:48:13.000000000 +0200
++++ wengophone-2.0.0~rc3-svn7552/wengophone/src/presentation/qt/QtWengoPhoneInstall 2006-09-17 21:57:52.000000000 +0200
+@@ -187,6 +187,9 @@
+ targets += env.Install(lib_install_dir, env.WengoGetAlias("libavcodec"))
+ targets += env.Install(lib_install_dir, env.WengoGetAlias("webcam"))
+
++if not WengoOSMacOSX():
++ targets += env.Install(lib_install_dir, env.WengoGetAlias("libsfp-plugin"))
++
+ targets += env.Install(data_install_dir, docs)
+ targets += env.Install(data_install_dir, web_stuff)
+
+Index: wengophone-2.0.0~rc3-svn7552/wifo/sfp-plugin/SConscript
+===================================================================
+--- wengophone-2.0.0~rc3-svn7552.orig/wifo/sfp-plugin/SConscript 2006-09-17 21:48:09.000000000 +0200
++++ wengophone-2.0.0~rc3-svn7552/wifo/sfp-plugin/SConscript 2006-09-17 21:48:13.000000000 +0200
+@@ -27,6 +27,7 @@
+ env.WengoAddIncludePath(include_path)
+
+ if WengoOSMacOSX():
+- env.WengoStaticLibrary('sfp-plugin', sources)
++ sfp_lib = env.WengoStaticLibrary('sfp-plugin', sources)
+ else:
+- env.WengoSharedLibrary('sfp-plugin', sources)
++ sfp_lib = env.WengoSharedLibrary('sfp-plugin', sources)
++env.WengoAlias("libsfp-plugin", sfp_lib)
Modified: wengophone/trunk/debian/patches/200_add_rpath.patch
===================================================================
--- wengophone/trunk/debian/patches/200_add_rpath.patch 2006-09-17 16:37:48 UTC (rev 2401)
+++ wengophone/trunk/debian/patches/200_add_rpath.patch 2006-09-17 20:06:20 UTC (rev 2402)
@@ -1,8 +1,8 @@
-Index: wengophone-2.0.0~rc2-svn7476/wengophone/src/presentation/qt/SConscript
+Index: wengophone-2.0.0~rc3-svn7552/wengophone/src/presentation/qt/SConscript
===================================================================
---- wengophone-2.0.0~rc2-svn7476.orig/wengophone/src/presentation/qt/SConscript 2006-09-12 14:49:41.000000000 +0200
-+++ wengophone-2.0.0~rc2-svn7476/wengophone/src/presentation/qt/SConscript 2006-09-12 15:08:42.000000000 +0200
-@@ -411,6 +411,7 @@
+--- wengophone-2.0.0~rc3-svn7552.orig/wengophone/src/presentation/qt/SConscript 2006-09-17 21:38:51.000000000 +0200
++++ wengophone-2.0.0~rc3-svn7552/wengophone/src/presentation/qt/SConscript 2006-09-17 21:38:51.000000000 +0200
+@@ -424,6 +424,7 @@
'-L' + x11_lib_dir,
]
libs += ['SM', 'ICE', 'Xi', 'Xinerama', 'Xext', 'X11', 'Xrandr',]
Modified: wengophone/trunk/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series 2006-09-17 16:37:48 UTC (rev 2401)
+++ wengophone/trunk/debian/patches/series 2006-09-17 20:06:20 UTC (rev 2402)
@@ -8,4 +8,5 @@
008_wengoscons-qt-debug.patch
009_wengoscons-qt-resources.patch
010_wengophone-phapi.patch
+011_install-sfp-plugin-so.patch
200_add_rpath.patch
More information about the Pkg-voip-commits
mailing list