[Pkg-voip-commits] r2488 - in wengophone/branches/cmake/debian: .
patches
Marco Nenciarini
mnencia at costa.debian.org
Fri Oct 6 15:56:00 UTC 2006
Author: mnencia
Date: 2006-10-06 15:55:59 +0000 (Fri, 06 Oct 2006)
New Revision: 2488
Added:
wengophone/branches/cmake/debian/patches/000_cmake-static-owcurl.patch
wengophone/branches/cmake/debian/patches/001_cmake-fix-static-phapi.patch
wengophone/branches/cmake/debian/patches/002_cmake-fix-static-sfp-plugin.patch
wengophone/branches/cmake/debian/patches/003_cmake-amrplugin-pic-code.patch
wengophone/branches/cmake/debian/patches/200_no-crashreport.patch
wengophone/branches/cmake/debian/patches/201_cmake-svnrelease-from-debian-changelog.patch
Removed:
wengophone/branches/cmake/debian/patches/001_wengoscons-boost.patch
wengophone/branches/cmake/debian/patches/002_wengoscons-doxygen-pic.patch
wengophone/branches/cmake/debian/patches/003_wengoscons-qtplugindir.patch
wengophone/branches/cmake/debian/patches/004_external-ffmpeg.patch
wengophone/branches/cmake/debian/patches/005_external-speex.patch
wengophone/branches/cmake/debian/patches/006_wengoscons-install.patch
wengophone/branches/cmake/debian/patches/007_wengophone-resourcedir.patch
wengophone/branches/cmake/debian/patches/008_wengoscons-qt-debug.patch
wengophone/branches/cmake/debian/patches/009_wengoscons-qt-resources.patch
wengophone/branches/cmake/debian/patches/010_wengophone-phapi.patch
wengophone/branches/cmake/debian/patches/011_install-sfp-plugin-so.patch
wengophone/branches/cmake/debian/patches/200_add_rpath.patch
Modified:
wengophone/branches/cmake/debian/changelog
wengophone/branches/cmake/debian/patches/series
wengophone/branches/cmake/debian/rules
Log:
Removed scons patches
Added cmake patches
This commit make a lintian/linda clean package
Modified: wengophone/branches/cmake/debian/changelog
===================================================================
--- wengophone/branches/cmake/debian/changelog 2006-10-03 21:33:23 UTC (rev 2487)
+++ wengophone/branches/cmake/debian/changelog 2006-10-06 15:55:59 UTC (rev 2488)
@@ -1,12 +1,18 @@
-wengophone (2.0.0~rc3-svn7895-1) experimental; urgency=low
+wengophone (2.0.0~rc4-svn7946-1) experimental; urgency=low
* New upstream snapshot.
* Switch to CMake build system.
* Added debian/cmake.mk stolen from strigi package.
* Cleaned debian/rules from scons, now all work is done
by debian/cmake.mk
- * All patches are temporary disabled because almost
- all are related to scons.
+ * Removed all scons-related patches.
+ * New patches:
+ + cmake-static-owcurl
+ + cmake-fix-static-phapi
+ + cmake-fix-static-sfp-plugin
+ + cmake-amrplugin-pic-code
+ + no-crashreport
+ + cmake-svnrelease-from-debian-changelog
* Modified debian/get-orig-source.sh:
+ checkout the cmake build system instead
of the scons one.
@@ -23,7 +29,7 @@
+portaudio19-dev
-scons
- -- Marco Nenciarini <mnencia at debian.org> Tue, 3 Oct 2006 13:49:00 +0200
+ -- Marco Nenciarini <mnencia at debian.org> Fri, 6 Oct 2006 17:50:32 +0200
wengophone (2.0.0~rc3-svn7552-2) experimental; urgency=low
Added: wengophone/branches/cmake/debian/patches/000_cmake-static-owcurl.patch
===================================================================
--- wengophone/branches/cmake/debian/patches/000_cmake-static-owcurl.patch (rev 0)
+++ wengophone/branches/cmake/debian/patches/000_cmake-static-owcurl.patch 2006-10-06 15:55:59 UTC (rev 2488)
@@ -0,0 +1,39 @@
+Index: wengophone-2.0.0~rc4-svn7946/libs/curl/CMakeLists.txt
+===================================================================
+--- wengophone-2.0.0~rc4-svn7946.orig/libs/curl/CMakeLists.txt 2006-10-06 12:40:42.000000000 +0000
++++ wengophone-2.0.0~rc4-svn7946/libs/curl/CMakeLists.txt 2006-10-06 12:56:55.000000000 +0000
+@@ -30,6 +30,8 @@
+ -DUSE_OPENSSL
+ )
+
++option(WITH_SHARED_OWCURL "Build owcurl as shared library" ON)
++
+ if (APPLE)
+ find_package(ZLIB REQUIRED)
+
+@@ -122,14 +124,16 @@
+ ${OWCURL_DEFINITIONS}
+ )
+
+-add_library(${OWCURL_LIBRARY} SHARED ${owcurl_SRCS})
++if (WITH_SHARED_OWCURL)
++ add_library(${OWCURL_LIBRARY} SHARED ${owcurl_SRCS})
++ install(
++ TARGETS
++ ${OWCURL_LIBRARY}
++ DESTINATION
++ ${LIB_INSTALL_DIR}
++ )
++else (WITH_SHARED_OWCURL)
++ add_library(${OWCURL_LIBRARY} STATIC ${owcurl_SRCS})
++endif (WITH_SHARED_OWCURL)
+
+ target_link_libraries(${OWCURL_LINK_LIBRARIES})
+-
+-install(
+- TARGETS
+- ${OWCURL_LIBRARY}
+- DESTINATION
+- ${LIB_INSTALL_DIR}
+-)
+-
Added: wengophone/branches/cmake/debian/patches/001_cmake-fix-static-phapi.patch
===================================================================
--- wengophone/branches/cmake/debian/patches/001_cmake-fix-static-phapi.patch (rev 0)
+++ wengophone/branches/cmake/debian/patches/001_cmake-fix-static-phapi.patch 2006-10-06 15:55:59 UTC (rev 2488)
@@ -0,0 +1,27 @@
+Index: wengophone-2.0.0~rc4-svn7946/wifo/phapi/CMakeLists.txt
+===================================================================
+--- wengophone-2.0.0~rc4-svn7946.orig/wifo/phapi/CMakeLists.txt 2006-10-06 12:45:17.000000000 +0000
++++ wengophone-2.0.0~rc4-svn7946/wifo/phapi/CMakeLists.txt 2006-10-06 12:50:15.000000000 +0000
+@@ -256,7 +256,7 @@
+
+ if (UNIX AND NOT WIN32)
+ if (APPLE)
+- set(WITH_PHAPI_SHARED OFF)
++ set(WITH_SHARED_PHAPI OFF)
+
+ set(phapi_SRCS
+ ${phapi_SRCS}
+@@ -419,13 +419,6 @@
+
+ install(
+ TARGETS
+- ${PHAPI_LIBRARY}
+- DESTINATION
+- ${LIB_INSTALL_DIR}
+-)
+-
+-install(
+- TARGETS
+ phamrplugin
+ phspeexplugin
+ DESTINATION
Deleted: wengophone/branches/cmake/debian/patches/001_wengoscons-boost.patch
===================================================================
--- wengophone/branches/cmake/debian/patches/001_wengoscons-boost.patch 2006-10-03 21:33:23 UTC (rev 2487)
+++ wengophone/branches/cmake/debian/patches/001_wengoscons-boost.patch 2006-10-06 15:55:59 UTC (rev 2488)
@@ -1,19 +0,0 @@
-Index: wengophone-1.0.99+2.0.0-trunk-svn7079/wengoscons/libs/boost/SConscript
-===================================================================
---- wengophone-1.0.99+2.0.0-trunk-svn7079.orig/wengoscons/libs/boost/SConscript 2006-08-02 16:34:57.000000000 +0000
-+++ wengophone-1.0.99+2.0.0-trunk-svn7079/wengoscons/libs/boost/SConscript 2006-08-02 16:38:34.000000000 +0000
-@@ -21,6 +21,14 @@
- 'boost_regex-gcc-mt',
- 'boost_program_options-gcc-mt',
- ]
-+ elif conf.CheckLib('boost_thread-mt'):
-+ libs += [
-+ 'boost_thread-mt',
-+ 'boost_serialization',
-+ 'boost_signals',
-+ 'boost_regex',
-+ 'boost_program_options',
-+ ]
- else:
- libs += [
- 'boost_thread',
Added: wengophone/branches/cmake/debian/patches/002_cmake-fix-static-sfp-plugin.patch
===================================================================
--- wengophone/branches/cmake/debian/patches/002_cmake-fix-static-sfp-plugin.patch (rev 0)
+++ wengophone/branches/cmake/debian/patches/002_cmake-fix-static-sfp-plugin.patch 2006-10-06 15:55:59 UTC (rev 2488)
@@ -0,0 +1,45 @@
+Index: wengophone-2.0.0~rc4-svn7946/wifo/sfp-plugin/CMakeLists.txt
+===================================================================
+--- wengophone-2.0.0~rc4-svn7946.orig/wifo/sfp-plugin/CMakeLists.txt 2006-10-06 12:56:02.000000000 +0000
++++ wengophone-2.0.0~rc4-svn7946/wifo/sfp-plugin/CMakeLists.txt 2006-10-06 12:58:31.000000000 +0000
+@@ -23,6 +23,12 @@
+ ${EXOSIP_LIBRARY}
+ )
+
++option(WITH_SHARED_SFP-PLUGIN "Build sfp-plugin as shared library" ON)
++
++if (APPLE)
++ set(WITH_SHARED_SFP-PLUGIN OFF)
++endif (APPLE)
++
+ if (MSVC)
+ set(SFP-PLUGIN_DEFINITIONS
+ -DBUILD_SFP_PLUGIN_DLL
+@@ -44,15 +50,7 @@
+ ${SFP-PLUGIN_DEFINITIONS}
+ )
+
+-if (APPLE)
+- add_library(${SFP-PLUGIN_LIBRARY} STATIC ${sfp-plugin_SRCS})
+- install(
+- TARGETS
+- ${SFP-PLUGIN_LIBRARY}
+- ARCHIVE DESTINATION
+- ${LIB_INSTALL_DIR}
+- )
+-else (APPLE)
++if (WITH_SHARED_SFP-PLUGIN)
+ add_library(${SFP-PLUGIN_LIBRARY} SHARED ${sfp-plugin_SRCS})
+ install(
+ TARGETS
+@@ -60,7 +58,9 @@
+ LIBRARY DESTINATION
+ ${LIB_INSTALL_DIR}
+ )
+-endif (APPLE)
++else (WITH_SHARED_SFP-PLUGIN)
++ add_library(${SFP-PLUGIN_LIBRARY} STATIC ${sfp-plugin_SRCS})
++endif (WITH_SHARED_SFP-PLUGIN)
+
+ target_link_libraries(${SFP-PLUGIN_LINK_LIBRARIES})
+
Deleted: wengophone/branches/cmake/debian/patches/002_wengoscons-doxygen-pic.patch
===================================================================
--- wengophone/branches/cmake/debian/patches/002_wengoscons-doxygen-pic.patch 2006-10-03 21:33:23 UTC (rev 2487)
+++ wengophone/branches/cmake/debian/patches/002_wengoscons-doxygen-pic.patch 2006-10-06 15:55:59 UTC (rev 2488)
@@ -1,31 +0,0 @@
-Index: wengophone-1.0.99+2.0.0-trunk-svn7079/wengoscons/wengoscons/wengoenv.py
-===================================================================
---- wengophone-1.0.99+2.0.0-trunk-svn7079.orig/wengoscons/wengoscons/wengoenv.py 2006-08-02 16:34:56.000000000 +0000
-+++ wengophone-1.0.99+2.0.0-trunk-svn7079/wengoscons/wengoscons/wengoenv.py 2006-08-02 16:39:06.000000000 +0000
-@@ -456,8 +456,14 @@
-
- def __setDefaultFlags(self):
- #-fno-common is needed under MacOSX
-- self.__CCFlags += ['-fno-common']
-- self.__linkFlags += ['-fno-common']
-+
-+ # if Linux and x86_64
-+ if re.search('linux', sys.platform) and platform.machine() == 'x86_64':
-+ self.__CCFlags += ['-fPIC', '-fno-common']
-+ self.__linkFlags += ['-fPIC', '-fno-common']
-+ else:
-+ self.__CCFlags += ['-fno-common']
-+ self.__linkFlags += ['-fno-common']
-
- def getCCWarningFlags(self):
- return ['-Wall']
-@@ -1541,7 +1547,8 @@
- #Saves the current path because doxygen
- #is not running in the correct directory
- self.__saveCurrentSourcePath()
-- doc = self.Command(os.path.join(self.__getSourcePath(), 'doc'), 'Doxyfile', 'cd $SOURCE_PATH & doxygen')
-+ if os.path.isfile(os.path.join(self.__getSourcePath(), 'doc') + 'Doxyfile'):
-+ doc = self.Command(os.path.join(self.__getSourcePath(), 'doc'), 'Doxyfile', 'cd $SOURCE_PATH & doxygen')
- #FIXME duplicate alias cf warning message from SCons
- #self.Alias('doxygen', doc)
-
Added: wengophone/branches/cmake/debian/patches/003_cmake-amrplugin-pic-code.patch
===================================================================
--- wengophone/branches/cmake/debian/patches/003_cmake-amrplugin-pic-code.patch (rev 0)
+++ wengophone/branches/cmake/debian/patches/003_cmake-amrplugin-pic-code.patch 2006-10-06 15:55:59 UTC (rev 2488)
@@ -0,0 +1,26 @@
+Index: wengophone-2.0.0~rc4-svn7946/wifo/phapi/amrwb/CMakeLists.txt
+===================================================================
+--- wengophone-2.0.0~rc4-svn7946.orig/wifo/phapi/amrwb/CMakeLists.txt 2006-10-06 14:51:47.000000000 +0000
++++ wengophone-2.0.0~rc4-svn7946/wifo/phapi/amrwb/CMakeLists.txt 2006-10-06 14:51:21.000000000 +0000
+@@ -41,7 +41,7 @@
+ ${AMRWB_INCLUDE_DIRS}
+ )
+
+-add_library(${AMRWB_LIBRARY} STATIC ${amrwb_SRCS})
++add_library(${AMRWB_LIBRARY} SHARED ${amrwb_SRCS})
+
+ target_link_libraries(${AMRWB_LINK_LIBRARIES})
+
+Index: wengophone-2.0.0~rc4-svn7946/wifo/phapi/amrnb/CMakeLists.txt
+===================================================================
+--- wengophone-2.0.0~rc4-svn7946.orig/wifo/phapi/amrnb/CMakeLists.txt 2006-10-06 14:52:27.000000000 +0000
++++ wengophone-2.0.0~rc4-svn7946/wifo/phapi/amrnb/CMakeLists.txt 2006-10-06 14:51:02.000000000 +0000
+@@ -28,7 +28,7 @@
+ ${AMRNB_INCLUDE_DIRS}
+ )
+
+-add_library(${AMRNB_LIBRARY} STATIC ${amrnb_SRCS})
++add_library(${AMRNB_LIBRARY} SHARED ${amrnb_SRCS})
+
+ target_link_libraries(${AMRNB_LINK_LIBRARIES})
+
Deleted: wengophone/branches/cmake/debian/patches/003_wengoscons-qtplugindir.patch
===================================================================
--- wengophone/branches/cmake/debian/patches/003_wengoscons-qtplugindir.patch 2006-10-03 21:33:23 UTC (rev 2487)
+++ wengophone/branches/cmake/debian/patches/003_wengoscons-qtplugindir.patch 2006-10-06 15:55:59 UTC (rev 2488)
@@ -1,16 +0,0 @@
-Index: wengophone-2.0.0~rc3-svn7552/wengophone/src/presentation/qt/SConscript
-===================================================================
---- 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'))
-- shutil.copy2(os.path.join(os.environ['QTDIR'], 'plugins', 'imageformats', qt_mng_plugin_file), env.WengoGetRootBuildDir());
-+ if os.environ.has_key('QTPLUGINDIR'):
-+ shutil.copy2(os.path.join(os.environ['QTPLUGINDIR'], 'imageformats', qt_mng_plugin_file), env.WengoGetRootBuildDir());
-+ else:
-+ shutil.copy2(os.path.join(os.environ['QTDIR'], 'plugins', 'imageformats', qt_mng_plugin_file), env.WengoGetRootBuildDir());
- except (IOError, os.error), why:
- print "Can't copy %s to %s: %s" % (qt_mng_plugin_file, os.path.join(env.WengoGetRootBuildDir(), 'imageformats', qt_mng_plugin_file), str(why))
- else:
Deleted: wengophone/branches/cmake/debian/patches/004_external-ffmpeg.patch
===================================================================
--- wengophone/branches/cmake/debian/patches/004_external-ffmpeg.patch 2006-10-03 21:33:23 UTC (rev 2487)
+++ wengophone/branches/cmake/debian/patches/004_external-ffmpeg.patch 2006-10-06 15:55:59 UTC (rev 2488)
@@ -1,84 +0,0 @@
-Index: wengophone-2.0.0~rc3-svn7552/wengoscons/wengoscons/wengoenv.py
-===================================================================
---- 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)
-
-- def __getAllDependencies(self, libs):
-+ def __getAllDependencies(self, libs, seen=[]):
- """
- Gets the complete list of the child libraries of the current Environment.
-
-@@ -1180,14 +1180,13 @@
- list = []
- for name in libs:
- env = _libs.get(name, None)
-- if not env:
-- list += [name]
-- else:
-+ list += [name]
-+ seen += [name]
-+ if env:
- childLibs = env.Libs.getLibs(env)
-- if len(childLibs) == 0:
-- list += [name]
-- else:
-- list += [name] + self.__getAllDependencies(childLibs)
-+ childLibs = [child for child in childLibs if not child in seen]
-+ if len(childLibs) > 0:
-+ list += self.__getAllDependencies(childLibs, [seen])
- return list
-
- def setVariable(self, variable, value):
-Index: wengophone-2.0.0~rc3-svn7552/libs/pixertool/SConscript
-===================================================================
---- 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 = [
- 'owcutil',
-- 'avcodec'
- ]
-+
-+if WengoOSLinux():
-+ env.ParseConfig('pkg-config --cflags --libs libavcodec')
-+else:
-+ libs += ['avcodec']
-+
- lib_path = []
- defines = {}
- include_path = ['include']
-Index: wengophone-2.0.0~rc3-svn7552/wifo/phapi/SConscript
-===================================================================
---- 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 += [
-- 'avcodec',
- 'webcam',
- 'pixertool',
- ]
-+ if WengoOSLinux():
-+ env.ParseConfig('pkg-config --cflags --libs libavcodec')
-+ else:
-+ libs += ['avcodec']
- defines['PHAPI_VIDEO_SUPPORT'] = 1
-
- sources += [
-Index: wengophone-2.0.0~rc3-svn7552/SConscript
-===================================================================
---- 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',
- 'libs/sound',
-- 'libs/ffmpeg',
- 'libs/pixertool',
- 'libs/wenbox',
- 'libs/webcam',
Deleted: wengophone/branches/cmake/debian/patches/005_external-speex.patch
===================================================================
--- wengophone/branches/cmake/debian/patches/005_external-speex.patch 2006-10-03 21:33:23 UTC (rev 2487)
+++ wengophone/branches/cmake/debian/patches/005_external-speex.patch 2006-10-06 15:55:59 UTC (rev 2488)
@@ -1,32 +0,0 @@
-Index: wengophone-1.0.99+2.0.0-trunk-svn7079/wifo/phapi/SConscript
-===================================================================
---- wengophone-1.0.99+2.0.0-trunk-svn7079.orig/wifo/phapi/SConscript 2006-08-02 16:38:42.000000000 +0000
-+++ wengophone-1.0.99+2.0.0-trunk-svn7079/wifo/phapi/SConscript 2006-08-02 16:38:44.000000000 +0000
-@@ -36,9 +36,14 @@
- amr = amr_env.WengoPlugin('phamrplugin', ['phcodec-amr-wrapper.c'])
-
- speex_env = WengoGetEnvironment()
--speex_libs = [
-- 'speex',
--]
-+
-+speex_libs = []
-+if WengoOSLinux():
-+ speex_env.ParseConfig('pkg-config --cflags --libs speex')
-+else:
-+ speex_libs += [
-+ 'speex',
-+ ]
-
- speex_env.WengoUseLibraries(speex_libs)
- speex_env.WengoAddCCFlags(WengoGetVariable('phapi_optimization_flags'))
-Index: wengophone-1.0.99+2.0.0-trunk-svn7079/wifo/phapi/speex/SConscript
-===================================================================
---- wengophone-1.0.99+2.0.0-trunk-svn7079.orig/wifo/phapi/speex/SConscript 2006-08-02 16:34:56.000000000 +0000
-+++ wengophone-1.0.99+2.0.0-trunk-svn7079/wifo/phapi/speex/SConscript 2006-08-02 16:38:44.000000000 +0000
-@@ -1,3 +1,4 @@
- env = WengoGetEnvironment()
-
--env.SConscript('libspeex/SConscript')
-+if not WengoOSLinux():
-+ env.SConscript('libspeex/SConscript')
Deleted: wengophone/branches/cmake/debian/patches/006_wengoscons-install.patch
===================================================================
--- wengophone/branches/cmake/debian/patches/006_wengoscons-install.patch 2006-10-03 21:33:23 UTC (rev 2487)
+++ wengophone/branches/cmake/debian/patches/006_wengoscons-install.patch 2006-10-06 15:55:59 UTC (rev 2488)
@@ -1,182 +0,0 @@
-Index: wengophone-2.0.0~rc2-svn7476/wengophone/src/presentation/qt/QtWengoPhoneInstall
-===================================================================
---- 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"
--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")
-+ base_install_dir = "/usr/local"
-+
-+dest_install_dir = WengoGetConsoleArgument("destdir")
-+if dest_install_dir != None:
-+ base_install_dir = dest_install_dir + base_install_dir
-+
-+bin_install_dir = WengoGetConsoleArgument("bindir")
-+if bin_install_dir == None:
-+ bin_install_dir = os.path.join(base_install_dir, "bin")
-+
-+lib_suffix = WengoGetConsoleArgument("libsuffix")
-+lib_install_dir = WengoGetConsoleArgument("libdir")
-+if lib_install_dir == None:
-+ if lib_suffix == None:
-+ lib_install_dir = os.path.join(base_install_dir, "lib")
-+ else:
-+ lib_install_dir = os.path.join(base_install_dir, "lib" + lib_suffix)
-+
-+data_install_dir = WengoGetConsoleArgument("datadir")
-+if data_install_dir == None:
-+ data_install_dir = os.path.join(base_install_dir, "share", "wengophone")
-+
-
- dlls = [
- ]
-@@ -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("qtwengophone_alias"))
-+targets += env.Install(bin_install_dir, env.WengoGetAlias("qtwengophone_alias"))
-
--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(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"), 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"), emoticons)
--targets += env.Install(os.path.join(lib_install_dir, "lang"), env.WengoGetAlias("qtwengophone-translations"))
--
--wrapper_script = """
--#!/bin/sh
--#
--# Wengophone wrapper script for Linux
--# Author: David Ferlier <david.ferlier at wengo.fr>
--#
--
--cd %s || exit 1
--export LD_LIBRARY_PATH="."
--./wengophone
--"""
--
--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.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
-+
Deleted: wengophone/branches/cmake/debian/patches/007_wengophone-resourcedir.patch
===================================================================
--- wengophone/branches/cmake/debian/patches/007_wengophone-resourcedir.patch 2006-10-03 21:33:23 UTC (rev 2487)
+++ wengophone/branches/cmake/debian/patches/007_wengophone-resourcedir.patch 2006-10-06 15:55:59 UTC (rev 2488)
@@ -1,40 +0,0 @@
-Index: wengophone-2.0.0~rc3-svn7552/wengophone/src/SConscript
-===================================================================
---- 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
-+
- env = WengoGetEnvironment()
-
- WengoPhoneBuildId = {
-@@ -43,6 +45,16 @@
-
- headers = []
-
-+if WengoOSLinux():
-+ base_install_dir = WengoGetConsoleArgument("prefix")
-+ if base_install_dir == None:
-+ base_install_dir = "/usr/local"
-+ data_install_dir = WengoGetConsoleArgument("datadir")
-+ if data_install_dir == None:
-+ data_install_dir = os.path.join(base_install_dir, "share", "wengophone")
-+ defines['WP_RESOURCEDIR'] = '"\'' + data_install_dir + '\'"'
-+
-+
- envBuildId = WengoGetEnvironment()
- if WengoGetConsoleArgument('nobuildid'):
- envBuildId.Append(
-Index: wengophone-2.0.0~rc3-svn7552/wengophone/src/model/config/Config.cpp
-===================================================================
---- 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();
-+#elif defined(OS_LINUX)
-+ resourcesPath = WP_RESOURCEDIR;
- #endif
- _keyDefaultValueMap[RESOURCES_DIR_KEY] = resourcesPath;
- _keyDefaultValueMap[EXECUTABLE_NAME_KEY] = empty;
Deleted: wengophone/branches/cmake/debian/patches/008_wengoscons-qt-debug.patch
===================================================================
--- wengophone/branches/cmake/debian/patches/008_wengoscons-qt-debug.patch 2006-10-03 21:33:23 UTC (rev 2487)
+++ wengophone/branches/cmake/debian/patches/008_wengoscons-qt-debug.patch 2006-10-06 15:55:59 UTC (rev 2488)
@@ -1,22 +0,0 @@
-Index: wengophone-2.0.0~rc2-svn7476/wengoscons/libs/qt4/SConscript
-===================================================================
---- 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():
-- if WengoDebugMode():
-+ conf = Configure(env)
-+ if WengoDebugMode() and conf.CheckLib('QtCore_debug'):
- libs += [
- 'QtCore_debug',
- 'QtGui_debug',
-@@ -184,6 +185,7 @@
- 'QtSvg',
- 'QtUiTools',
- ]
-+ env = conf.Finish()
- include_path += [os.path.join(qtdir, 'mkspecs', 'linux-g++')]
-
- elif WengoOSMacOSX():
Deleted: wengophone/branches/cmake/debian/patches/009_wengoscons-qt-resources.patch
===================================================================
--- wengophone/branches/cmake/debian/patches/009_wengoscons-qt-resources.patch 2006-10-03 21:33:23 UTC (rev 2487)
+++ wengophone/branches/cmake/debian/patches/009_wengoscons-qt-resources.patch 2006-10-06 15:55:59 UTC (rev 2488)
@@ -1,53 +0,0 @@
-Index: wengophone-2.0.0~rc2-svn7476/wengoscons/wengoscons/wengoenv.py
-===================================================================
---- 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()
-- dir = os.path.dirname(os.path.join(self.__getSourcePath(), qrcFile))
-+ absQrcFile = os.path.join(self.__getSourcePath(), qrcFile)
-+ dir = os.path.dirname(absQrcFile)
- 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)
-+ if outputFileMtime > os.path.getmtime(absQrcFile):
-+ return absOutputFile
-+
- 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):
- """
-@@ -1633,13 +1641,21 @@
- uic = os.path.join(qtdir, 'bin', 'uic')
-
- self.__saveCurrentSourcePath()
-- dir = os.path.dirname(os.path.join(self.__getSourcePath(), uiFile))
-+ absUiFile = os.path.join(self.__getSourcePath(), uiFile)
-+ dir = os.path.dirname(absUiFile)
- 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)
-+ if outputFileMtime > os.path.getmtime(absUiFile):
-+ return absOutputFile
-+
- os.system(uic + ' ' + os.path.basename(uiFile) + ' -o ' + outputFile)
-- return os.path.join(dir, outputFile)
-+
-+ return absOutputFile
-
- def WengoCreateFile(self, filename, fileTemplate, fileData):
- """
Deleted: wengophone/branches/cmake/debian/patches/010_wengophone-phapi.patch
===================================================================
--- wengophone/branches/cmake/debian/patches/010_wengophone-phapi.patch 2006-10-03 21:33:23 UTC (rev 2487)
+++ wengophone/branches/cmake/debian/patches/010_wengophone-phapi.patch 2006-10-06 15:55:59 UTC (rev 2488)
@@ -1,25 +0,0 @@
-Index: wengophone-2.0.0~rc3-svn7552/wifo/phapi/SConscript
-===================================================================
---- 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()
-
-+# 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')
Deleted: wengophone/branches/cmake/debian/patches/011_install-sfp-plugin-so.patch
===================================================================
--- wengophone/branches/cmake/debian/patches/011_install-sfp-plugin-so.patch 2006-10-03 21:33:23 UTC (rev 2487)
+++ wengophone/branches/cmake/debian/patches/011_install-sfp-plugin-so.patch 2006-10-06 15:55:59 UTC (rev 2488)
@@ -1,28 +0,0 @@
-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)
Deleted: wengophone/branches/cmake/debian/patches/200_add_rpath.patch
===================================================================
--- wengophone/branches/cmake/debian/patches/200_add_rpath.patch 2006-10-03 21:33:23 UTC (rev 2487)
+++ wengophone/branches/cmake/debian/patches/200_add_rpath.patch 2006-10-06 15:55:59 UTC (rev 2488)
@@ -1,12 +0,0 @@
-Index: wengophone-2.0.0~rc3-svn7552/wengophone/src/presentation/qt/SConscript
-===================================================================
---- 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',]
-+ env.Append( RPATH = env.Literal('/usr/lib/wengophone'))
- if WengoGetConsoleArgument('enable-xv-hwaccel'):
- include_path += ['/usr/X11R6/include',]
- libs += ['Xv',]
Added: wengophone/branches/cmake/debian/patches/200_no-crashreport.patch
===================================================================
--- wengophone/branches/cmake/debian/patches/200_no-crashreport.patch (rev 0)
+++ wengophone/branches/cmake/debian/patches/200_no-crashreport.patch 2006-10-06 15:55:59 UTC (rev 2488)
@@ -0,0 +1,12 @@
+Index: wengophone-2.0.0~rc4-svn7946/CMakeLists.txt
+===================================================================
+--- wengophone-2.0.0~rc4-svn7946.orig/CMakeLists.txt 2006-10-06 12:24:17.000000000 +0000
++++ wengophone-2.0.0~rc4-svn7946/CMakeLists.txt 2006-10-06 12:24:25.000000000 +0000
+@@ -61,6 +61,6 @@
+ libs/sipwrapper/src/phapi
+ libs/imwrapper/src/multiim
+ wengophone
+- crashreport
++# crashreport
+ )
+
Added: wengophone/branches/cmake/debian/patches/201_cmake-svnrelease-from-debian-changelog.patch
===================================================================
--- wengophone/branches/cmake/debian/patches/201_cmake-svnrelease-from-debian-changelog.patch (rev 0)
+++ wengophone/branches/cmake/debian/patches/201_cmake-svnrelease-from-debian-changelog.patch 2006-10-06 15:55:59 UTC (rev 2488)
@@ -0,0 +1,40 @@
+Index: wengophone-2.0.0~rc4-svn7946/cmake/Modules/MacroGetSubversionRevision.cmake
+===================================================================
+--- wengophone-2.0.0~rc4-svn7946.orig/cmake/Modules/MacroGetSubversionRevision.cmake 2006-10-06 13:33:32.000000000 +0000
++++ wengophone-2.0.0~rc4-svn7946/cmake/Modules/MacroGetSubversionRevision.cmake 2006-10-06 15:29:45.000000000 +0000
+@@ -32,6 +32,35 @@
+ else (_SVN_REVISION_RESULT_VARIABLE EQUAL 0)
+ set(_SVN_REVISION 0)
+ endif (_SVN_REVISION_RESULT_VARIABLE EQUAL 0)
++ else (_SVN_EXECUTEABLE AND _SVN_DOT_DIR)
++ find_file(_DEBIAN_CHANGELOG
++ NAMES
++ changelog
++ PATHS
++ ${CMAKE_SOURCE_DIR}/debian
++ )
++
++ if (_DEBIAN_CHANGELOG)
++ message("-- Generating subversion revison using debian/changelog")
++ execute_process(
++ COMMAND
++ sed -ne "1s/^[^(]*([^)]*svn\\([^)]\\+\\)-[0-9]\\+).*$/\\1/p" ${_DEBIAN_CHANGELOG}
++ COMMAND
++ tr -d "\\n"
++ RESULT_VARIABLE
++ _SVN_REVISION_RESULT_VARIABLE
++ OUTPUT_VARIABLE
++ _SVN_REVISION_OUTPUT_VARIABLE
++ )
++
++ if (_SVN_REVISION_RESULT_VARIABLE EQUAL 0)
++ set(_SVN_REVISION ${_SVN_REVISION_OUTPUT_VARIABLE})
++ else (_SVN_REVISION_RESULT_VARIABLE EQUAL 0)
++ set(_SVN_REVISION 0)
++ endif (_SVN_REVISION_RESULT_VARIABLE EQUAL 0)
++
++ endif (_DEBIAN_CHANGELOG)
++
+ endif (_SVN_EXECUTEABLE AND _SVN_DOT_DIR)
+
+ set(${_revision}
Modified: wengophone/branches/cmake/debian/patches/series
===================================================================
--- wengophone/branches/cmake/debian/patches/series 2006-10-03 21:33:23 UTC (rev 2487)
+++ wengophone/branches/cmake/debian/patches/series 2006-10-06 15:55:59 UTC (rev 2488)
@@ -1 +1,6 @@
-
+000_cmake-static-owcurl.patch
+001_cmake-fix-static-phapi.patch
+002_cmake-fix-static-sfp-plugin.patch
+003_cmake-amrplugin-pic-code.patch
+200_no-crashreport.patch
+201_cmake-svnrelease-from-debian-changelog.patch
Modified: wengophone/branches/cmake/debian/rules
===================================================================
--- wengophone/branches/cmake/debian/rules 2006-10-03 21:33:23 UTC (rev 2487)
+++ wengophone/branches/cmake/debian/rules 2006-10-06 15:55:59 UTC (rev 2488)
@@ -5,7 +5,8 @@
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_INSTALL_MANPAGES_wengophone := $(CURDIR)/debian/qtwengophone.1
-DEB_CMAKE_EXTRA_FLAGS := -DWITH_BUILDID=OFF -DCMAKE_BUILD_TYPE=Debug
+DEB_CMAKE_EXTRA_FLAGS := -DWITH_BUILDID=ON -DWITH_SHARED_PHAPI=OFF \
+ -DWITH_SHARED_OWCURL=OFF -DWITH_SHARED_SFP-PLUGIN=OFF
DEBVERSION:=$(shell head -n 1 debian/changelog | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9]*$$//' -e 's/-svn.*$$//' -e 's/.dfsg$$//')
More information about the Pkg-voip-commits
mailing list