Merge branch 'gdr-manpages' into wip.rebase

diff --combined .gitignore
index e821bb4afae698838adf0f04a3a977422d0c1da7,a804fa3cac5236228d3b5d737c3b60c4af06935e..ba7af7890f82c3a3d80d504b71755d5bdc8e9d6c
--- 1/.gitignore
--- 2/.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 0073b427f0e8d243fae291248a1ce1b379816883,3eca3121ff89a1ce2981d559c57e53444e193f7a..de28f4d690c967f43d2cd2e913d5cd189fcb532d
--- 1/Makefile
--- 2/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 $*