rev 15298 - in kde-extras/taskjuggler/trunk/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2009-07-16 09:44:01 +0000 (Thu, 16 Jul 2009)
New Revision: 15298

Added:
   kde-extras/taskjuggler/trunk/debian/patches/00_fix_reportcontroller_ftbfs.diff
Modified:
   kde-extras/taskjuggler/trunk/debian/changelog
   kde-extras/taskjuggler/trunk/debian/control
   kde-extras/taskjuggler/trunk/debian/patches/series
   kde-extras/taskjuggler/trunk/debian/rules
Log:
Fix the ftbfs.


Modified: kde-extras/taskjuggler/trunk/debian/changelog
===================================================================
--- kde-extras/taskjuggler/trunk/debian/changelog	2009-07-16 08:34:09 UTC (rev 15297)
+++ kde-extras/taskjuggler/trunk/debian/changelog	2009-07-16 09:44:01 UTC (rev 15298)
@@ -6,12 +6,13 @@
 
   [Fathi Boudra]
   * Bump compat/debhelper to 7.
+  * Add patch to fix FTBFS on ReportController.ui generated source code.
   * Update debian/control:
     - replace kdelibs4-dev by libqt3-mt-dev build dependency.
     - remove libkcal2-dev | kdepim-dev build dependency.
     - bump Standards-Version from 3.7.3 to 3.8.2 (no changes needed).
   * Update debian/rules:
-    - add configure options --with-kde-support=no and --with-ical-support=no.
+    - add configure options --with-ical-support=no.
 
   [Sarah Hobbs]
   * Recommend khelpcenter4, so that the help and tutorial are usable.

Modified: kde-extras/taskjuggler/trunk/debian/control
===================================================================
--- kde-extras/taskjuggler/trunk/debian/control	2009-07-16 08:34:09 UTC (rev 15297)
+++ kde-extras/taskjuggler/trunk/debian/control	2009-07-16 09:44:01 UTC (rev 15298)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Fathi Boudra <fabo at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), quilt, automake, libqt3-mt-dev,
+Build-Depends: cdbs, debhelper (>= 7), quilt, automake, kdelibs4-dev,
  poster, docbook2x, docbook-to-man, docbook-utils,
  docbook-xml, openjade, xsltproc
 Standards-Version: 3.8.2

Added: kde-extras/taskjuggler/trunk/debian/patches/00_fix_reportcontroller_ftbfs.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/00_fix_reportcontroller_ftbfs.diff	                        (rev 0)
+++ kde-extras/taskjuggler/trunk/debian/patches/00_fix_reportcontroller_ftbfs.diff	2009-07-16 09:44:01 UTC (rev 15298)
@@ -0,0 +1,17 @@
+author: Fathi Boudra <fabo at debian.org>
+
+Fix FTBFS on ReportController.ui
+It seems uic3 doesn't generate kdateedit include as expected.
+
+--- a/TaskJugglerUI/ReportController.ui
++++ b/TaskJugglerUI/ReportController.ui
+@@ -131,6 +131,8 @@
+ <includehints>
+     <includehint>klistviewsearchline.h</includehint>
+     <includehint>kdateedit.h</includehint>
+-    <includehint>kdateedit.h</includehint>
+ </includehints>
++<includes>
++    <include location="global" impldecl="in declaration">kdateedit.h</include>
++</includes>
+ </UI>

Modified: kde-extras/taskjuggler/trunk/debian/patches/series
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/series	2009-07-16 08:34:09 UTC (rev 15297)
+++ kde-extras/taskjuggler/trunk/debian/patches/series	2009-07-16 09:44:01 UTC (rev 15298)
@@ -1,3 +1,4 @@
+00_fix_reportcontroller_ftbfs.diff
 02_autotools_update.diff
 03_libtool_update.diff
 04_am_maintainer_mode.diff

Modified: kde-extras/taskjuggler/trunk/debian/rules
===================================================================
--- kde-extras/taskjuggler/trunk/debian/rules	2009-07-16 08:34:09 UTC (rev 15297)
+++ kde-extras/taskjuggler/trunk/debian/rules	2009-07-16 09:44:01 UTC (rev 15298)
@@ -11,7 +11,7 @@
 
 DEB_BUILDDIR = .
 DEB_CONFIGURE_EXTRA_FLAGS := --with-docdir=/usr/share/doc/kde/HTML/en/taskjuggler/ \
-                             --with-kde-support=no --with-ical-support=no
+                             --with-ical-support=no
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-undefined -Wl,--as-needed"
 
 install/taskjuggler::