[Pkg-kde-commits] rev 985 - people/chrsmrtn/cdbs-experimental

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-04-07 21:50:14 +0000 (Thu, 07 Apr 2005)
New Revision: 985

Added:
   people/chrsmrtn/cdbs-experimental/debian-qt-kde.mk
Removed:
   people/chrsmrtn/cdbs-experimental/qt-kde.mk
Modified:
   people/chrsmrtn/cdbs-experimental/kde.mk
   people/chrsmrtn/cdbs-experimental/rules
Log:
Sync my experimental kde.mk split, and fiddle with it.


Copied: people/chrsmrtn/cdbs-experimental/debian-qt-kde.mk (from rev 976, people/chrsmrtn/cdbs-experimental/qt-kde.mk)
===================================================================
--- people/chrsmrtn/cdbs-experimental/qt-kde.mk	2005-04-05 22:31:25 UTC (rev 976)
+++ people/chrsmrtn/cdbs-experimental/debian-qt-kde.mk	2005-04-07 21:50:14 UTC (rev 985)
@@ -0,0 +1,90 @@
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+buildprep: clean apply-patches
+	make -f admin/Makefile.common dist
+	debian/rules clean
+
+common-build-arch common-build-indep:: debian/stamp-apidox
+debian/stamp-apidox:
+	if test -n "$(DEB_KDE_APIDOX)"; then \
+		$(DEB_MAKE_INVOKE) apidox; \
+	fi
+	touch debian/stamp-apidox
+
+common-install-arch common-install-indep:: install-apidox
+install-apidox::
+	if test -n "$(DEB_KDE_APIDOX)"; then \
+		$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR); \
+	fi
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+	[ -d debian/man/out ] || mkdir -p 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
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+	if test -e debian/$(cdbs_curpkg).lintian; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+	fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+		meinproc $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+	done
+
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+	if test -n "$(DEB_KDE_CVS_MAKE)" -a ! -f configure; then \
+		$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; \
+	fi
+	touch debian/stamp-cvs-make
+
+clean::
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+	rm -f debian/stamp-cvs-make
+	rm -f debian/stamp-apidox
+	rm -rf debian/shlibs-check
+
+endif

Modified: people/chrsmrtn/cdbs-experimental/kde.mk
===================================================================
--- people/chrsmrtn/cdbs-experimental/kde.mk	2005-04-07 21:48:48 UTC (rev 984)
+++ people/chrsmrtn/cdbs-experimental/kde.mk	2005-04-07 21:50:14 UTC (rev 985)
@@ -29,7 +29,6 @@
 _cdbs_class_kde := 1
 
 include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 ifdef _cdbs_tarball_dir
 DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
@@ -37,6 +36,8 @@
 DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
 endif
 
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/kde3
 export kde_htmldir = \$${datadir}/doc/kde/HTML
@@ -62,16 +63,16 @@
 DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
 DEB_COMPRESS_EXCLUDE := .bz2 .css .dcl .docbook -license .tag .sty .el
 
+# Workaround for Bug##296984
+clean:: reverse-patches
+	for dir in $(DEB_PATCHDIRS) ; do \
+		rm -f $$dir/*.log ; \
+	done
+
 cleanbuilddir::
 	-if test "$(DEB_BUILDDIR)" != "$(DEB_SRCDIR)"; then rm -rf $(DEB_BUILDDIR); fi
 
 clean::
 	debian/rules reverse-config
 
-# Workaround for Bug##296984
-clean:: reverse-patches
-	for dir in $(DEB_PATCHDIRS) ; do \
-		rm -f $$dir/*.log ; \
-		done
-
 endif

Deleted: people/chrsmrtn/cdbs-experimental/qt-kde.mk

Modified: people/chrsmrtn/cdbs-experimental/rules
===================================================================
--- people/chrsmrtn/cdbs-experimental/rules	2005-04-07 21:48:48 UTC (rev 984)
+++ people/chrsmrtn/cdbs-experimental/rules	2005-04-07 21:50:14 UTC (rev 985)
@@ -1,7 +1,7 @@
 #! /usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/qt-kde.mk
+include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk