summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-02-15 20:12:16 -0500
committerJoey Hess <joey@gnu.kitenet.net>2009-02-15 20:12:16 -0500
commit862caff2a9d66ec7b79f03cf769a53ba0fdc3539 (patch)
tree5b98957a272f11ce72fe22f383724183d9e1fe2a /debian
parenta543e8934b4562d175dcc24a13f97ec6d07d5647 (diff)
debhelper v7; rules file minimisation.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
-rw-r--r--debian/control2
-rw-r--r--debian/docs1
-rw-r--r--debian/link2
-rwxr-xr-xdebian/rules42
5 files changed, 12 insertions, 41 deletions
diff --git a/debian/changelog b/debian/changelog
index 87fc347e5..2492cc253 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.05) UNRELEASED; urgency=low
+
+ * debhelper v7; rules file minimisation.
+
+ -- Joey Hess <joeyh@debian.org> Sun, 15 Feb 2009 20:11:57 -0500
+
ikiwiki (3.04) unstable; urgency=low
* 404: New plugin which lets you use the IkiWiki CGI script as
diff --git a/debian/control b/debian/control
index 8622362bf..72ed77445 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: ikiwiki
Section: web
Priority: optional
-Build-Depends: perl, debhelper (>= 5)
+Build-Depends: perl, debhelper (>= 7)
Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libtext-markdown-perl | markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libhtml-parser-perl, liburi-perl, perlmagick
Maintainer: Joey Hess <joeyh@debian.org>
Uploaders: Josh Triplett <josh@freedesktop.org>
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 000000000..1936cc1d4
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+html
diff --git a/debian/link b/debian/link
new file mode 100644
index 000000000..cb3793191
--- /dev/null
+++ b/debian/link
@@ -0,0 +1,2 @@
+usr/share/ikiwiki/examples usr/share/doc/ikiwiki/examples
+usr/share/common-licenses/GPL-2 usr/share/doc/ikiwiki/html/GPL
diff --git a/debian/rules b/debian/rules
index 2434d92c8..115b3f0c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,45 +1,7 @@
#!/usr/bin/make -f
-
-build: build-stamp
-build-stamp:
- dh_testdir
- perl Makefile.PL PREFIX=/usr INSTALLDIRS=vendor
- $(MAKE) -C po
- $(MAKE)
- $(MAKE) test
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- perl Makefile.PL
- if [ -e Makefile ]; then $(MAKE) realclean; fi
- dh_clean
-
-binary-arch: build
-
-binary-indep: build
- dh_testdir
- dh_testroot
- dh_clean -k
- $(MAKE) pure_install DESTDIR=$(shell pwd)/debian/ikiwiki
- dh_installdocs html
- dh_link usr/share/ikiwiki/examples usr/share/doc/ikiwiki/examples
- dh_link usr/share/common-licenses/GPL-2 usr/share/doc/ikiwiki/html/GPL
- dh_installexamples
- dh_installchangelogs
- dh_compress -X html
- dh_fixperms
- dh_perl
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+%:
+ dh $@
# Not intended for use by anyone except the author.
announcedir:
@echo ${HOME}/src/ikiwiki/doc/news
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary