rev 4890 - in trunk/packages/kdesdk/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2006-11-11 01:52:35 +0100 (Sat, 11 Nov 2006)
New Revision: 4890

Added:
   trunk/packages/kdesdk/debian/patches/07_support_automake1-10_in_template.diff
Modified:
   trunk/packages/kdesdk/debian/changelog
   trunk/packages/kdesdk/debian/control
Log:
Adds support for automake 1.10 in automake
adds suggestion of docs to kunittest


Modified: trunk/packages/kdesdk/debian/changelog
===================================================================
--- trunk/packages/kdesdk/debian/changelog	2006-11-10 21:22:01 UTC (rev 4889)
+++ trunk/packages/kdesdk/debian/changelog	2006-11-11 00:52:35 UTC (rev 4890)
@@ -1,12 +1,18 @@
 kdesdk (4:3.5.5-2) unstable; urgency=low
 
+  [ Debian Qt/KDE Maintainers ]
   +++ Changes by Fathi Boudra:
 
   * Rename svn-clean and svnversions to svn-clean-kde and svnversion-kde to
     avoid conflicts and mistakes with subversion scripts (Closes: #397874)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 10 Nov 2006 14:55:16 +0100
+  [ Sune Vuorela ]
+  * add support for automake 1.10 in templates (Closes: 396985)
+  * adds suggests: kdelibs4-doc to kunittest, this is where the docs are
+    (Closes: 386040)
 
+ -- Sune Vuorela <debian at pusling.com>  Sat, 11 Nov 2006 01:15:41 +0100
+
 kdesdk (4:3.5.5-1) unstable; urgency=low
 
   [ Debian Qt/KDE Maintainers ]

Modified: trunk/packages/kdesdk/debian/control
===================================================================
--- trunk/packages/kdesdk/debian/control	2006-11-10 21:22:01 UTC (rev 4889)
+++ trunk/packages/kdesdk/debian/control	2006-11-11 00:52:35 UTC (rev 4890)
@@ -360,6 +360,7 @@
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
+Suggests: kdelibs4-doc
 Description: unit testing library for KDE
  KUnitTest is a small library that facilitates the writing of tests for
  KDE developers. There are two ways to use the KUnitTest library. One is

Added: trunk/packages/kdesdk/debian/patches/07_support_automake1-10_in_template.diff
===================================================================
--- trunk/packages/kdesdk/debian/patches/07_support_automake1-10_in_template.diff	2006-11-10 21:22:01 UTC (rev 4889)
+++ trunk/packages/kdesdk/debian/patches/07_support_automake1-10_in_template.diff	2006-11-11 00:52:35 UTC (rev 4890)
@@ -0,0 +1,11 @@
+--- kapptemplate/admin/cvs.sh.orig	2006-11-11 00:53:47.000000000 +0100
++++ kapptemplate/admin/cvs.sh	2006-11-11 00:54:50.000000000 +0100
+@@ -68,7 +68,7 @@
+     echo "*** KDE requires automake $required_automake_version"
+     exit 1
+     ;;
+-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*)
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) 
+     echo "*** $AUTOMAKE_STRING found."
+     UNSERMAKE=no
+     ;;