From 80051ba36998ef0fdbd111d9cdc26c3b955c93ef Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 18 Dec 2012 15:16:40 +0100 Subject: further improve debian packaging: build docs --- TODO | 3 ++- debian/control | 2 +- debian/docs | 3 --- debian/jenkins.debian.net-bin.docs | 3 --- debian/rules | 16 +++++++++++++++- 5 files changed, 18 insertions(+), 9 deletions(-) delete mode 100644 debian/docs delete mode 100644 debian/jenkins.debian.net-bin.docs diff --git a/TODO b/TODO index 7748f49c..54329e4c 100644 --- a/TODO +++ b/TODO @@ -26,7 +26,8 @@ See link:http://jenkins.debian.net/userContent/about.html["about jenkins.debian. * /usr/sbin/jenkins.debian.net-setup needs to be written * what update-j.d.n.sh does, needs to be put elsewhere... -* debian/copyright is incorrect about some licenses, ie the profitbricks+debian logos... and the preseeding files as well. +* debian/copyright is incorrect about some licenses: a.) the profitbricks+debian+jenkins logos b.) the preseeding files +* switch to scm trigger instead of scm pulling before releasing this as 0.1... === jenkins-job-builder related diff --git a/debian/control b/debian/control index f7484f68..74c5f377 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: extra Maintainer: Holger Levsen Build-Depends: debhelper (>= 9.20120419~) -Standards-Version: 3.9.4 +Standards-Version: 3.9.1 Homepage: http://jenkins.debian.net/userContent/about.html Vcs-Git: git://git.debian.org/git/users/holger/jenkins.debian.net.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/holger/jenkins.debian.net.git diff --git a/debian/docs b/debian/docs deleted file mode 100644 index f26bcee2..00000000 --- a/debian/docs +++ /dev/null @@ -1,3 +0,0 @@ -README -TODO -INSTALL diff --git a/debian/jenkins.debian.net-bin.docs b/debian/jenkins.debian.net-bin.docs deleted file mode 100644 index 16636bd9..00000000 --- a/debian/jenkins.debian.net-bin.docs +++ /dev/null @@ -1,3 +0,0 @@ -INSTALL -README -TODO diff --git a/debian/rules b/debian/rules index 571f404a..a2080319 100755 --- a/debian/rules +++ b/debian/rules @@ -3,5 +3,19 @@ # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 +ASCIIDOC_PARAMS = "-a numbered -a data-uri -a iconsdir=/etc/asciidoc/images/icons -a scriptsdir=/etc/asciidoc/javascripts -b html5 -a toc -a toclevels=4 -a icons -a stylesheet=$(shell pwd)/theme/debian-asciidoc.css" + %: - dh $@ + dh $@ + +override_dh_auto_build: + asciidoc $(ASCIIDOC_PARAMS) -o about.html README + asciidoc $(ASCIIDOC_PARAMS) -o todo.html TODO + asciidoc $(ASCIIDOC_PARAMS) -o setup.html INSTALL + mv *html userContent/ + dh_auto_build + +override_dh_auto_clean: + rm -vf userContent/*.html + dh_auto_clean + -- cgit v1.2.3-70-g09d2