Control: tags -1 + patch

Please see the attached patch, which you can apply with:

    git am 0001-Move-sbuild-debian-developer-setup-man-page-to-corre.patch

Best,
Ryan

-- 
|)|/  Ryan Kavanagh      | GPG: 4E46 9519 ED67 7734 268F
|\|\  https://rak.ac     |      BD95 8F7B F8FC 4A11 C97A
From 9be515da8f7fd377c1f6e0e4be103caeea635002 Mon Sep 17 00:00:00 2001
From: Ryan Kavanagh <r...@debian.org>
Date: Thu, 23 Aug 2018 15:31:12 -0400
Subject: [PATCH] Move sbuild-debian-developer-setup man page to correct
 package

---
 debian/control                               |  4 +++-
 debian/sbuild-debian-developer-setup.install |  1 +
 debian/sbuild.install                        | 13 ++++++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 6e551790..c00f44cf 100644
--- a/debian/control
+++ b/debian/control
@@ -77,13 +77,15 @@ Description: Tool for building Debian binary packages from Debian sources
 
 Package: sbuild-debian-developer-setup
 Architecture: all
-Depends: sbuild,
+Depends: sbuild (>= 0.77.0-5),
          schroot,
          apt-cacher-ng | apt-cacher,
          cron | cron-daemon,
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
+Replaces: sbuild (<< 0.77.0-5)
+Breaks: sbuild (<< 0.77.0-5)
 Description: Convenience script to set up an sbuild environment for Debian Developers
  Run "sudo sbuild-debian-developer-setup" to add the current user to the sbuild
  group, create an schroot for building packages for Debian unstable, and create
diff --git a/debian/sbuild-debian-developer-setup.install b/debian/sbuild-debian-developer-setup.install
index 6d2a1699..87306892 100644
--- a/debian/sbuild-debian-developer-setup.install
+++ b/debian/sbuild-debian-developer-setup.install
@@ -1,2 +1,3 @@
 usr/bin/sbuild-debian-developer-setup
 etc/sbuild-debian-developer-setup-update-all etc/cron.daily
+usr/share/man/man1/sbuild-debian-developer-setup.1
diff --git a/debian/sbuild.install b/debian/sbuild.install
index f6df2fb1..dd83bec3 100644
--- a/debian/sbuild.install
+++ b/debian/sbuild.install
@@ -15,7 +15,18 @@ debian/tmp/usr/bin/sbuild-createchroot         usr/bin
 debian/tmp/usr/sbin/sbuild-adduser             usr/sbin
 debian/tmp/usr/sbin/sbuild-destroychroot       usr/sbin
 debian/tmp/usr/share/doc/sbuild                usr/share/doc
-debian/tmp/usr/share/man/man1/sbuild*          usr/share/man/man1
+# sbuild*, but not sbuild-debian-developer-setup
+debian/tmp/usr/share/man/man1/sbuild.1         usr/share/man/man1
+debian/tmp/usr/share/man/man1/sbuild-checkpackages.1 usr/share/man/man1
+debian/tmp/usr/share/man/man1/sbuild-abort.1   usr/share/man/man1
+debian/tmp/usr/share/man/man1/sbuild-shell.1   usr/share/man/man1
+debian/tmp/usr/share/man/man1/sbuild-unhold.1  usr/share/man/man1
+debian/tmp/usr/share/man/man1/sbuild-hold.1    usr/share/man/man1
+debian/tmp/usr/share/man/man1/sbuild-update.1  usr/share/man/man1
+debian/tmp/usr/share/man/man1/sbuild-clean.1   usr/share/man/man1
+debian/tmp/usr/share/man/man1/sbuild-apt.1     usr/share/man/man1
+debian/tmp/usr/share/man/man1/sbuild-upgrade.1 usr/share/man/man1
+debian/tmp/usr/share/man/man1/sbuild-distupgrade.1 usr/share/man/man1
 debian/tmp/usr/share/man/man5/sbuild*          usr/share/man/man5
 debian/tmp/usr/share/man/man7/sbuild*          usr/share/man/man7
 debian/tmp/usr/share/man/man8/sbuild*          usr/share/man/man8
-- 
2.18.0

Attachment: signature.asc
Description: PGP signature

Reply via email to