[SCM] KBoincSpy packaging branch, master, updated. upstream/0.9.1-16-gfc5230b

Thu Mar 19 22:38:51 UTC 2009

The following commit has been merged in the master branch:
commit fc5230b5acb2e02f22c38b1d53272878ce818a91
Author: Frank S. Thomas <fst at debian.org>
Date:   Thu Mar 19 23:31:51 2009 +0100

    Use debhelper 7 to minimize debian/rules.

diff --git a/debian/changelog b/debian/changelog
index 03bda23..0dded06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,14 +2,11 @@ kboincspy (0.9.1-6) UNRELEASED; urgency=low
 
   * debian/manpages/kboincspy.xml: Updated from DocBook 4.2 to 4.5, which is
     the latest version in Lenny.
-  * Bumped debhelper compat level from V5 to V6 since this is the current
-    recommended level (debhelper >= 6 is required for dh_lintian anyway).
-  * Removed debian/control.in because CDBS' feature of automatically updating
-    debian/control was barely used.
-  * Instead of manually installing the override file for Lintian let
-    dh_lintian do this. This requires build dependencies on "debhelper (>=
-    6.0.7)" and "cdbs (>= 0.4.52)" and the renaming of debian/lintian to
-    debian/kboincspy.lintian-overrides.
+  * debian/compat: Bumped debhelper compat level from V5 to V7 since this is
+    the current recommended level.
+  * Removed debian/control.in because CDBS is not used anymore.
+  * Renamed debian/lintian to debian/kboincspy.lintian-overrides so that
+    dh_lintian installs this override file for us.
   * debian/control:
     - Migrated from Subversion to Git, updated Vcs fields accordingly.
     - Added ${misc:Depends} to the packages' Depends field to appease Lintian.
@@ -19,6 +16,7 @@ kboincspy (0.9.1-6) UNRELEASED; urgency=low
       adding them directly to the source tree.
     - Added 103_fix_duplicate_key_in_desktop.patch to fix the duplicate key in
       the .desktop file instead of fixing this directly in the source tree.
+  * debian/rules: Use debhelper 7 instead of CDBS to minimize rules file.
 
  -- Frank S. Thomas <fst at debian.org>  Mon, 21 Jan 2008 21:30:23 +0100
 
diff --git a/debian/compat b/debian/compat
index 1e8b314..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/debian/control b/debian/control
index 5c83b08..2d83a94 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,9 @@ Section: kde
 Priority: optional
 Maintainer: Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org>
 Uploaders: Frank S. Thomas <fst at debian.org>
-Build-Depends: cdbs (>= 0.4.52), debhelper (>= 6.0.7), quilt,
- patchutils (>= 0.2.25), autotools-dev, libtool, autoconf (>= 2.52),
- automake1.9, kdelibs4-dev (>= 4:3.3.0), libgl1-mesa-dev | libgl-dev,
- libglu1-mesa-dev | libglu-dev, docbook2x, docbook-xml
+Build-Depends: debhelper (>= 7), quilt, autotools-dev, libtool,
+ autoconf (>= 2.52), automake1.9, kdelibs4-dev (>= 4:3.3.0), libgl1-mesa-dev |
+ libgl-dev, libglu1-mesa-dev | libglu-dev, docbook2x, docbook-xml
 Standards-Version: 3.8.1
 Homepage: http://kboincspy.sourceforge.net/
 Vcs-Git: git://git.debian.org/git/pkg-boinc/kboincspy.git
diff --git a/debian/kboincspy.manpages b/debian/kboincspy.manpages
new file mode 100644
index 0000000..08bc473
--- /dev/null
+++ b/debian/kboincspy.manpages
@@ -0,0 +1 @@
+kboincspy.1
diff --git a/debian/rules b/debian/rules
index fe9af50..aff4360 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,37 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/class/kde.mk
-
-DEB_CONFIGURE_EXTRA_FLAGS := --with-gl
-DEB_DH_MAKESHLIBS_ARGS_kboincspy := -V"kboincspy (>= 0.9.1), kboincspy (<< 0.9.2)"
-DEB_INSTALL_DOCS_ALL :=
-DEB_INSTALL_MANPAGES_kboincspy := kboincspy.1
-
-post-patches::
-# Removing these files, which were generated by uic, saves us from
-# patching some Makefile.ins for adding `$(srcdir)/'. They are
-# regenerated by uic anyway.
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# Uncomment this to compile with gcc-snapshot.
+#export  CC=/usr/lib/gcc-snapshot/bin/gcc
+#export CXX=/usr/lib/gcc-snapshot/bin/g++
+#export CPP=/usr/lib/gcc-snapshot/bin/cpp
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already). Refer to the
+# section "Calling GNU configure properly" in /usr/share/doc/autotools-dev
+# for more details.
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+  confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+include /usr/share/quilt/quilt.make
+
+-include debian/debiandirs
+
+debian/debiandirs: admin/debianrules
+	perl -w admin/debianrules echodirs > debian/debiandirs
+
+autoreconf-stamp:
+	# Removing these files, which were generated by uic, saves us from
+	# patching some Makefile.ins for adding `$(srcdir)/'. They are
+	# regenerated by uic anyway.
 	-rm src/kbsconfigpage.h
 	-rm src/kbslocationdialog.h
 	-rm src/kbsprojectdialog.h
@@ -33,15 +52,48 @@ post-patches::
 	cp -f /usr/share/misc/config.sub admin/config.sub
 	
 	$(MAKE) -f admin/Makefile.common
+	touch $@
 
-build/kboincspy::
+build: patch autoreconf-stamp build-stamp
+build-stamp:
+	dh build --before dh_auto_configure
+	./configure $(confflags) $(configkde) --with-gl
+	dh build --after dh_auto_configure
 	docbook2x-man debian/manpages/kboincspy.xml
+	touch $@
+
+install: build install-stamp
+install-stamp:
+	dh install --until dh_install
+	
+	find debian/tmp/usr/lib -maxdepth 1 -type f -name *.so \
+	 -exec cp {} debian/kboincspy/usr/lib \;
+	
+	find debian/tmp/usr/lib -maxdepth 1 -type l -name *.so \
+	 -exec cp -d {} debian/kboincspy-dev/usr/lib \;
+	
+	dh install --remaining
+	touch $@
+
+override_dh_compress:
+	dh_compress -X.docbook
+
+override_dh_makeshlibs:
+	dh_makeshlibs -pkboincspy -V"kboincspy (>= 0.9.1), kboincspy (<< 0.9.2)"
+
+binary-indep: install
+	dh binary-indep
+
+binary-arch: install
+	dh binary-arch
 
-install/kboincspy::
-	find debian/tmp/usr/lib -maxdepth 1 -type f -name *.so -exec cp {} debian/$(cdbs_curpkg)/usr/lib \;
+binary: binary-indep binary-arch
 
-install/kboincspy-dev::
-	find debian/tmp/usr/lib -maxdepth 1 -type l -name *.so -exec cp -d {} debian/$(cdbs_curpkg)/usr/lib \;
+clean: clean-patched unpatch
+clean-patched:
+	dh clean
+	dh_clean \
+	 debian/debiandirs \
+	 kboincspy.1
 
-clean::
-	dh_clean kboincspy.1
+.PHONY: build install binary-indep binary-arch binary clean clean-patched

-- 
KBoincSpy packaging

