rev 14449 - in kde-extras/kmess/trunk/debian: . patches

[George Kiagiadakis]

Author: gkiagia-guest
Date: 2009-04-19 23:15:42 +0000 (Sun, 19 Apr 2009)
New Revision: 14449

Added:
   kde-extras/kmess/trunk/debian/patches/
   kde-extras/kmess/trunk/debian/patches/01_dont-build-depend-on-libqca2-plugin-ossl.diff
Modified:
   kde-extras/kmess/trunk/debian/changelog
   kde-extras/kmess/trunk/debian/control
   kde-extras/kmess/trunk/debian/rules
Log:
Attempt to fix FTBFS.


Modified: kde-extras/kmess/trunk/debian/changelog
===================================================================
--- kde-extras/kmess/trunk/debian/changelog	2009-04-19 23:11:02 UTC (rev 14448)
+++ kde-extras/kmess/trunk/debian/changelog	2009-04-19 23:15:42 UTC (rev 14449)
@@ -1,9 +1,16 @@
 kmess (2.0~beta1-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  
+  +++ Changes by George Kiagiadakis:
 
- -- Mark Purcell <msp at debian.org>  Sun, 12 Apr 2009 14:04:03 +1000
+  * Fix FTBFS (Closes: #524085)
+    - Add patch 01_dont-build-depend-on-libqca2-plugin-ossl.diff.
+    - Depend on libqca2-plugin-ossl.
+    - Build-depend on libxss-dev.
 
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Mon, 20 Apr 2009 02:10:07 +0300
+
 kmess (2.0~beta1-1) unstable; urgency=low
 
   * New upstream release

Modified: kde-extras/kmess/trunk/debian/control
===================================================================
--- kde-extras/kmess/trunk/debian/control	2009-04-19 23:11:02 UTC (rev 14448)
+++ kde-extras/kmess/trunk/debian/control	2009-04-19 23:15:42 UTC (rev 14449)
@@ -4,7 +4,7 @@
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Mario Iseli <admin at marioiseli.com>, Mark Purcell <msp at debian.org>
 Build-Depends: debhelper (>= 4.1), cdbs, zlib1g-dev, patchutils, automoc, libxml2-dev, libxslt1-dev, libqca2-dev,
- pkg-kde-tools, kdelibs5-dev, libkonq5-dev, libphonon-dev
+ pkg-kde-tools, kdelibs5-dev, libkonq5-dev, libphonon-dev, libxss-dev
 Standards-Version: 3.8.1
 Homepage:  http://kmess.sourceforge.net
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kmess/?op=log
@@ -12,7 +12,7 @@
 
 Package: kmess
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqca2-plugin-ossl
 Suggests: konqueror
 Description: MSN messenger for KDE
  An alternative MSN Messenger chat client for Linux. It allows Linux users

Added: kde-extras/kmess/trunk/debian/patches/01_dont-build-depend-on-libqca2-plugin-ossl.diff
===================================================================
--- kde-extras/kmess/trunk/debian/patches/01_dont-build-depend-on-libqca2-plugin-ossl.diff	                        (rev 0)
+++ kde-extras/kmess/trunk/debian/patches/01_dont-build-depend-on-libqca2-plugin-ossl.diff	2009-04-19 23:15:42 UTC (rev 14449)
@@ -0,0 +1,13 @@
+Index: kmess/CMakeLists.txt
+===================================================================
+--- kmess.orig/CMakeLists.txt	2009-02-22 17:29:15.000000000 +0200
++++ kmess/CMakeLists.txt	2009-02-22 17:44:00.000000000 +0200
+@@ -42,7 +42,7 @@
+ # so we need to ask QCA itself it it's got such a plugin. Pretty darned unportable stuff.
+ IF( QCA2_FOUND )
+   IF( UNIX )
+-    EXECUTE_PROCESS( COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/cmake/check-qca2-ossl.sh OUTPUT_VARIABLE HAS_QCA2_OSSL_PLUGIN )
++    SET(HAS_QCA2_OSSL_PLUGIN 1)
+     IF( HAS_QCA2_OSSL_PLUGIN EQUAL 1 )
+     SET( QCA2_OSSL_PLUGIN_FOUND TRUE )
+     ELSE( HAS_QCA2_OSSL_PLUGIN EQUAL 1 )

Modified: kde-extras/kmess/trunk/debian/rules
===================================================================
--- kde-extras/kmess/trunk/debian/rules	2009-04-19 23:11:02 UTC (rev 14448)
+++ kde-extras/kmess/trunk/debian/rules	2009-04-19 23:15:42 UTC (rev 14449)
@@ -6,6 +6,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_INSTALL_MANPAGES_kmess := debian/kmess.1
 DEB_INSTALL_MENU_ARGS := debian/kmess.menu