[Pkg-voip-commits] r6917 - in /qutecom/trunk/debian: changelog control patches/series rules

[cavedon-guest at alioth.debian.org]

Author: cavedon-guest
Date: Fri Mar 27 05:21:09 2009
New Revision: 6917

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6917
Log:
Revert back to internal libpurple

Modified:
    qutecom/trunk/debian/changelog
    qutecom/trunk/debian/control
    qutecom/trunk/debian/patches/series
    qutecom/trunk/debian/rules

Modified: qutecom/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/changelog?rev=6917&op=diff
==============================================================================
--- qutecom/trunk/debian/changelog (original)
+++ qutecom/trunk/debian/changelog Fri Mar 27 05:21:09 2009
@@ -1,4 +1,4 @@
-qutecom (2.2~rc3.dfsg2-1) UNRELEASED; urgency=low
+qutecom (2.2~rc3.dfsg1-5) UNRELEASED; urgency=low
 
   * Use newer Boost libraries.
   * Update README.Debian about video support. 
@@ -7,15 +7,10 @@
   * Add patch generic/pixelformat.patch: compilation fix, required by newer
     ffmpeg libs.
   * Update debhelper compatibility to 7.
-  * Use system libpurple.
-  * debian/purple_perl_tcl_noload.patch: temporary hack to prevent libpurple
-    from loading buggy tcl and perl plugins.
-  * generic/accept_certificate.patch: accept non-matching SSL certificate by
-    default (replicate behavior of libpurple with openssl).
-  * debian/patches/generic/libpurple_debug.patch: add OW_PURPLE_DEBUG env
-    variable to enable libpurple debugging.
-
- -- Ludovico Cavedon <ludovico.cavedon at gmail.com>  Wed, 25 Mar 2009 21:44:03 -0700
+  * debian/patches/generic/libpurple_debug.patch: add OW_PURPLE_DEBUG
+    environment variable to enable libpurple debugging.
+
+ -- Ludovico Cavedon <ludovico.cavedon at gmail.com>  Thu, 26 Mar 2009 21:02:02 -0700
 
 qutecom (2.2~rc3.dfsg1-4) experimental; urgency=low
 

Modified: qutecom/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/control?rev=6917&op=diff
==============================================================================
--- qutecom/trunk/debian/control (original)
+++ qutecom/trunk/debian/control Fri Mar 27 05:21:09 2009
@@ -9,7 +9,7 @@
  libswscale-dev (>= 0.cvs20060823-3.1), libgnutls-dev (>= 1.2.9),
  libboost-serialization1.37-dev, libboost-thread1.37-dev,
  libboost-regex1.37-dev, libboost-signals1.37-dev,
- libboost-program-options1.37-dev, uuid-dev, libpurple-dev (>= 2.5.5),
+ libboost-program-options1.37-dev, 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),

Modified: qutecom/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/series?rev=6917&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/series (original)
+++ qutecom/trunk/debian/patches/series Fri Mar 27 05:21:09 2009
@@ -7,8 +7,8 @@
 generic/boost_1_37.patch
 generic/pixelfromat.patch
 generic/libpurple_debug.patch
-generic/accept_certificate.patch
+#generic/accept_certificate.patch
 debian/cmake-noavformat.patch
 debian/remove-extra-copying-file.patch
 debian/cmake-force-fpic.patch
-debian/purple_perl_tcl_noload.patch
+#debian/purple_perl_tcl_noload.patch

Modified: qutecom/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/rules?rev=6917&op=diff
==============================================================================
--- qutecom/trunk/debian/rules (original)
+++ qutecom/trunk/debian/rules Fri Mar 27 05:21:09 2009
@@ -19,7 +19,7 @@
 	-DSPEEX_INTERNAL=OFF \
 	-DSAMPLERATE_INTERNAL=OFF \
 	-DCURL_INTERNAL=OFF \
-	-DLIBPURPLE_INTERNAL=OFF \
+	-DLIBPURPLE_INTERNAL=ON \
 	-DPHAPI_VIDEO_SUPPORT=ON \
 	-DHAVE_SWSCALE=1