From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 17 Jun 2018 22:02:06 +0000 (+0100)
Subject: Merge branch 'gdr-manpages' into wip.rebase
X-Git-Tag: archive/debian/5.0~6
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=4eee70a2b1710c1a8fc71fbd3cdc7064682a799c;hp=-c

Merge branch 'gdr-manpages' into wip.rebase
---

4eee70a2b1710c1a8fc71fbd3cdc7064682a799c
diff --combined .gitignore
index e821bb4a,a804fa3c..ba7af789
--- a/.gitignore
+++ b/.gitignore
@@@ -1,7 -1,6 +1,7 @@@
  *~
  tests/tmp
  debian/dgit
 +debian/git-debrebase
  debian/dgit-infrastructure
  debian/files
  debian/*.substvars
@@@ -12,7 -11,6 +12,8 @@@ dgit-nmu-simple.
  dgit-maint-native.7
  dgit-maint-merge.7
  dgit-maint-gbp.7
+ dgit-maint-debrebase.7
  dgit-sponsorship.7
 +git-debrebase.1
 +git-debrebase.5
  substituted
diff --combined Makefile
index 0073b427,3eca3121..de28f4d6
--- a/Makefile
+++ b/Makefile
@@@ -27,7 -27,6 +27,7 @@@ bindir=$(prefix)/bi
  mandir=$(prefix)/share/man
  perldir=$(prefix)/share/perl5
  man1dir=$(mandir)/man1
 +man5dir=$(mandir)/man5
  man7dir=$(mandir)/man7
  infraexamplesdir=$(prefix)/share/doc/dgit-infrastructure/examples
  txtdocdir=$(prefix)/share/doc/dgit
@@@ -40,20 -39,13 +40,21 @@@ MAN7PAGES=dgit.7				
  	dgit-user.7 dgit-nmu-simple.7		\
  	dgit-maint-native.7			\
  	dgit-maint-merge.7 dgit-maint-gbp.7	\
+ 	dgit-maint-debrebase.7                  \
  	dgit-sponsorship.7
  
  TXTDOCS=README.dsc-import
 -PERLMODULES=Debian/Dgit.pm
 +PERLMODULES=Debian/Dgit.pm Debian/Dgit/ExitStatus.pm
  ABSURDITIES=git
  
 +GDR_PROGRAMS=git-debrebase
 +GDR_PERLMODULES= \
 +	Debian/Dgit.pm \
 +	Debian/Dgit/GDR.pm \
 +	Debian/Dgit/ExitStatus.pm
 +GDR_MAN1PAGES=git-debrebase.1
 +GDR_MAN5PAGES=git-debrebase.5
 +
  INFRA_PROGRAMS=dgit-repos-server dgit-ssh-dispatch \
  	dgit-repos-policy-debian dgit-repos-admin-debian \
  	dgit-repos-policy-trusting dgit-mirror-rsync
@@@ -63,10 -55,7 +64,10 @@@ INFRA_PERLMODULES= 
  	Debian/Dgit/Infra.pm \
  	Debian/Dgit/Policy/Debian.pm
  
 -all:	$(MAN7PAGES) $(addprefix substituted/,$(PROGRAMS))
 +MANPAGES=$(MAN1PAGES) $(MAN5PAGES) $(MAN7PAGES) \
 +	$(GDR_MAN1PAGES) $(GDR_MAN5PAGES)
 +
 +all:	$(MANPAGES) $(addprefix substituted/,$(PROGRAMS))
  
  substituted/%:	%
  	mkdir -p substituted
@@@ -87,19 -76,10 +88,19 @@@ install:	installdirs al
  
  installdirs:
  	$(INSTALL_DIR) $(DESTDIR)$(bindir) \
 -		$(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir) \
 +		$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
 +		$(DESTDIR)$(man7dir) \
  		$(DESTDIR)$(txtdocdir) $(DESTDIR)$(absurddir) \
  		$(addprefix $(DESTDIR)$(perldir)/, $(dir $(PERLMODULES)))
  
 +install-gdr:	installdirs-gdr
 +	$(INSTALL_PROGRAM) $(GDR_PROGRAMS) $(DESTDIR)$(bindir)
 +	$(INSTALL_DATA) $(GDR_MAN1PAGES) $(DESTDIR)$(man1dir)
 +	$(INSTALL_DATA) $(GDR_MAN5PAGES) $(DESTDIR)$(man5dir)
 +	set -e; for m in $(GDR_PERLMODULES); do \
 +		$(INSTALL_DATA) $$m $(DESTDIR)$(perldir)/$${m%/*}; \
 +	done
 +
  install-infra:	installdirs-infra
  	$(INSTALL_PROGRAM) $(addprefix infra/, $(INFRA_PROGRAMS)) \
  		$(DESTDIR)$(bindir)
@@@ -109,11 -89,6 +110,11 @@@
  		$(INSTALL_DATA) $$m $(DESTDIR)$(perldir)/$${m%/*}; \
  	done
  
 +installdirs-gdr:
 +	$(INSTALL_DIR) $(DESTDIR)$(bindir) \
 +		$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
 +		$(addprefix $(DESTDIR)$(perldir)/, $(dir $(GDR_PERLMODULES)))
 +
  installdirs-infra:
  	$(INSTALL_DIR) $(DESTDIR)$(bindir) $(DESTDIR)$(infraexamplesdir) \
  		$(addprefix $(DESTDIR)$(perldir)/, $(dir $(INFRA_PERLMODULES)))
@@@ -122,7 -97,7 +123,7 @@@ check installcheck
  
  clean distclean mostlyclean maintainer-clean:
  	rm -rf tests/tmp substituted
 -	set -e; for m in $(MAN7PAGES); do \
 +	set -e; for m in $(MANPAGES); do \
  		test -e $$m.pod && rm -f $$m; \
  	done
  
@@@ -131,10 -106,5 +132,10 @@@
  		--name=$(subst .7,,$@) \
  		$^ $@
  
 +git-debrebase.%: git-debrebase.%.pod
 +	pod2man --section=$* --date="Debian Project" --center="git-debrebase" \
 +		--name=$(subst .$*,,$@) \
 +		$^ $@
 +
  %.view:	%
  	man -l $*