[Pkg-voip-commits] r4256 - in wengophone/trunk/debian: . backports patches patches/generic

cavedon-guest at alioth.debian.org cavedon-guest at alioth.debian.org
Thu Aug 23 13:02:51 UTC 2007 

Author: cavedon-guest
Date: 2007-08-23 13:02:50 +0000 (Thu, 23 Aug 2007)
New Revision: 4256

Added:
   wengophone/trunk/debian/patches/generic/def-enable-video-fix.patch
Modified:
   wengophone/trunk/debian/backports/etch
   wengophone/trunk/debian/backports/feisty
   wengophone/trunk/debian/changelog
   wengophone/trunk/debian/control
   wengophone/trunk/debian/patches/generic/desktop-file-update.patch
   wengophone/trunk/debian/patches/series
   wengophone/trunk/debian/rules
Log:
* Added patch def-enable-video-fix.patch to make PHAPI_VIDEO_SUPPORT=OFF work
* Disabled video support for sid, as mpeg-based video codecs have been removed
  from ffmpeg. Closes: #434389
* Added desktop-file-update.patch to remove deprecated "Encoding" line
  (lintian info desktop-entry-contains-encoding-key)


Modified: wengophone/trunk/debian/backports/etch
===================================================================
--- wengophone/trunk/debian/backports/etch	2007-08-23 11:20:14 UTC (rev 4255)
+++ wengophone/trunk/debian/backports/etch	2007-08-23 13:02:50 UTC (rev 4256)
@@ -6,6 +6,7 @@
 
 sed -i -e 's#\(libboost-[-a-z]*-dev *( *>= *\)1.34[^)]*)#\11.33)#g' debian/control
 sed -i -e 's#libcurl4-openssl-dev[^)]*)#g++-3.4#g' debian/control
-sed -i -e 's#-DCURL_INTERNAL=OFF#-DCURL_INTERNAL=ON \\\n\t-DCMAKE_C_COMPILER=$(shell which gcc-3.4) \\\n\t-DCMAKE_CXX_COMPILER=$(shell which g++-3.4)#' debian/rules
+sed -i -e 's#-DCURL_INTERNAL=OFF#-DCURL_INTERNAL=ON#' debian/rules
+sed -i -e 's#-DPHAPI_VIDEO_SUPPORT=OFF#-DPHAPI_VIDEO_SUPPORT=ON \\\n\t-DCMAKE_C_COMPILER=$(shell which gcc-3.4) \\\n\t-DCMAKE_CXX_COMPILER=$(shell which g++-3.4)#' debian/rules
 
 exit 0

Modified: wengophone/trunk/debian/backports/feisty
===================================================================
--- wengophone/trunk/debian/backports/feisty	2007-08-23 11:20:14 UTC (rev 4255)
+++ wengophone/trunk/debian/backports/feisty	2007-08-23 13:02:50 UTC (rev 4256)
@@ -6,6 +6,7 @@
 
 sed -i -e 's#\(libboost-[-a-z]*-dev *( *>= *\)1.34[^)]*)#\11.33)#g' debian/control
 sed -i -e 's#libcurl4-openssl-dev[^)]*)#g++-3.4#g' debian/control
-sed -i -e 's#-DCURL_INTERNAL=OFF#-DCURL_INTERNAL=ON \\\n\t-DCMAKE_C_COMPILER=$(shell which gcc-3.4) \\\n\t-DCMAKE_CXX_COMPILER=$(shell which g++-3.4)#' debian/rules
+sed -i -e 's#-DCURL_INTERNAL=OFF#-DCURL_INTERNAL=ON#' debian/rules
+sed -i -e 's#-DPHAPI_VIDEO_SUPPORT=OFF#-DPHAPI_VIDEO_SUPPORT=ON \\\n\t-DCMAKE_C_COMPILER=$(shell which gcc-3.4) \\\n\t-DCMAKE_CXX_COMPILER=$(shell which g++-3.4)#' debian/rules
 
 exit 0

Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog	2007-08-23 11:20:14 UTC (rev 4255)
+++ wengophone/trunk/debian/changelog	2007-08-23 13:02:50 UTC (rev 4256)
@@ -14,8 +14,13 @@
     messages with no Content-Type. Closes: #438419
   * Moved menu item to Applications/Network/Communication to conform to new
     Debian Policy (lintian warning menu-item-uses-apps-section)
+  * Added patch def-enable-video-fix.patch to make PHAPI_VIDEO_SUPPORT=OFF work
+  * Disabled video support for sid, as mpeg-based video codecs have been removed
+    from ffmpeg. Closes: #434389
+  * Added desktop-file-update.patch to remove deprecated "Encoding" line
+    (lintian info desktop-entry-contains-encoding-key)
 
- -- Ludovico Cavedon <cavedon at sssup.it>  Thu, 23 Aug 2007 13:17:31 +0200
+ -- Ludovico Cavedon <cavedon at sssup.it>  Thu, 23 Aug 2007 11:40:32 +0000
 
 wengophone (2.1.1.dfsg0-2) unstable; urgency=low
 

