From 6d785d6401799bf929316cb070471601798de4c0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 12 Jan 2009 19:04:24 -0500 Subject: Add auto-blog.setup It will set up an ikiwiki instance tuned for use in blogging. As part of this change, move the example sites into /usr/share/ikiwiki so they are available even if docs are not installed. --- debian/rules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 25b1f57b6..2434d92c8 100755 --- a/debian/rules +++ b/debian/rules @@ -25,8 +25,9 @@ binary-indep: build dh_clean -k $(MAKE) pure_install DESTDIR=$(shell pwd)/debian/ikiwiki dh_installdocs html - dh_installexamples doc/examples/* + 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 -- cgit v1.2.3 From 862caff2a9d66ec7b79f03cf769a53ba0fdc3539 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 15 Feb 2009 20:12:16 -0500 Subject: debhelper v7; rules file minimisation. --- Makefile.PL | 2 +- debian/changelog | 6 ++++++ debian/control | 2 +- debian/docs | 1 + debian/link | 2 ++ debian/rules | 42 ++---------------------------------------- 6 files changed, 13 insertions(+), 42 deletions(-) create mode 100644 debian/docs create mode 100644 debian/link (limited to 'debian/rules') diff --git a/Makefile.PL b/Makefile.PL index 5c450e619..93f9e89e2 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -42,7 +42,7 @@ extra_build: ikiwiki.out ikiwiki.setup docwiki ./mdwn2man ikiwiki-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man ./mdwn2man ikiwiki-transition 1 doc/ikiwiki-transition.mdwn > ikiwiki-transition.man ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man - $(MAKE) -C po mo + $(MAKE) -C po docwiki: ikiwiki.out $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh 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 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 Uploaders: Josh Triplett 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 -- cgit v1.2.3 From 14e081b2c6cf5eed4903d61bee0a23ac49fc120f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 15 Feb 2009 22:08:04 -0500 Subject: avoid compressing html --- debian/rules | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 115b3f0c2..da8249920 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,11 @@ #!/usr/bin/make -f + +binary: binary-indep +binary-indep: + dh $@ --before dh_compress + dh_compress -Xhtml + dh $@ --after dh_compress + %: dh $@ -- cgit v1.2.3 From 25b1f60aeb26f8d14d7619b304f8aca0735c850f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 16 Feb 2009 21:49:26 -0500 Subject: need to pass PREFIX=/usr to avoid was lost in rules file rewrite I used debhelper 7.2 features too, shoot me :-) --- debian/changelog | 2 +- debian/control | 2 +- debian/rules | 17 +++++++++++------ 3 files changed, 13 insertions(+), 8 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 2492cc253..62374d2dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ ikiwiki (3.05) UNRELEASED; urgency=low - * debhelper v7; rules file minimisation. + * debhelper v7.2; rules file minimisation. -- Joey Hess Sun, 15 Feb 2009 20:11:57 -0500 diff --git a/debian/control b/debian/control index 72ed77445..0506dec24 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: ikiwiki Section: web Priority: optional -Build-Depends: perl, debhelper (>= 7) +Build-Depends: perl, debhelper (>= 7.2) 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 Uploaders: Josh Triplett diff --git a/debian/rules b/debian/rules index da8249920..0a6571521 100755 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,18 @@ #!/usr/bin/make -f +%: + dh $@ + +# keeps it out if /usr/local +override_dh_auto_configure: + dh_auto_configure -- PREFIX=/usr -binary: binary-indep -binary-indep: - dh $@ --before dh_compress +# avoid compressing files in the doc wiki +override_dh_compress: dh_compress -Xhtml - dh $@ --after dh_compress -%: - dh $@ +# distclean moans about MANIFEST, this is quieter +override_dh_auto_clean: + $(MAKE) realclean # Not intended for use by anyone except the author. announcedir: -- cgit v1.2.3 From ca7a4ae840d84f75bd2bb95d7150bb1974bd0c3a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 19 Feb 2009 18:58:46 -0500 Subject: comments --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 0a6571521..28ac84d25 100755 --- a/debian/rules +++ b/debian/rules @@ -2,16 +2,16 @@ %: dh $@ -# keeps it out if /usr/local override_dh_auto_configure: + # keeps it out of /usr/local dh_auto_configure -- PREFIX=/usr -# avoid compressing files in the doc wiki override_dh_compress: + # avoid compressing files in the doc wiki dh_compress -Xhtml -# distclean moans about MANIFEST, this is quieter override_dh_auto_clean: + # distclean moans about MANIFEST, this is quieter $(MAKE) realclean # Not intended for use by anyone except the author. -- cgit v1.2.3 From 4558674d70dd7cd14a650e28c20cc707b72bf425 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 27 Feb 2009 15:35:40 -0500 Subject: fix clean on clean tree --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 28ac84d25..bdbbf0050 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ override_dh_compress: override_dh_auto_clean: # distclean moans about MANIFEST, this is quieter - $(MAKE) realclean + -$(MAKE) realclean # Not intended for use by anyone except the author. announcedir: -- cgit v1.2.3 From c42ad8e8de7fc581b57c7407de6a8336cfbc2540 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 27 Feb 2009 15:40:42 -0500 Subject: lintian fixes --- debian/changelog | 2 +- debian/control | 2 +- debian/rules | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index a61868154..b63c25da7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,7 +12,7 @@ ikiwiki (3.05) UNRELEASED; urgency=low * Setup automator: Prompt for password twice. Closes: #516973 * bzr: Add missing rcs_diff. (liw) * comments: Avoid showing comment moderation button in prefs to non-admins. - * goto: Fix typo that broke recentchanges_link compatability. + * goto: Fix typo that broke recentchanges_link compatibility. -- Joey Hess Sun, 15 Feb 2009 20:11:57 -0500 diff --git a/debian/control b/debian/control index a877bf314..65b80138b 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki Package: ikiwiki Architecture: all -Depends: ${perl:Depends}, libtext-markdown-perl | markdown, libhtml-scrubber-perl, libhtml-template-perl, libhtml-parser-perl, liburi-perl +Depends: ${misc:Depends}, ${perl:Depends}, libtext-markdown-perl | markdown, libhtml-scrubber-perl, libhtml-template-perl, libhtml-parser-perl, liburi-perl Recommends: gcc | c-compiler, libc6-dev | libc-dev, subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38), libxml-simple-perl, libnet-openid-consumer-perl, liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl, libauthen-passphrase-perl, libterm-readline-gnu-perl Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl, python, python-docutils, polygen, tidy, libhtml-tree-perl, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl, sparkline-php, texlive, dvipng, libtext-wikicreole-perl Conflicts: ikiwiki-plugin-table diff --git a/debian/rules b/debian/rules index bdbbf0050..0a7ce7a26 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ override_dh_compress: override_dh_auto_clean: # distclean moans about MANIFEST, this is quieter - -$(MAKE) realclean + if [ -e Makefile ]; then $(MAKE) realclean; fi # Not intended for use by anyone except the author. announcedir: -- cgit v1.2.3