[Pkg-kde-commits] rev 495 - branches/kde-3.4.0/packages/arts/debian

Sat, 26 Feb 2005 05:39:44 +0100

Author: dato-guest
Date: 2005-02-26 05:39:43 +0100 (Sat, 26 Feb 2005)
New Revision: 495

Modified:
   branches/kde-3.4.0/packages/arts/debian/changelog
   branches/kde-3.4.0/packages/arts/debian/rules
Log:
Here we go:

  - debian/rules: switch to CDBS (Daniel's version, plus some things
    from Christopher's)

  - debian/changelog: update


Modified: branches/kde-3.4.0/packages/arts/debian/changelog
===================================================================

--- branches/kde-3.4.0/packages/arts/debian/changelog	2005-02-26 04:30:53 UTC (rev 494)
+++ branches/kde-3.4.0/packages/arts/debian/changelog	2005-02-26 04:39:43 UTC (rev 495)
@@ -1,16 +1,19 @@
-arts (1.3.2-3) unstable; urgency=low
+arts (1.4.0~rc1-1) experimental; urgency=low
 
+  * First release candidate for the upcoming KDE 3.4 release.
+
+  * Converted packaging to CDBS (initial version by Daniel Schepler, further
+    changes by Christopher Martin and Adeodato Simó).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Date
+
+arts (1.3.2-3) UNRELEASED; urgency=low
+
   +++ Changes by Christopher Martin:
 
   * Fix debian/copyright to refer to License rather than to Copyright
     when discussing KDE's licenses.
 
-  +++ Changes by Adeodato Simó:
-
-  PENDING:
-
-    * Ugh, should look at #263536 (the patch from nyu). TODO
-
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 11 Jan 2005 05:40:29 +0100
 
 arts (1.3.2-2) unstable; urgency=medium

Modified: branches/kde-3.4.0/packages/arts/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/arts/debian/rules	2005-02-26 04:30:53 UTC (rev 494)
+++ branches/kde-3.4.0/packages/arts/debian/rules	2005-02-26 04:39:43 UTC (rev 495)
@@ -1,222 +1,34 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
+#! /usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include debian/cdbs/kde.mk
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+DEB_KDE_ENABLE_FINAL := yes
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
-
--include debian/debiandirs
-
-debian/debiandirs: admin/debianrules
-	perl -w admin/debianrules echodirs > debian/debiandirs
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-
-	# Apply Debian specific patches
-	if test -d $(CURDIR)/debian/patches ;\
-	then \
-		for i in $(CURDIR)/debian/patches/*.diff.uu ;\
-		do \
-			cd $(CURDIR)/debian/patches ;\
-			uudecode "$$i" ;\
-			cd $(CURDIR) ;\
-		done ;\
-		patches=$$(find $(CURDIR)/debian/patches -name *.diff | sort);\
-	fi ;\
-	if test ! -f patch-stamp; then \
-		for patch in $$patches ;\
-		do \
-			echo APPLYING PATCH\: "$${patch##*/}" ;\
-			patch -p1 < "$$patch" ;\
-		done ;\
-		touch patch-stamp ;\
-	fi
-
-	# KDE CVS does not have aclocal.m4 or configure
-	if test ! -f configure; then \
-		$(MAKE) -f admin/Makefile.common dist ;\
-	fi
-
-	# ensure configure is executable
-	chmod +x configure
-
-	# make build directory
-	mkdir $(objdir)
-
-	# run configure with build tree $(objdir)
-	cd $(objdir) && \
-	../configure $(configkde) --enable-final \
-	--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-	--with-alsa
-
-	touch configure-stamp
-
-#Architecture
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
-	dh_testdir
-
-	cd $(objdir) && \
-	$(MAKE)
-
-	# generate manpages
-	for i in debian/man/*.sgml; do \
-		docbook-to-man $$i > `dirname $$i`/`basename $$i .sgml`.1 ;\
+# 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
 
-	touch build-arch-stamp
+clean::
+	rm -f debian/man/*.1
+	rm -f debian/stamp-man-pages
 
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
-	dh_testdir
+DEB_INSTALL_DOCS_ALL :=
 
-	cd $(objdir) && \
-	$(MAKE)
+shlibs_ver = $(DEB_VERSION) # XXX Hack!
+DEB_DH_MAKESHLIBS_ARGS_libartsc0 := -V'libartsc0 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libarts1  := -V'libarts1 (>= $(shlibs_ver))'
 
-	#cd $(objdir) && \
-	$(MAKE) apidox
-
-	touch build-indep-stamp
-
-debian-clean:
-	dh_testdir
-	dh_testroot
-
-	dh_clean
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp configure-stamp \
-		debian/debiandirs debian/man/*.1
-
-	# Remove Debian specific patches
-	if test -d $(CURDIR)/debian/patches ;\
-	then \
-		patches=$$(find $(CURDIR)/debian/patches -name *.diff | sort -r);\
-	fi ;\
-	if test -f patch-stamp; then \
-		for patch in $$patches ;\
-		do \
-			echo REMOVING PATCH\: "$${patch##*/}" ;\
-			patch -p1 -R < "$$patch" ;\
-		done ;\
-		for i in $(CURDIR)/debian/patches/*.diff.uu ;\
-		do \
-			 rm -f "$${i%%.uu}" ;\
-		done ;\
-		rm -f patch-stamp ;\
-	fi
-
-	# Remove build tree
-	rm -rf $(objdir)
-
-	# if Makefile exists run distclean
-	if test -f Makefile; then \
-		$(MAKE) distclean; \
-	fi
-
-	if test -d CVS; then \
-		$(MAKE) -f admin/Makefile.common cvs-clean ;\
-	fi
-
-	dh_clean
-
-install: install-arch install-indep
-
-install-arch:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -s
-	dh_installdirs -s
-
-	cd $(objdir) && \
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-	dh_install -s --list-missing
-
-install-indep:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -i
-	dh_installdirs -i
-
-	cd $(objdir) && \
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-	#cd $(objdir) && \
-	$(MAKE) install-apidox DESTDIR=$(CURDIR)/debian/tmp
-
-	dh_install -i --list-missing
-
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-#	dh_installexamples
-#	dh_installmenu
-#	dh_installdebconf
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress -X.bz2 -X.css -X.dcl -X.docbook -X-license -X.tag
-	dh_fixperms
-#	dh_perl
-#	dh_python
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps -ldebian/libartsc0/usr/lib:debian/libarts1/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+DEB_SHLIBDEPS_INCLUDE := \
+	debian/libartsc0/usr/lib \
+	debian/libarts1/usr/lib



