rev 15406 - in kde-extras/kchmviewer/trunk/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2009-07-29 20:26:13 +0000 (Wed, 29 Jul 2009)
New Revision: 15406

Added:
   kde-extras/kchmviewer/trunk/debian/patches/
   kde-extras/kchmviewer/trunk/debian/patches/01_disable_kio-msits_build.diff
   kde-extras/kchmviewer/trunk/debian/patches/series
Modified:
   kde-extras/kchmviewer/trunk/debian/changelog
   kde-extras/kchmviewer/trunk/debian/control
Log:
Add patch to disable kio-msits build to avoid okular-extra-backends conflict.


Modified: kde-extras/kchmviewer/trunk/debian/changelog
===================================================================
--- kde-extras/kchmviewer/trunk/debian/changelog	2009-07-29 20:11:03 UTC (rev 15405)
+++ kde-extras/kchmviewer/trunk/debian/changelog	2009-07-29 20:26:13 UTC (rev 15406)
@@ -1,11 +1,13 @@
 kchmviewer (4.1-1) unstable; urgency=low
 
   * New upstream release. (Closes: #479402, #496888)
+  * Add patch to disable kio-msits build to avoid okular-extra-backends
+    conflict.
   * Bump compat/debhelper to 7.
   * Update debian/control:
     - Set Debian KDE Extras Team as Maintainer and myself in Uploaders.
     - Update build dependencies:
-      - Add cmake and pkg-kde-tools
+      - Add cmake, quilt and pkg-kde-tools
       - Replace kdelibs4-dev by kdelibs5-dev
       - Remove autotools-dev
     - Update Standards-Version to 3.8.2 (no changes needed).

Modified: kde-extras/kchmviewer/trunk/debian/control
===================================================================
--- kde-extras/kchmviewer/trunk/debian/control	2009-07-29 20:11:03 UTC (rev 15405)
+++ kde-extras/kchmviewer/trunk/debian/control	2009-07-29 20:26:13 UTC (rev 15406)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Jose Luis Tallon <jltallon at adv-solutions.net>
-Build-Depends: debhelper (>= 7.3.8), cmake, pkg-kde-tools (>= 0.4.11),
+Build-Depends: debhelper (>= 7.3.8), cmake, quilt, pkg-kde-tools (>= 0.4.11),
  kdelibs5-dev, libchm-dev
 Standards-Version: 3.8.2
 Homepage: http://www.kchmviewer.net/

Added: kde-extras/kchmviewer/trunk/debian/patches/01_disable_kio-msits_build.diff
===================================================================
--- kde-extras/kchmviewer/trunk/debian/patches/01_disable_kio-msits_build.diff	                        (rev 0)
+++ kde-extras/kchmviewer/trunk/debian/patches/01_disable_kio-msits_build.diff	2009-07-29 20:26:13 UTC (rev 15406)
@@ -0,0 +1,9 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -18,6 +18,5 @@ ADD_DEFINITIONS( -DUSE_KDE )
+ 
+ # Run in those subdirectories
+ ADD_SUBDIRECTORY( lib/libchmfile )
+-ADD_SUBDIRECTORY( lib/kio-msits )
+ ADD_SUBDIRECTORY( src )
+ ADD_SUBDIRECTORY( po )

Added: kde-extras/kchmviewer/trunk/debian/patches/series
===================================================================
--- kde-extras/kchmviewer/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/kchmviewer/trunk/debian/patches/series	2009-07-29 20:26:13 UTC (rev 15406)
@@ -0,0 +1 @@
+01_disable_kio-msits_build.diff