summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--debian/compat2
-rw-r--r--debian/control2
-rw-r--r--debian/docs2
-rwxr-xr-xdebian/rules44
5 files changed, 12 insertions, 41 deletions
diff --git a/debian/changelog b/debian/changelog
index a84e5cc..9b42ed7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,11 @@ scons-doc (1.2.0.d20090905-1) UNRELEASED; urgency=low
* New upstream checkpoint release.
* Update my e-mail address.
* Remove DM-Upload-Allowed field.
+ * Switch to debhelper 7.
* Add Vcs-* fields to document where scons-doc debianisation is stored.
* Bump Standards-Version to 3.8.3, no changes required.
- -- Luca Falavigna <dktrkranz@debian.org> Tue, 08 Sep 2009 22:13:38 +0200
+ -- Luca Falavigna <dktrkranz@debian.org> Tue, 08 Sep 2009 22:21:24 +0200
scons-doc (1.2.0-2) unstable; urgency=low
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 b563d80..b7d7fb8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: doc
Priority: optional
Maintainer: Luca Falavigna <dktrkranz@debian.org>
Uploaders: Mark Brown <broonie@debian.org>
-Build-Depends: debhelper (>= 6)
+Build-Depends: debhelper (>= 7.0.50~)
Build-Depends-Indep: docbook-utils
Standards-Version: 3.8.3
Homepage: http://www.scons.org/
diff --git a/debian/docs b/debian/docs
index f5a0fec..9cfa1dc 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1 @@
-user/
+build/doc/HTML
diff --git a/debian/rules b/debian/rules
index ba3e26a..99733cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,42 +1,12 @@
#!/usr/bin/make -f
-VERSION = $(shell head -n1 debian/changelog | sed -e 's/.*(//;s/-.*).*//;s/\+/\-/')
+%:
+ dh $@
-build: build-stamp
-build-stamp:
- dh_testdir
- db2html -o ${CURDIR}/user doc/user/main.xml || true
- db2html -o ${CURDIR}/user -u doc/user/main.xml || true
- touch $@
+override_dh_auto_clean:
+ scons -c
+ rm -fr build
-clean:
- dh_testdir
- dh_testroot
- rm -fr build-stamp docbook2html-dir user
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
-binary-indep: install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installchangelogs
- dh_link usr/share/doc/scons-doc/user/main.html usr/share/doc/scons-doc/user.html
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-arch: install
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_auto_install:
+ scons doc