[Pkg-kde-commits] rev 856 - in people/chrsmrtn: . cdbs-experimental

Christopher Martin chrsmrtn-guest@costa.debian.org
Sun, 20 Mar 2005 03:09:35 +0100


Author: chrsmrtn-guest
Date: 2005-03-20 03:09:34 +0100 (Sun, 20 Mar 2005)
New Revision: 856

Added:
   people/chrsmrtn/cdbs-experimental/
   people/chrsmrtn/cdbs-experimental/kde.mk
   people/chrsmrtn/cdbs-experimental/qt-kde.mk
   people/chrsmrtn/cdbs-experimental/rules
Log:
Experimental directory containing:

kde.mk, stripped of qt-kde package-specific hacks.
qt-kde.mk, containing package-specific hacks.
kdelibs' debian/rules, modified to point out how trivial it would be to adapt the packages to this split.

The decision to place stuff in one .mk or the other was somewhat arbitrary. Please, fellow teammembers, have
a look at this and let's decide what should stay in kde.mk (and get pushed upstream) and what should be in
qt-kde.mk (or whatever we decide to call it).

Also, feel free to commit changes here - don't worry about its location in people/chrsmrtn.


Added: people/chrsmrtn/cdbs-experimental/kde.mk
===================================================================
--- people/chrsmrtn/cdbs-experimental/kde.mk	2005-03-19 17:51:24 UTC (rev 855)
+++ people/chrsmrtn/cdbs-experimental/kde.mk	2005-03-20 02:09:34 UTC (rev 856)
@@ -0,0 +1,84 @@
+# $Id: kde.mk 849 2005-03-18 18:42:10Z dato-guest $
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Description: A class for KDE packages; sets KDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+
+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_kde
+_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)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/kde3
+export kde_htmldir = \$${datadir}/doc/kde/HTML
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+endif
+
+ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = 
+	cdbs_kde_enable_debug = --enable-debug=yes
+else
+	cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_COMPRESS_EXCLUDE := .bz2 .css .dcl .docbook -license .tag .sty .el
+
+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
+
+$(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
+
+endif

Added: people/chrsmrtn/cdbs-experimental/qt-kde.mk
===================================================================
--- people/chrsmrtn/cdbs-experimental/qt-kde.mk	2005-03-19 17:51:24 UTC (rev 855)
+++ people/chrsmrtn/cdbs-experimental/qt-kde.mk	2005-03-20 02:09:34 UTC (rev 856)
@@ -0,0 +1,82 @@
+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_qt-kde
+_cdbs_class_qt-kde := 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+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
+
+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
+
+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

Added: people/chrsmrtn/cdbs-experimental/rules
===================================================================
--- people/chrsmrtn/cdbs-experimental/rules	2005-03-19 17:51:24 UTC (rev 855)
+++ people/chrsmrtn/cdbs-experimental/rules	2005-03-20 02:09:34 UTC (rev 856)
@@ -0,0 +1,25 @@
+#! /usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/qt-kde.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+DEB_KDE_APIDOX := yes
+
+version=Debian Package $(DEB_VERSION)
+
+DEB_CONFIGURE_EXTRA_FLAGS := \
+	--enable-mitshm --with-alsa --enable-dnotify \
+	--with-distribution="$(version) (`cat /etc/debian_version`)"
+
+DEB_FIXPERMS_EXCLUDE := \
+	usr/bin/fileshareset	\
+	usr/bin/kgrantpty	\
+	usr/bin/kpac_dhcp_helper
+
+PACKAGES_WITH_LIBS := kdelibs4
+DEB_DH_STRIP_ARGS  := --dbg-package=kdelibs4
+
+#shlibs_ver = 4:3.4.0-1
+#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))


Property changes on: people/chrsmrtn/cdbs-experimental/rules
___________________________________________________________________
Name: svn:executable
   + *