[SCM] KBoincSpy packaging branch, master, updated. debian/0.9.1-6-2-g1465ac8

[Frank S. Thomas]

The following commit has been merged in the master branch:
commit 1465ac859b7f4449f2772a2c271b1b3fdfeae948
Author: Frank S. Thomas <fst at debian.org>
Date:   Mon Jun 1 14:10:39 2009 +0200

    Use quilt's new debhelper addon.
    
    * Use quilt's new debhelper addon to further simplify debian/rules. This
      required to bump the build-dependency on quilt to (>= 0.46-7).
    * Adapted debian/copyright to DEP5.

diff --git a/debian/changelog b/debian/changelog
index ef75fc6..e38f985 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ kboincspy (0.9.1-7) UNRELEASED; urgency=low
   * debian/control: Bumped debhelper build dependency from (>= 7) to
     (>= 7.0.50) because the override_dh_* targets we are using in debian/rules
     were introduced in this version.
+  * Use quilt's new debhelper addon to further simplify debian/rules. This
+    required to bump the build-dependency on quilt to (>= 0.46-7).
+  * Adapted debian/copyright to DEP5.
 
  -- Frank S. Thomas <fst at debian.org>  Sat, 28 Mar 2009 12:38:31 +0100
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..73d94d8
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+debian/debiandirs
+kboincspy.1
diff --git a/debian/control b/debian/control
index e223b6b..c0ba54f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,10 @@ 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: debhelper (>= 7.0.50), 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
+Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7), 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/copyright b/debian/copyright
index 5894824..c8d3d57 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,8 @@
-This package was debianized by Frank S. Thomas <frank at thomas-alfeld.de> on
-Tue, 16 Nov 2004 15:27:30 +0100.
+Name: KBoincSpy
+Maintainer: Roberto A. Virga <rvirga at users.sourceforge.net>
+Source: http://kboincspy.sourceforge.net/
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=48
 
-It was downloaded from http://sourceforge.net/projects/kboincspy/
-
-Files: *
 Copyright: © 2004-2006 Roberto A. Virga <rvirga at users.sourceforge.net>
 License: GPL-2
  KBoincSpy's main program is licensed under the GPL:
diff --git a/debian/rules b/debian/rules
index aff4360..933d5d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,8 +21,6 @@ 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
@@ -54,26 +52,26 @@ autoreconf-stamp:
 	$(MAKE) -f admin/Makefile.common
 	touch $@
 
-build: patch autoreconf-stamp build-stamp
+build: autoreconf-stamp build-stamp
 build-stamp:
-	dh build --before dh_auto_configure
-	./configure $(confflags) $(configkde) --with-gl
-	dh build --after dh_auto_configure
+	dh build --with quilt
 	docbook2x-man debian/manpages/kboincspy.xml
 	touch $@
 
+override_dh_auto_configure:
+	./configure $(confflags) $(configkde) --with-gl
+
 install: build install-stamp
 install-stamp:
-	dh install --until dh_install
-	
+	dh install
+	touch $@
+
+override_dh_install:
+	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
@@ -89,11 +87,7 @@ binary-arch: install
 
 binary: binary-indep binary-arch
 
-clean: clean-patched unpatch
-clean-patched:
-	dh clean
-	dh_clean \
-	 debian/debiandirs \
-	 kboincspy.1
+clean:
+	dh clean --with quilt
 
-.PHONY: build install binary-indep binary-arch binary clean clean-patched
+.PHONY: build install binary-indep binary-arch binary clean

-- 
KBoincSpy packaging