r925 - in /branches/boinc-app-seti/5.13+cvs20060510/debian: boinc-app-seti.docs changelog compat control control.in rules

fst at users.alioth.debian.org fst at users.alioth.debian.org
Sat Jul 26 08:57:08 UTC 2008 

Author: fst
Date: Sat Jul 26 08:57:08 2008
New Revision: 925

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=925
Log:
Use debhelper V7 instead of CDBS to minimize debian/rules.

Added:
    branches/boinc-app-seti/5.13+cvs20060510/debian/boinc-app-seti.docs
Removed:
    branches/boinc-app-seti/5.13+cvs20060510/debian/control.in
Modified:
    branches/boinc-app-seti/5.13+cvs20060510/debian/changelog
    branches/boinc-app-seti/5.13+cvs20060510/debian/compat
    branches/boinc-app-seti/5.13+cvs20060510/debian/control
    branches/boinc-app-seti/5.13+cvs20060510/debian/rules

Added: branches/boinc-app-seti/5.13+cvs20060510/debian/boinc-app-seti.docs
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc-app-seti/5.13%2Bcvs20060510/debian/boinc-app-seti.docs?rev=925&op=file
==============================================================================
--- branches/boinc-app-seti/5.13+cvs20060510/debian/boinc-app-seti.docs (added)
+++ branches/boinc-app-seti/5.13+cvs20060510/debian/boinc-app-seti.docs Sat Jul 26 08:57:08 2008
@@ -1,0 +1,1 @@
+AUTHORS

Modified: branches/boinc-app-seti/5.13+cvs20060510/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc-app-seti/5.13%2Bcvs20060510/debian/changelog?rev=925&op=diff
==============================================================================
--- branches/boinc-app-seti/5.13+cvs20060510/debian/changelog (original)
+++ branches/boinc-app-seti/5.13+cvs20060510/debian/changelog Sat Jul 26 08:57:08 2008
@@ -1,9 +1,7 @@
 boinc-app-seti (5.13+cvs20060510-5) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
-  * debian/rules: Run the autotools in the autoreconf-stamp target instead of
-    CDBS' post-patches target to avoid that configure runs twice, see #462382
-    for details.
+  * Use debhelper V7 instead of CDBS to minimize debian/rules.
 
  -- Frank S. Thomas <fst at debian.org>  Thu, 31 Jan 2008 15:13:46 +0100
 

Modified: branches/boinc-app-seti/5.13+cvs20060510/debian/compat
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc-app-seti/5.13%2Bcvs20060510/debian/compat?rev=925&op=diff
==============================================================================
--- branches/boinc-app-seti/5.13+cvs20060510/debian/compat (original)
+++ branches/boinc-app-seti/5.13+cvs20060510/debian/compat Sat Jul 26 08:57:08 2008
@@ -1,1 +1,1 @@
-6
+7

Modified: branches/boinc-app-seti/5.13+cvs20060510/debian/control
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc-app-seti/5.13%2Bcvs20060510/debian/control?rev=925&op=diff
==============================================================================
--- branches/boinc-app-seti/5.13+cvs20060510/debian/control (original)
+++ branches/boinc-app-seti/5.13+cvs20060510/debian/control Sat Jul 26 08:57:08 2008
@@ -4,8 +4,10 @@
 Maintainer: Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org>
 Uploaders: Steffen Moeller <steffen_moeller at gmx.de>, Frank S. Thomas <fst at debian.org>, Christoph Martin <christoph.martin at uni-mainz.de>
 Standards-Version: 3.7.3
-Build-Depends: cdbs (>= 0.4.27-1), debhelper (>= 6), quilt, patchutils (>= 0.2.25), automake1.9 (>= 1.9.3), autoconf (>= 2.59), boinc-dev (>= 5.10.8-1), libfftw3-dev
-Homepage: http://setiathome.ssl.berkeley.edu
+Build-Depends: debhelper (>= 7), quilt, patchutils (>= 0.2.25),
+ automake1.9 (>= 1.9.3), autoconf (>= 2.59), boinc-dev (>= 5.10.8-1),
+ libfftw3-dev
+Homepage: http://setiathome.berkeley.edu/
 Vcs-Svn: svn://svn.debian.org/pkg-boinc/trunk/boinc-app-seti/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/
 