Modified: wengophone/trunk/debian/control
===================================================================
--- wengophone/trunk/debian/control	2007-08-23 11:20:14 UTC (rev 4255)
+++ wengophone/trunk/debian/control	2007-08-23 13:02:50 UTC (rev 4256)
@@ -13,7 +13,7 @@
  libboost-program-options-dev (>= 1.34.0-1), uuid-dev,
  libasound2-dev (>= 1.0.11), libspeex-dev (>= 1.1.12), libssl-dev (>= 0.9.8a),
  libxml2-dev (>= 2.6.24), libsamplerate0-dev (>= 0.1.2),
- libsndfile1-dev (>= 1.0.12), libcurl4-openssl-dev (>= 7.16.1),
+ libsndfile1-dev (>= 1.0.12), libcurl4-gnutls-dev (>= 7.16.1),
  dpkg-dev (>= 1.13.19)
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-voip/wengophone/trunk

Added: wengophone/trunk/debian/patches/generic/def-enable-video-fix.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/def-enable-video-fix.patch	                        (rev 0)
+++ wengophone/trunk/debian/patches/generic/def-enable-video-fix.patch	2007-08-23 13:02:50 UTC (rev 4256)
@@ -0,0 +1,24 @@
+Index: wengophone-2.1.1.dfsg0/libs/sipwrapper/src/phapi/PhApiWrapper.cpp
+===================================================================
+--- wengophone-2.1.1.dfsg0.orig/libs/sipwrapper/src/phapi/PhApiWrapper.cpp	2007-08-23 11:38:15.000000000 +0000
++++ wengophone-2.1.1.dfsg0/libs/sipwrapper/src/phapi/PhApiWrapper.cpp	2007-08-23 11:38:56.000000000 +0000
+@@ -655,7 +655,9 @@
+ }
+ 
+ void PhApiWrapper::setVideoQuality(EnumVideoQuality::VideoQuality videoQuality) {
++#ifdef ENABLE_VIDEO
+ 	phVideoControlSetWebcamCaptureResolution(320, 240);
++#endif
+ 
+ 	switch(videoQuality) {
+ 	case EnumVideoQuality::VideoQualityNormal:
+@@ -887,7 +889,9 @@
+ }
+ 
+ void PhApiWrapper::flipVideoImage(bool flip) {
++#ifdef ENABLE_VIDEO
+ 	phVideoControlSetCameraFlip((int)flip);
++#endif
+ }
+ 
+ std::string PhApiWrapper::makeSipAddress(const std::string & contactId) {

Modified: wengophone/trunk/debian/patches/generic/desktop-file-update.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/desktop-file-update.patch	2007-08-23 11:20:14 UTC (rev 4255)
+++ wengophone/trunk/debian/patches/generic/desktop-file-update.patch	2007-08-23 13:02:50 UTC (rev 4256)
@@ -1,10 +1,10 @@
-Index: wengophone-2.1.1.dfsg/wengophone/res/wengophone.desktop
+Index: wengophone-2.1.1.dfsg0/wengophone/res/wengophone.desktop
 ===================================================================
---- wengophone-2.1.1.dfsg.orig/wengophone/res/wengophone.desktop	2007-07-16 15:10:06.000000000 +0200
-+++ wengophone-2.1.1.dfsg/wengophone/res/wengophone.desktop	2007-07-16 15:10:13.000000000 +0200
-@@ -1,8 +1,12 @@
+--- wengophone-2.1.1.dfsg0.orig/wengophone/res/wengophone.desktop	2007-03-20 15:51:32.000000000 +0000
++++ wengophone-2.1.1.dfsg0/wengophone/res/wengophone.desktop	2007-08-23 11:35:49.000000000 +0000
+@@ -1,8 +1,11 @@
  [Desktop Entry]
- Encoding=UTF-8
+-Encoding=UTF-8
  Name=WengoPhone
 -Comment=VOIP softphone
 -Comment[fr]=Téléphone VOIP

Modified: wengophone/trunk/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series	2007-08-23 11:20:14 UTC (rev 4255)
+++ wengophone/trunk/debian/patches/series	2007-08-23 13:02:50 UTC (rev 4256)
@@ -9,6 +9,7 @@
 generic/portaudio-avoid-unnecessary-inclusion.patch
 generic/desktop-file-update.patch
 generic/phapi-fix-empty-ctype-dos.patch
+generic/def-enable-video-fix.patch
 debian/remove-extra-copying-file.patch
 debian/cmake-no-rpath_to_link_path.patch
 debian/cmake-force-fpic.patch

Modified: wengophone/trunk/debian/rules
===================================================================
--- wengophone/trunk/debian/rules	2007-08-23 11:20:14 UTC (rev 4255)
+++ wengophone/trunk/debian/rules	2007-08-23 13:02:50 UTC (rev 4256)
@@ -17,7 +17,8 @@
 	-DFFMPEG_INTERNAL=OFF \
 	-DSPEEX_INTERNAL=OFF \
 	-DSAMPLERATE_INTERNAL=OFF \
-	-DCURL_INTERNAL=OFF
+	-DCURL_INTERNAL=OFF \
+	-DPHAPI_VIDEO_SUPPORT=OFF
 
 
 ifeq ($(DEB_HOST_ARCH), i386)

More information about the Pkg-voip-commits mailing list