[Pkg-voip-commits] r2397 - in wengophone/trunk/debian: . patches
Marco Nenciarini
mnencia at costa.debian.org
Sun Sep 17 14:08:00 UTC 2006
Author: mnencia
Date: 2006-09-17 14:07:59 +0000 (Sun, 17 Sep 2006)
New Revision: 2397
Added:
wengophone/trunk/debian/patches/010_wengophone-phapi.patch
Modified:
wengophone/trunk/debian/changelog
wengophone/trunk/debian/get-orig-source.sh
wengophone/trunk/debian/patches/003_wengoscons-qtplugindir.patch
wengophone/trunk/debian/patches/004_external-ffmpeg.patch
wengophone/trunk/debian/patches/006_wengoscons-install.patch
wengophone/trunk/debian/patches/007_wengophone-resourcedir.patch
wengophone/trunk/debian/patches/008_wengoscons-qt-debug.patch
wengophone/trunk/debian/patches/009_wengoscons-qt-resources.patch
wengophone/trunk/debian/patches/200_add_rpath.patch
wengophone/trunk/debian/patches/series
wengophone/trunk/debian/rules
Log:
Prepared 2.0.0~rc3-svn7559-1 version.
Rubuild patches as needed
Switched to http://dev.openwengo.com/svn/openwengo/wengophone-ng/trunk
Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog 2006-09-17 09:40:31 UTC (rev 2396)
+++ wengophone/trunk/debian/changelog 2006-09-17 14:07:59 UTC (rev 2397)
@@ -1,3 +1,9 @@
+wengophone (2.0.0~rc3-svn7559-1) experimental; urgency=low
+
+ * New upstream snapshot.
+
+ -- Marco Nenciarini <mnencia at debian.org> Sun, 17 Sep 2006 16:04:53 +0200
+
wengophone (2.0.0~rc2-svn7135-1) experimental; urgency=low
* New upstream snapshot, switched to ng branch.
Modified: wengophone/trunk/debian/get-orig-source.sh
===================================================================
--- wengophone/trunk/debian/get-orig-source.sh 2006-09-17 09:40:31 UTC (rev 2396)
+++ wengophone/trunk/debian/get-orig-source.sh 2006-09-17 14:07:59 UTC (rev 2397)
@@ -76,5 +76,5 @@
gzip --best $desttar
echo "done"
-echo "Archive is in $finaldir"
+echo "Archive is in $finaldir/$desttar.gz"
mv -f $desttar.gz "$finaldir"
Modified: wengophone/trunk/debian/patches/003_wengoscons-qtplugindir.patch
===================================================================
--- wengophone/trunk/debian/patches/003_wengoscons-qtplugindir.patch 2006-09-17 09:40:31 UTC (rev 2396)
+++ wengophone/trunk/debian/patches/003_wengoscons-qtplugindir.patch 2006-09-17 14:07:59 UTC (rev 2397)
@@ -1,8 +1,8 @@
-Index: wengophone-1.0.99+2.0.0-rc2-svn7122/wengophone/src/presentation/qt/SConscript
+Index: wengophone-2.0.0~rc2-svn7476/wengophone/src/presentation/qt/SConscript
===================================================================
---- wengophone-1.0.99+2.0.0-rc2-svn7122.orig/wengophone/src/presentation/qt/SConscript 2006-07-04 19:01:37.000000000 +0200
-+++ wengophone-1.0.99+2.0.0-rc2-svn7122/wengophone/src/presentation/qt/SConscript 2006-08-04 19:37:43.000000000 +0200
-@@ -354,7 +354,10 @@
+--- 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 @@
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 09:40:31 UTC (rev 2396)
+++ wengophone/trunk/debian/patches/004_external-ffmpeg.patch 2006-09-17 14:07:59 UTC (rev 2397)
@@ -1,7 +1,7 @@
-Index: wengophone-1.0.99+2.0.0-rc2-svn7122/wengoscons/wengoscons/wengoenv.py
+Index: wengophone-2.0.0~rc2-svn7476/wengoscons/wengoscons/wengoenv.py
===================================================================
---- wengophone-1.0.99+2.0.0-rc2-svn7122.orig/wengoscons/wengoscons/wengoenv.py 2006-08-04 19:37:40.000000000 +0200
-+++ wengophone-1.0.99+2.0.0-rc2-svn7122/wengoscons/wengoscons/wengoenv.py 2006-08-04 19:37:52.000000000 +0200
+--- 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
@@ -1167,7 +1167,7 @@
self.Depends(project, vcproj)
@@ -32,10 +32,10 @@
return list
def setVariable(self, variable, value):
-Index: wengophone-1.0.99+2.0.0-rc2-svn7122/libs/pixertool/SConscript
+Index: wengophone-2.0.0~rc2-svn7476/libs/pixertool/SConscript
===================================================================
---- wengophone-1.0.99+2.0.0-rc2-svn7122.orig/libs/pixertool/SConscript 2006-03-22 03:10:43.000000000 +0100
-+++ wengophone-1.0.99+2.0.0-rc2-svn7122/libs/pixertool/SConscript 2006-08-04 19:37:52.000000000 +0200
+--- 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
@@ -2,8 +2,13 @@
libs = [
@@ -51,11 +51,11 @@
lib_path = []
defines = {}
include_path = ['include']
-Index: wengophone-1.0.99+2.0.0-rc2-svn7122/wifo/phapi/SConscript
+Index: wengophone-2.0.0~rc2-svn7476/wifo/phapi/SConscript
===================================================================
---- wengophone-1.0.99+2.0.0-rc2-svn7122.orig/wifo/phapi/SConscript 2006-07-11 18:33:51.000000000 +0200
-+++ wengophone-1.0.99+2.0.0-rc2-svn7122/wifo/phapi/SConscript 2006-08-04 19:37:52.000000000 +0200
-@@ -181,10 +181,13 @@
+--- 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 @@
if WengoGetConsoleArgument('enable-video'):
libs += [
@@ -70,10 +70,10 @@
defines['PHAPI_VIDEO_SUPPORT'] = 1
sources += [
-Index: wengophone-1.0.99+2.0.0-rc2-svn7122/SConscript
+Index: wengophone-2.0.0~rc2-svn7476/SConscript
===================================================================
---- wengophone-1.0.99+2.0.0-rc2-svn7122.orig/SConscript 2006-07-12 19:46:13.000000000 +0200
-+++ wengophone-1.0.99+2.0.0-rc2-svn7122/SConscript 2006-08-04 19:37:52.000000000 +0200
+--- 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
@@ -23,7 +23,6 @@
'libs/idle',
'libs/skinstyle',
Modified: wengophone/trunk/debian/patches/006_wengoscons-install.patch
===================================================================
--- wengophone/trunk/debian/patches/006_wengoscons-install.patch 2006-09-17 09:40:31 UTC (rev 2396)
+++ wengophone/trunk/debian/patches/006_wengoscons-install.patch 2006-09-17 14:07:59 UTC (rev 2397)
@@ -1,12 +1,12 @@
-Index: wengophone-1.0.99+2.0.0-trunk-svn7079/wengophone/src/presentation/qt/QtWengoPhoneInstall
+Index: wengophone-2.0.0~rc2-svn7476/wengophone/src/presentation/qt/QtWengoPhoneInstall
===================================================================
---- wengophone-1.0.99+2.0.0-trunk-svn7079.orig/wengophone/src/presentation/qt/QtWengoPhoneInstall 2006-08-02 16:33:43.000000000 +0000
-+++ wengophone-1.0.99+2.0.0-trunk-svn7079/wengophone/src/presentation/qt/QtWengoPhoneInstall 2006-08-02 16:38:44.000000000 +0000
-@@ -4,10 +4,27 @@
+--- wengophone-2.0.0~rc2-svn7476.orig/wengophone/src/presentation/qt/QtWengoPhoneInstall 2006-09-17 11:24:04.000000000 +0000
++++ wengophone-2.0.0~rc2-svn7476/wengophone/src/presentation/qt/QtWengoPhoneInstall 2006-09-17 11:27:00.000000000 +0000
+@@ -4,10 +4,28 @@
base_install_dir = WengoGetConsoleArgument("prefix")
if base_install_dir == None:
-- base_install_dir = "/tmp"
+- base_install_dir = "/tmp"
-lib_install_dir = os.path.join(base_install_dir, "lib", "qtwengophone")
-bin_install_dir = os.path.join(base_install_dir, "bin")
-wrapper_path = os.path.join(bin_install_dir, "qtwengophone")
@@ -31,44 +31,119 @@
+data_install_dir = WengoGetConsoleArgument("datadir")
+if data_install_dir == None:
+ data_install_dir = os.path.join(base_install_dir, "share", "wengophone")
++
dlls = [
]
-@@ -159,7 +176,7 @@
+@@ -116,40 +134,40 @@
+ ]
+
+ emoticons = [
+- "chat/emoticons/emblem-unreadable.png",
+- "chat/emoticons/face-angel16.png",
+- "chat/emoticons/face-angel22.png",
+- "chat/emoticons/face-angel48.png",
+- "chat/emoticons/face-crying16.png",
+- "chat/emoticons/face-crying22.png",
+- "chat/emoticons/face-crying48.png",
+- "chat/emoticons/face-devil-grin16.png",
+- "chat/emoticons/face-devil-grin22.png",
+- "chat/emoticons/face-devil-grin48.png",
+- "chat/emoticons/face-glasses16.png",
+- "chat/emoticons/face-glasses22.png",
+- "chat/emoticons/face-glasses48.png",
+- "chat/emoticons/face-kiss16.png",
+- "chat/emoticons/face-kiss22.png",
+- "chat/emoticons/face-kiss48.png",
+- "chat/emoticons/face-plain16.png",
+- "chat/emoticons/face-plain22.png",
+- "chat/emoticons/face-plain48.png",
+- "chat/emoticons/face-sad16.png",
+- "chat/emoticons/face-sad22.png",
+- "chat/emoticons/face-sad48.png",
+- "chat/emoticons/face-smile16.png",
+- "chat/emoticons/face-smile22.png",
+- "chat/emoticons/face-smile48.png",
+- "chat/emoticons/face-smile-big16.png",
+- "chat/emoticons/face-smile-big22.png",
+- "chat/emoticons/face-smile-big48.png",
+- "chat/emoticons/face-surprise16.png",
+- "chat/emoticons/face-surprise22.png",
+- "chat/emoticons/face-surprise48.png",
+- "chat/emoticons/face-wink16.png",
+- "chat/emoticons/face-wink22.png",
+- "chat/emoticons/face-wink48.png",
++ "pics/emoticons/emblem-unreadable.png",
++ "pics/emoticons/face-angel16.png",
++ "pics/emoticons/face-angel22.png",
++ "pics/emoticons/face-angel48.png",
++ "pics/emoticons/face-crying16.png",
++ "pics/emoticons/face-crying22.png",
++ "pics/emoticons/face-crying48.png",
++ "pics/emoticons/face-devil-grin16.png",
++ "pics/emoticons/face-devil-grin22.png",
++ "pics/emoticons/face-devil-grin48.png",
++ "pics/emoticons/face-glasses16.png",
++ "pics/emoticons/face-glasses22.png",
++ "pics/emoticons/face-glasses48.png",
++ "pics/emoticons/face-kiss16.png",
++ "pics/emoticons/face-kiss22.png",
++ "pics/emoticons/face-kiss48.png",
++ "pics/emoticons/face-plain16.png",
++ "pics/emoticons/face-plain22.png",
++ "pics/emoticons/face-plain48.png",
++ "pics/emoticons/face-sad16.png",
++ "pics/emoticons/face-sad22.png",
++ "pics/emoticons/face-sad48.png",
++ "pics/emoticons/face-smile16.png",
++ "pics/emoticons/face-smile22.png",
++ "pics/emoticons/face-smile48.png",
++ "pics/emoticons/face-smile-big16.png",
++ "pics/emoticons/face-smile-big22.png",
++ "pics/emoticons/face-smile-big48.png",
++ "pics/emoticons/face-surprise16.png",
++ "pics/emoticons/face-surprise22.png",
++ "pics/emoticons/face-surprise48.png",
++ "pics/emoticons/face-wink16.png",
++ "pics/emoticons/face-wink22.png",
++ "pics/emoticons/face-wink48.png",
+ ]
+
+ targets = []
+@@ -158,48 +176,30 @@
+ targets += env.Install(lib_install_dir, env.WengoGetAlias("softphone-download"))
targets += env.Install(lib_install_dir, env.WengoGetAlias("softphone-memorydump"))
- targets += env.Install(lib_install_dir, env.WengoGetAlias("phapi"))
+-targets += env.Install(lib_install_dir, env.WengoGetAlias("phapi"))
-targets += env.Install(lib_install_dir, env.WengoGetAlias("qtwengophone_alias"))
+targets += env.Install(bin_install_dir, env.WengoGetAlias("qtwengophone_alias"))
- targets += env.Install(lib_install_dir, [
- env.WengoGetAlias("owcurl_alias"),
-@@ -170,40 +187,21 @@
- # targets += env.Install(lib_install_dir, env.WengoGetAlias("video"))
- targets += env.Install(lib_install_dir, env.WengoGetAlias("webcam"))
+-targets += env.Install(lib_install_dir, [
+- env.WengoGetAlias("owcurl_alias"),
+- env.WengoGetAlias("phapi_alias"),
+-])
+-if WengoGetConsoleArgument("enable-video") == "yes":
+- targets += env.Install(lib_install_dir, env.WengoGetAlias("libavcodec"))
+- #targets += env.Install(lib_install_dir, env.WengoGetAlias("video"))
++if WengoGetConsoleArgument("enable-shared-phapi"):
++ targets += env.Install(lib_install_dir, env.WengoGetAlias("phapi_alias"))
++targets += env.Install(lib_install_dir, env.WengoGetAlias("owcurl_alias"))
++
++if WengoGetConsoleArgument("enable-video"):
++ if not WengoOSLinux():
++ targets += env.Install(lib_install_dir, env.WengoGetAlias("libavcodec"))
+ targets += env.Install(lib_install_dir, env.WengoGetAlias("webcam"))
-targets += env.Install(lib_install_dir, docs)
-targets += env.Install(lib_install_dir, web_stuff)
-+targets += env.Install(data_install_dir, docs)
-+targets += env.Install(data_install_dir, web_stuff)
-
+-
-targets += env.Install(os.path.join(lib_install_dir, "icons"), icons_misc)
-targets += env.Install(os.path.join(lib_install_dir, "pics/avatars"), avatars)
-targets += env.Install(os.path.join(lib_install_dir, "sounds"), base_sounds)
--targets += env.Install(os.path.join(lib_install_dir, "sounds", "dtmf"),
-+targets += env.Install(os.path.join(data_install_dir, "icons"), icons_misc)
-+targets += env.Install(os.path.join(data_install_dir, "pics/avatars"), avatars)
-+targets += env.Install(os.path.join(data_install_dir, "sounds"), base_sounds)
-+targets += env.Install(os.path.join(data_install_dir, "sounds", "dtmf"),
- default_theme_sounds)
--targets += env.Install(os.path.join(lib_install_dir, "sounds", "dtmf", "jungle"),
-+targets += env.Install(os.path.join(data_install_dir, "sounds", "dtmf", "jungle"),
- jungle_theme_sounds)
+-targets += env.Install(os.path.join(lib_install_dir, "sounds", "dtmf"), default_theme_sounds)
+-targets += env.Install(os.path.join(lib_install_dir, "sounds", "dtmf", "jungle"), jungle_theme_sounds)
-#targets += env.Install(os.path.join(lib_install_dir, "connecting"), home_page)
--targets += env.Install(os.path.join(lib_install_dir, "emoticons"),
-+#targets += env.Install(os.path.join(data_install_dir, "connecting"), home_page)
-+targets += env.Install(os.path.join(data_install_dir, "emoticons"),
- emoticons)
+-targets += env.Install(os.path.join(lib_install_dir, "emoticons"), emoticons)
-targets += env.Install(os.path.join(lib_install_dir, "lang"), env.WengoGetAlias("qtwengophone-translations"))
-
-wrapper_script = """
@@ -84,15 +159,24 @@
-"""
-
-def install_wrapper(target, source, env):
-- for a_target, a_source in zip(target, source):
-- t_wrapper = file(str(a_target), "w+")
-- t_wrapper.write(wrapper_script % lib_install_dir)
-- t_wrapper.close()
--
--targets += env.Command(wrapper_path, env.WengoGetAlias("qtwengophone_alias"),
-- install_wrapper)
+- for a_target, a_source in zip(target, source):
+- t_wrapper = file(str(a_target), "w+")
+- t_wrapper.write(wrapper_script % lib_install_dir)
+- t_wrapper.close()
++targets += env.Install(data_install_dir, docs)
++targets += env.Install(data_install_dir, web_stuff)
+
+-targets += env.Command(wrapper_path, env.WengoGetAlias("qtwengophone_alias"), install_wrapper)
++targets += env.Install(os.path.join(data_install_dir, "icons"), icons_misc)
++targets += env.Install(os.path.join(data_install_dir, "pics/avatars"), avatars)
++targets += env.Install(os.path.join(data_install_dir, "sounds"), base_sounds)
++targets += env.Install(os.path.join(data_install_dir, "sounds", "dtmf"), default_theme_sounds)
++targets += env.Install(os.path.join(data_install_dir, "sounds", "dtmf", "jungle"), jungle_theme_sounds)
++targets += env.Install(os.path.join(data_install_dir, "emoticons"),
++ emoticons)
+targets += env.Install(os.path.join(data_install_dir, "lang"), env.WengoGetAlias("qtwengophone-translations"))
env.WengoAlias('qtwengophone-install', targets)
+
+# vim: ft=python
++
Modified: wengophone/trunk/debian/patches/007_wengophone-resourcedir.patch
===================================================================
--- wengophone/trunk/debian/patches/007_wengophone-resourcedir.patch 2006-09-17 09:40:31 UTC (rev 2396)
+++ wengophone/trunk/debian/patches/007_wengophone-resourcedir.patch 2006-09-17 14:07:59 UTC (rev 2397)
@@ -1,15 +1,15 @@
-Index: wengophone-1.0.99+2.0.0-rc2-svn7122/wengophone/src/SConscript
+Index: wengophone-2.0.0~rc2-svn7476/wengophone/src/SConscript
===================================================================
---- wengophone-1.0.99+2.0.0-rc2-svn7122.orig/wengophone/src/SConscript 2006-07-21 18:32:56.000000000 +0200
-+++ wengophone-1.0.99+2.0.0-rc2-svn7122/wengophone/src/SConscript 2006-08-04 19:38:05.000000000 +0200
+--- 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
@@ -1,3 +1,5 @@
+import os
+
env = WengoGetEnvironment()
WengoPhoneBuildId = {
-@@ -33,6 +35,16 @@
- defines = {}
+@@ -43,6 +45,16 @@
+
headers = []
+if WengoOSLinux():
@@ -25,11 +25,11 @@
envBuildId = WengoGetEnvironment()
if WengoGetConsoleArgument('nobuildid'):
envBuildId.Append(
-Index: wengophone-1.0.99+2.0.0-rc2-svn7122/wengophone/src/model/config/Config.cpp
+Index: wengophone-2.0.0~rc2-svn7476/wengophone/src/model/config/Config.cpp
===================================================================
---- wengophone-1.0.99+2.0.0-rc2-svn7122.orig/wengophone/src/model/config/Config.cpp 2006-07-18 21:05:04.000000000 +0200
-+++ wengophone-1.0.99+2.0.0-rc2-svn7122/wengophone/src/model/config/Config.cpp 2006-08-04 19:38:05.000000000 +0200
-@@ -160,6 +160,8 @@
+--- 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 @@
resourcesPath = Path::getApplicationDirPath();
#elif defined(OS_MACOSX)
resourcesPath = Path::getApplicationResourcesDirPath();
Modified: wengophone/trunk/debian/patches/008_wengoscons-qt-debug.patch
===================================================================
--- wengophone/trunk/debian/patches/008_wengoscons-qt-debug.patch 2006-09-17 09:40:31 UTC (rev 2396)
+++ wengophone/trunk/debian/patches/008_wengoscons-qt-debug.patch 2006-09-17 14:07:59 UTC (rev 2397)
@@ -1,8 +1,8 @@
-Index: wengophone-1.0.99+2.0.0-rc2-svn7122/wengoscons/libs/qt4/SConscript
+Index: wengophone-2.0.0~rc2-svn7476/wengoscons/libs/qt4/SConscript
===================================================================
---- wengophone-1.0.99+2.0.0-rc2-svn7122.orig/wengoscons/libs/qt4/SConscript 2006-05-31 11:07:47.000000000 +0200
-+++ wengophone-1.0.99+2.0.0-rc2-svn7122/wengoscons/libs/qt4/SConscript 2006-08-04 19:38:09.000000000 +0200
-@@ -165,7 +165,8 @@
+--- wengophone-2.0.0~rc2-svn7476.orig/wengoscons/libs/qt4/SConscript 2006-08-12 00:15:03.000000000 +0200
++++ wengophone-2.0.0~rc2-svn7476/wengoscons/libs/qt4/SConscript 2006-09-12 14:59:03.000000000 +0200
+@@ -166,7 +166,8 @@
defines['WIN32'] = 1
elif WengoOSLinux() or WengoOSBSD():
@@ -12,7 +12,7 @@
libs += [
'QtCore_debug',
'QtGui_debug',
-@@ -183,6 +184,7 @@
+@@ -184,6 +185,7 @@
'QtSvg',
'QtUiTools',
]
Modified: wengophone/trunk/debian/patches/009_wengoscons-qt-resources.patch
===================================================================
--- wengophone/trunk/debian/patches/009_wengoscons-qt-resources.patch 2006-09-17 09:40:31 UTC (rev 2396)
+++ wengophone/trunk/debian/patches/009_wengoscons-qt-resources.patch 2006-09-17 14:07:59 UTC (rev 2397)
@@ -1,8 +1,8 @@
-Index: wengophone-1.0.99+2.0.0-trunk-svn7120/wengoscons/wengoscons/wengoenv.py
+Index: wengophone-2.0.0~rc2-svn7476/wengoscons/wengoscons/wengoenv.py
===================================================================
---- wengophone-1.0.99+2.0.0-trunk-svn7120.orig/wengoscons/wengoscons/wengoenv.py 2006-08-04 13:18:12.000000000 +0200
-+++ wengophone-1.0.99+2.0.0-trunk-svn7120/wengoscons/wengoscons/wengoenv.py 2006-08-04 16:26:21.000000000 +0200
-@@ -1609,13 +1609,20 @@
+--- wengophone-2.0.0~rc2-svn7476.orig/wengoscons/wengoscons/wengoenv.py 2006-09-12 14:49:56.000000000 +0200
++++ wengophone-2.0.0~rc2-svn7476/wengoscons/wengoscons/wengoenv.py 2006-09-12 15:08:09.000000000 +0200
+@@ -1609,14 +1609,22 @@
rcc = os.path.join(qtdir, 'bin', 'rcc')
self.__saveCurrentSourcePath()
@@ -12,20 +12,22 @@
os.chdir(dir)
outputFile = os.path.basename(qrcFile) + '.cpp'
-
++
+ absOutputFile = os.path.join(dir, outputFile);
+ if os.path.exists(absOutputFile):
-+ outputFileMtime = os.path.getmtime(absOutputFile)
++ outputFileMtime = os.path.getmtime(absOutputFile)
+ if outputFileMtime > os.path.getmtime(absQrcFile):
+ return absOutputFile
-+
- os.system(rcc + ' ' + os.path.basename(qrcFile) + ' -o ' + outputFile)
++
+ errcode = os.system(rcc + ' ' + os.path.basename(qrcFile) + ' -o ' + outputFile)
+ if errcode > 0:
+ raise Exception("error while executing rcc")
- return os.path.join(dir, outputFile)
+ return absOutputFile
def WengoCompileQt4UiFile(self, uiFile):
"""
-@@ -1632,13 +1639,21 @@
+@@ -1633,13 +1641,21 @@
uic = os.path.join(qtdir, 'bin', 'uic')
self.__saveCurrentSourcePath()
@@ -35,13 +37,13 @@
os.chdir(dir)
outputFile = 'ui_' + os.path.basename(uiFile[:-3]) + '.h'
-+
+
+ absOutputFile = os.path.join(dir, outputFile);
+ if os.path.exists(absOutputFile):
-+ outputFileMtime = os.path.getmtime(absOutputFile)
++ outputFileMtime = os.path.getmtime(absOutputFile)
+ if outputFileMtime > os.path.getmtime(absUiFile):
+ return absOutputFile
-
++
os.system(uic + ' ' + os.path.basename(uiFile) + ' -o ' + outputFile)
- return os.path.join(dir, outputFile)
+
Added: wengophone/trunk/debian/patches/010_wengophone-phapi.patch
===================================================================
--- wengophone/trunk/debian/patches/010_wengophone-phapi.patch (rev 0)
+++ wengophone/trunk/debian/patches/010_wengophone-phapi.patch 2006-09-17 14:07:59 UTC (rev 2397)
@@ -0,0 +1,25 @@
+Index: wengophone-2.0.0~rc2-svn7476/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 @@
+ env.WengoUseLibraries(libs)
+ env.WengoAddDoxyfile()
+
++# phapi as variable for the lib conflicts with
++# libsuffix=64, phapi_lib fixes it ;)
+ if shphapi:
+- phapi = env.WengoSharedLibrary('phapi', sources)
++ phapi_lib = env.WengoSharedLibrary('phapi', sources)
+ else:
+- phapi = env.WengoStaticLibrary('phapi', sources)
++ phapi_lib = env.WengoStaticLibrary('phapi', sources)
+
+-env.WengoAlias("phapi_alias", phapi)
++env.WengoAlias("phapi_alias", phapi_lib)
+
+-Depends(phapi, [amr, speex])
++Depends(phapi_lib, [amr, speex])
+
+ if not WengoOSWindows() and not WengoOSMacOSX():
+ SConscript('test/SConscript')
Modified: wengophone/trunk/debian/patches/200_add_rpath.patch
===================================================================
--- wengophone/trunk/debian/patches/200_add_rpath.patch 2006-09-17 09:40:31 UTC (rev 2396)
+++ wengophone/trunk/debian/patches/200_add_rpath.patch 2006-09-17 14:07:59 UTC (rev 2397)
@@ -1,8 +1,8 @@
-Index: wengophone-1.0.99+2.0.0-rc2-svn7122/wengophone/src/presentation/qt/SConscript
+Index: wengophone-2.0.0~rc2-svn7476/wengophone/src/presentation/qt/SConscript
===================================================================
---- wengophone-1.0.99+2.0.0-rc2-svn7122.orig/wengophone/src/presentation/qt/SConscript 2006-08-04 18:17:16.000000000 +0000
-+++ wengophone-1.0.99+2.0.0-rc2-svn7122/wengophone/src/presentation/qt/SConscript 2006-08-05 11:38:36.000000000 +0000
-@@ -318,6 +318,7 @@
+--- 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 @@
'-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 09:40:31 UTC (rev 2396)
+++ wengophone/trunk/debian/patches/series 2006-09-17 14:07:59 UTC (rev 2397)
@@ -7,4 +7,5 @@
007_wengophone-resourcedir.patch
008_wengoscons-qt-debug.patch
009_wengoscons-qt-resources.patch
+010_wengophone-phapi.patch
200_add_rpath.patch
Modified: wengophone/trunk/debian/rules
===================================================================
--- wengophone/trunk/debian/rules 2006-09-17 09:40:31 UTC (rev 2396)
+++ wengophone/trunk/debian/rules 2006-09-17 14:07:59 UTC (rev 2397)
@@ -34,7 +34,7 @@
UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9]*$$//' -e 's/-svn.*$$//' -e 's/.dfsg$$//')
SVNVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*svn//' -e 's/-[0-9]*$$//')
-SVNREP:=http://dev.openwengo.com/svn/openwengo/wengophone-ng/branches/rc2
+SVNREP:=http://dev.openwengo.com/svn/openwengo/wengophone-ng/trunk
print-version:
@@echo "Debian version: $(DEBVERSION)"
More information about the Pkg-voip-commits
mailing list