rev 5026 - kde-extras/kfocus/trunk/debian

[Mark Purcell]

Author: msp
Date: 2006-12-02 13:04:43 +0100 (Sat, 02 Dec 2006)
New Revision: 5026

Added:
   kde-extras/kfocus/trunk/debian/compat
Modified:
   kde-extras/kfocus/trunk/debian/changelog
   kde-extras/kfocus/trunk/debian/control
   kde-extras/kfocus/trunk/debian/rules
Log:
* echo 4 > debian/compat
* Switch to cdbs

Modified: kde-extras/kfocus/trunk/debian/changelog
===================================================================
--- kde-extras/kfocus/trunk/debian/changelog	2006-12-02 11:46:40 UTC (rev 5025)
+++ kde-extras/kfocus/trunk/debian/changelog	2006-12-02 12:04:43 UTC (rev 5026)
@@ -1,13 +1,14 @@
-kfocus (1.0.2-16) UNRELEASED; urgency=low
+kfocus (1.0.2-16) unstable; urgency=low
 
-  * NOT RELEASED YET
   * Add debian/rules get-orig-source target for http://buildserver.net
   * Remove /etc/kde2
     - installs obsolete /etc/kde2 directory (Closes: #324602)
   * Lintian cleanup: copyright-lists-upstream-authors-with-dh_make-
     boilerplate
+  * echo 4 > debian/compat
+  * Switch to cdbs
 
- -- Mark Purcell <msp at debian.org>  Sat,  2 Dec 2006 11:46:22 +0000
+ -- Mark Purcell <msp at debian.org>  Sat,  2 Dec 2006 12:04:14 +0000
 
 kfocus (1.0.2-15) unstable; urgency=low
 

Added: kde-extras/kfocus/trunk/debian/compat
===================================================================
--- kde-extras/kfocus/trunk/debian/compat	2006-12-02 11:46:40 UTC (rev 5025)
+++ kde-extras/kfocus/trunk/debian/compat	2006-12-02 12:04:43 UTC (rev 5026)
@@ -0,0 +1 @@
+4

Modified: kde-extras/kfocus/trunk/debian/control
===================================================================
--- kde-extras/kfocus/trunk/debian/control	2006-12-02 11:46:40 UTC (rev 5025)
+++ kde-extras/kfocus/trunk/debian/control	2006-12-02 12:04:43 UTC (rev 5026)
@@ -2,7 +2,7 @@
 Section: kde
 Priority: optional
 Maintainer: Mark Purcell <msp at debian.org> 
-Build-Depends: debhelper (>> 3.0.0), kdelibs4-dev, libqt3-compat-headers
+Build-Depends: debhelper (>> 3.0.0), kdelibs4-dev, libqt3-compat-headers, cdbs
 Standards-Version: 3.5.2
 
 Package: kfocus

Modified: kde-extras/kfocus/trunk/debian/rules
===================================================================
--- kde-extras/kfocus/trunk/debian/rules	2006-12-02 11:46:40 UTC (rev 5025)
+++ kde-extras/kfocus/trunk/debian/rules	2006-12-02 12:04:43 UTC (rev 5026)
@@ -1,86 +1,9 @@
 #!/usr/bin/make -f
-# Made with the aid of debmake, by Christoph Lameter,
-# based on the sample debian/rules file for GNU hello by Ian Jackson.
-# tweaked by Stephen Kulow and Ivan Moore for use with KDE
 
-BUILDDIR = ./build
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/kde.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-ifeq ($(ARCH),alpha)
-        export CFLAGS=-O0 -mieee
-        export CXXFLAGS=-O0 -mieee
-endif
-
-build: build-stamp
-
--include debian/debiandirs
-
-debian/debiandirs: debian/debianrules
-	perl -w debian/debianrules echodirs > debian/debiandirs
-
-build-stamp:
-	dh_testdir
-	if test ! -f configure; then \
-	  $(MAKE) -f admin/Makefile.common ;\
-	fi
-	./configure $(configkde) --with-qt-dir=/usr/share/qt3 --enable-mt
-	make
-	touch build-stamp
-
-clean: debian-clean
-	dh_clean
-
-debian-clean:
-	dh_testdir
-	-rm -f build-stamp
-	if test -d CVS; then \
-	  make -f admin/Makefile.common cvs-clean ;\
-	fi
-	-make distclean
-	-test -r /usr/share/misc/config.sub && \
-	  cp -f /usr/share/misc/config.sub admin/config.sub
-	-test -r /usr/share/misc/config.guess && \
-	  cp -f /usr/share/misc/config.guess admin/config.guess
-
-
-binary-indep: build
-	dh_testroot
-	dh_testdir
-# There are no architecture-independent files to be uploaded
-# generated by this package.  If there were any they would be
-# made here.
-
-binary-arch: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	make install DESTDIR=`pwd`/debian/tmp/
-	perl -w debian/debianrules cleanup
-	/usr/bin/meinproc doc/en/index.xml
-	mv *.html debian/tmp/$(kde_htmldir)/en/kfocus/
-	dh_undocumented
-	dh_movefiles
-	dh_link usr/share/icons/locolor/16x16/apps/kfocus.png  usr/share/icons/hicolor/16x16/apps/kfocus.png usr/share/icons/locolor/32x32/apps/kfocus.png usr/share/icons/hicolor/32x32/apps/kfocus.png
-	dh_installdocs
-	dh_installmenu
-	dh_installmime
-	dh_installchangelogs ChangeLog
-	dh_strip
-	dh_perl
-	dh_compress -X .docbook
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb       	
-
-# Below here is fairly generic really
-
-binary:		binary-indep binary-arch
-
-.PHONY: binary binary-arch binary-indep clean
-
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs