[devscripts] 08/08: Merge branch 'master' of git://anonscm.debian.org/collab-maint/devscripts

[Nicholas Bamber]

This is an automated email from the git hooks/post-receive script.

periapt pushed a commit to branch master
in repository devscripts.

commit 96ac9822d8381ba19fc822fce0aabfc329812903
Merge: 35a5ef8 8960ed7
Author: Nicholas Bamber <nicholas at periapt.co.uk>
Date:   Fri Nov 13 15:11:55 2015 +0000

    Merge branch 'master' of git://anonscm.debian.org/collab-maint/devscripts

 debian/control  | 2 +-
 debian/links    | 8 ++++----
 debian/manpages | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --cc debian/links
index 4ade7c4,c75ebf9..863ec89
--- a/debian/links
+++ b/debian/links
@@@ -3,32 -3,11 +3,32 @@@
  /usr/bin/debi					/usr/bin/debc
  /usr/bin/pts-subscribe				/usr/bin/pts-unsubscribe
  /usr/share/devscripts/conf.default		/usr/share/doc/devscripts/devscripts.conf.ex
- /usr/share/man/man1/debchange.1.gz		/usr/share/man/man1/dch.1.gz
- /usr/share/man/man1/pts-subscribe.1.gz		/usr/share/man/man1/pts-unsubscribe.1.gz
  /usr/share/man/de/man1/debchange.1.gz		/usr/share/man/de/man1/dch.1.gz
- /usr/share/man/de/man1/pts-subscribe.1.gz	/usr/share/man/de/man1/pts-unsubscribe.1.gz
  /usr/share/man/de/man1/edit-patch.1.gz		/usr/share/man/de/man1/add-patch.1.gz
+ /usr/share/man/de/man1/pts-subscribe.1.gz	/usr/share/man/de/man1/pts-unsubscribe.1.gz
  /usr/share/man/fr/man1/debchange.1.gz		/usr/share/man/fr/man1/dch.1.gz
- /usr/share/man/fr/man1/pts-subscribe.1.gz	/usr/share/man/fr/man1/pts-unsubscribe.1.gz
  /usr/share/man/fr/man1/edit-patch.1.gz		/usr/share/man/fr/man1/add-patch.1.gz
+ /usr/share/man/fr/man1/pts-subscribe.1.gz	/usr/share/man/fr/man1/pts-unsubscribe.1.gz
+ /usr/share/man/man1/debchange.1.gz		/usr/share/man/man1/dch.1.gz
+ /usr/share/man/man1/pts-subscribe.1.gz		/usr/share/man/man1/pts-unsubscribe.1.gz
 +/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/wnpp-alert
 +/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/wnpp-check
 +/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/mk-build-deps
 +/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/rmadison
 +/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/mass-bug
 +/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/debsnap
 +/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/dd-list
 +/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/build-rdeps
 +/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/who-uploads
 +/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/transition-check
 +/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/getbuildlog
 +/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/dcontrol
 +/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/grep-excuses
 +/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/rc-alert
 +/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/bts
 +/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/whodepends
 +/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/dget
 +/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/pts-subscribe
 +/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/pts-unsubscribe
 +/usr/share/bash-completion/completions/debchange /usr/share/bash-completion/completions/dch
 +/usr/share/bash-completion/completions/debi /usr/share/bash-completion/completions/debc

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git