rev 18626 - in trunk/packages/kde3libs/debian: . patches

[Modestas Vainius]

Author: modax
Date: 2010-08-07 21:15:48 +0000 (Sat, 07 Aug 2010)
New Revision: 18626

Modified:
   trunk/packages/kde3libs/debian/changelog
   trunk/packages/kde3libs/debian/patches/02_exclude_pc_from_dox.diff
Log:
Try different approach to .pc problem.

Modified: trunk/packages/kde3libs/debian/changelog
===================================================================
--- trunk/packages/kde3libs/debian/changelog	2010-08-07 21:02:19 UTC (rev 18625)
+++ trunk/packages/kde3libs/debian/changelog	2010-08-07 21:15:48 UTC (rev 18626)
@@ -13,7 +13,7 @@
     Ricks for the patch.
   * Support opening of KDE 4 khelpcenter in Help -> Handbook. (Closes: #525621)
     Thanks to Ben Burton for the patch.
-  * Do not recurse into dot directories (.pc in particular) with doxygen
+  * Do not recurse into .pc subdirectory with doxygen 
     (patch debian/patches/02_exclude_pc_from_dox.diff).
   * Urgency=medium due to multiple RC bug fixes.
 

Modified: trunk/packages/kde3libs/debian/patches/02_exclude_pc_from_dox.diff
===================================================================
--- trunk/packages/kde3libs/debian/patches/02_exclude_pc_from_dox.diff	2010-08-07 21:02:19 UTC (rev 18625)
+++ trunk/packages/kde3libs/debian/patches/02_exclude_pc_from_dox.diff	2010-08-07 21:15:48 UTC (rev 18626)
@@ -1,20 +1,16 @@
 From: Modestas Vainius <modax at debian.org>
-Description: do not recurse into dot directories with doxygen
+Description: do not recurse into .pc subdirectory with doxygen
 Forwaded: not-needed
 Last-Update: 2010-08-07
 
 --- a/admin/doxygen.sh
 +++ b/admin/doxygen.sh
-@@ -858,10 +858,10 @@ if test "x." = "x$top_builddir" ; then
- 			cp "$QTDOCTAG" qt/qt.tag
- 		fi
+@@ -473,7 +473,7 @@ apidox_toplevel()
  
--		do_subdirs_re "."
-+		do_subdirs_re "[^.]"
+ 	doxygen Doxyfile
  
- 	fi
--else
-+elif test "x$subdir" != "x.pc"; then
- 	if test "x$recurse" = "x1" ; then
- 		do_subdirs_re "$subdir"
- 	else
+-	( cd "$top_srcdir" && grep -l '^include.*Doxyfile.am' `find . -name Makefile.am` ) | sed -e 's+/Makefile.am$++' -e 's+^\./++' | sort > subdirs.in
++	( cd "$top_srcdir" && grep -l '^include.*Doxyfile.am' `find . -name .pc -prune -o -name Makefile.am -print` ) | sed -e 's+/Makefile.am$++' -e 's+^\./++' | sort > subdirs.in
+ 	for i in `cat subdirs.in`
+ 	do
+ 		test "x." = "x$i" && continue;