[Pkg-kde-commits] rev 642 - in branches/kde-3.4.0: cdbs packages/arts/debian packages/kdelibs/debian

[Adeodato Simó]

Author: dato-guest
Date: 2005-03-04 19:55:54 +0100 (Fri, 04 Mar 2005)
New Revision: 642

Modified:
   branches/kde-3.4.0/cdbs/kde.mk
   branches/kde-3.4.0/packages/arts/debian/libarts1.manpages
   branches/kde-3.4.0/packages/arts/debian/rules
   branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-bin.manpages
   branches/kde-3.4.0/packages/kdelibs/debian/rules
Log:
Moved docbook-to-man invocation to cdbs/kde.mk.


Modified: branches/kde-3.4.0/cdbs/kde.mk
===================================================================
--- branches/kde-3.4.0/cdbs/kde.mk	2005-03-04 18:42:50 UTC (rev 641)
+++ branches/kde-3.4.0/cdbs/kde.mk	2005-03-04 18:55:54 UTC (rev 642)
@@ -75,7 +75,20 @@
 		$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR); \
 	fi
 
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+	# Generate man pages for the programs
+	[ -d debian/man/out ] || mkdir debian/man/out
+	for f in $$(find debian/man -name '*.sgml'); do \
+		 docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+	done
+	touch debian/stamp-man-pages
+
 clean::
+	 rm -rf debian/man/out
+	 rm -f debian/stamp-man-pages
+
+clean::
 	if test -n "$(DEB_KDE_CVS_MAKE)"; then \
 		find . -name Makefile.in -print | \
 			xargs --no-run-if-empty rm -f; \

Modified: branches/kde-3.4.0/packages/arts/debian/libarts1.manpages
===================================================================
--- branches/kde-3.4.0/packages/arts/debian/libarts1.manpages	2005-03-04 18:42:50 UTC (rev 641)
+++ branches/kde-3.4.0/packages/arts/debian/libarts1.manpages	2005-03-04 18:55:54 UTC (rev 642)
@@ -1 +1 @@
-debian/man/artscat.1
+debian/man/out/artscat.1

Modified: branches/kde-3.4.0/packages/arts/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/arts/debian/rules	2005-03-04 18:42:50 UTC (rev 641)
+++ branches/kde-3.4.0/packages/arts/debian/rules	2005-03-04 18:55:54 UTC (rev 642)
@@ -7,22 +7,6 @@
 
 DEB_KDE_ENABLE_FINAL := yes
 
-# TODO Couldn't this be moved to cdbs/kde.mk?
-#      (But then the generated *.1 files should be put elsewhere than
-#      debian/man, because there are packages that have non-generated
-#      *.1 man pages there.)
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-# Generate man pages for the programs
-	for f in debian/man/*.sgml; do \
-		docbook-to-man $$f > debian/man/`basename $$f .sgml`.1; \
-	done
-	touch debian/stamp-man-pages
-
-clean::
-	rm -f debian/man/*.1
-	rm -f debian/stamp-man-pages
-
 DEB_INSTALL_DOCS_ALL :=
 
 shlibs_ver = 1.3.2

Modified: branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-bin.manpages
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-bin.manpages	2005-03-04 18:42:50 UTC (rev 641)
+++ branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-bin.manpages	2005-03-04 18:55:54 UTC (rev 642)
@@ -1,20 +1,20 @@
-debian/man/artsmessage.1
-debian/man/cupsdconf.1
-debian/man/dcop.1
-debian/man/dcopserver.1
-debian/man/kaddprinterwizard.1
-debian/man/kbuildsycoca.1
-debian/man/kconf_update.1
-debian/man/kcookiejar.1
-debian/man/kde-config.1
-debian/man/kded.1
-debian/man/kdontchangethehostname.1
-debian/man/kfile.1
-debian/man/kinstalltheme.1
-debian/man/kio_http_cache_cleaner.1
-debian/man/kio_uiserver.1
-debian/man/kmailservice.1
-debian/man/ksendbugmail.1
-debian/man/ktelnetservice.1
-debian/man/lnusertemp.1
-debian/man/meinproc.1
+debian/man/out/artsmessage.1
+debian/man/out/cupsdconf.1
+debian/man/out/dcop.1
+debian/man/out/dcopserver.1
+debian/man/out/kaddprinterwizard.1
+debian/man/out/kbuildsycoca.1
+debian/man/out/kconf_update.1
+debian/man/out/kcookiejar.1
+debian/man/out/kde-config.1
+debian/man/out/kded.1
+debian/man/out/kdontchangethehostname.1
+debian/man/out/kfile.1
+debian/man/out/kinstalltheme.1
+debian/man/out/kio_http_cache_cleaner.1
+debian/man/out/kio_uiserver.1
+debian/man/out/kmailservice.1
+debian/man/out/ksendbugmail.1
+debian/man/out/ktelnetservice.1
+debian/man/out/lnusertemp.1
+debian/man/out/meinproc.1

Modified: branches/kde-3.4.0/packages/kdelibs/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/rules	2005-03-04 18:42:50 UTC (rev 641)
+++ branches/kde-3.4.0/packages/kdelibs/debian/rules	2005-03-04 18:55:54 UTC (rev 642)
@@ -19,18 +19,6 @@
 	usr/bin/kgrantpty	\
 	usr/bin/kpac_dhcp_helper
 
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-# Generate man pages for the programs
-	for f in debian/man/*.sgml; do \
-		docbook-to-man $$f > debian/man/`basename $$f .sgml`.1; \
-	done
-	touch debian/stamp-man-pages
-
-clean::
-	rm -f debian/man/*.1
-	rm -f debian/stamp-man-pages
-
 DEB_INSTALL_DOCS_ALL :=
 
 shlibs_ver=4:3.3.99
@@ -39,6 +27,7 @@
 DEB_SHLIBDEPS_INCLUDE := \
 	debian/kdelibs4/usr/lib
 
+# TODO kde.mk?
 binary-install/kdelibs-bin::
 	install -p -D -m644 debian/kdelibs-bin.lintian \
 	debian/kdelibs-bin/usr/share/lintian/overrides/kdelibs-bin