Modified: branches/boinc-app-seti/5.13+cvs20060510/debian/rules
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc-app-seti/5.13%2Bcvs20060510/debian/rules?rev=925&op=diff
==============================================================================
--- branches/boinc-app-seti/5.13+cvs20060510/debian/rules (original)
+++ branches/boinc-app-seti/5.13+cvs20060510/debian/rules Sat Jul 26 08:57:08 2008
@@ -5,50 +5,61 @@
 #export CXX=/usr/lib/gcc-snapshot/bin/g++
 #export CPP=/usr/lib/gcc-snapshot/bin/cpp
 
-# Remember to comment this before tagging for a release.
-#DEB_AUTO_UPDATE_DEBIAN_CONTROL := yes
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/quilt/quilt.make
 
 PKG = boinc-app-seti
 
-DEB_CONFIGURE_SCRIPT_ENV += BOINCDIR="/usr/share/boinc-dev"
-
-# Remove --disable-dependency-tracking from configure's arguments,
-# because it breaks some handwritten rules in client/Makefile.am which
-# require that $(DEPDIR) exists.
-DEB_CONFIGURE_NORMAL_ARGS := \
-  $(DEB_CONFIGURE_NORMAL_ARGS:--disable-dependency-tracking=)
-
-DEB_CONFIGURE_EXTRA_FLAGS := \
-  --enable-client \
-  --disable-graphics \
-  --disable-dynamic-graphics \
-  --disable-server \
-  --disable-static-linkage
-DEB_INSTALL_DOCS_ALL := AUTHORS
-DEB_MAKE_CLEAN_TARGET = clean
-
-UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | cut -f 1 -d '+')
+UPSTREAM_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | \
+  cut -d ' ' -f 2 | cut -d '+' -f 1 | cut -d '~' -f 1)
 APP_INFO_VERSION = $(subst .,,$(UPSTREAM_VERSION))
 
-post-patches:: autoreconf-stamp
 autoreconf-stamp:
 	aclocal-1.9 -I m4 && autoheader && automake-1.9 && autoconf
 	touch $@
 
-install/$(PKG)::
+build: patch autoreconf-stamp build-stamp
+build-stamp:
+	dh build --before configure
+	
+	# Remember to not configure with --disable-dependency-tracking, because
+	# it breaks some handwritten rules in client/Makefile.am which require
+	# that DEPDIR exists.
+	BOINCDIR=/usr/share/boinc-dev ./configure \
+	  --enable-client \
+	  --disable-graphics \
+	  --disable-dynamic-graphics \
+	  --disable-server \
+	  --disable-static-linkage
+	
+	dh build --after configure
+	touch $@
+
+clean: clean-patched unpatch
+clean-patched:
+	dh clean
+	dh_clean \
+	  client/setiathome-$(UPSTREAM_VERSION).* \
+	  debian/extra/app_info.xml
+
+install: build install-stamp
+install-stamp:
+	dh install --before dh_install
+	
 	cp client/seti_boinc debian/$(PKG)/usr/lib/$(PKG)/setiathome_enhanced
 	
 	cat debian/extra/app_info.xml.in | \
 	  sed -e 's/VERSION/$(APP_INFO_VERSION)/' > debian/extra/app_info.xml
+	
+	dh install --remaining
+	touch $@
 
-clean::
-	dh_clean client/setiathome-$(UPSTREAM_VERSION).*
-	dh_clean debian/extra/app_info.xml
-	dh_clean autoreconf-stamp
+binary-indep: install
+	dh binary-indep
+
+binary-arch: install
+	dh binary-arch
+
+binary: binary-indep binary-arch
 
 origDir ?= .
 
@@ -70,4 +81,5 @@
 	); \
 	rm -f $$DLS
 
-DEB_PHONY_RULES += get-orig-source
+.PHONY: build clean clean-patched install binary-indep binary-arch binary \
+ get-orig-source

More information about the pkg-boinc-commits mailing list