launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad-buildd/buildd-slave-tac-manifest-fix into lp:launchpad-buildd.

Commit message:
Fix inclusion of buildd-slave.tac in MANIFEST.in.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~wgrant/launchpad-buildd/buildd-slave-tac-manifest-fix/+merge/334234

Fix inclusion of buildd-slave.tac in MANIFEST.in.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad-buildd/buildd-slave-tac-manifest-fix into lp:launchpad-buildd.

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2017-09-08 17:26:34 +0000
+++ MANIFEST.in	2017-11-24 12:27:50 +0000
@@ -11,4 +11,5 @@
 include debian/changelog
 include sbuildrc
 include template-buildd-slave.conf
-recursive-include lpbuildd/tests *.diff *.tar.gz buildd-slave.tac buildd-slave-test.conf buildlog buildlog.long
+include lpbuildd/buildd-slave.tac
+recursive-include lpbuildd/tests *.diff *.tar.gz buildd-slave-test.conf buildlog buildlog.long

=== modified file 'debian/changelog'
--- debian/changelog	2017-11-22 15:31:09 +0000
+++ debian/changelog	2017-11-24 12:27:50 +0000
@@ -1,5 +1,6 @@
 launchpad-buildd (157) UNRELEASED; urgency=medium
 
+  [ Colin Watson ]
   * Normalise Python packaging.  We now install our modules on the normal
     system path, using pybuild.  setup.py now installs buildd-slave.tac in
     the lpbuildd package rather than data_files in order not to pollute the
@@ -7,6 +8,9 @@
   * Fall back to the package name from AC_INIT when expanding $(PACKAGE) in
     translation configuration files if no other definition can be found.
 
+  [ William Grant ]
+  * Fix inclusion of buildd-slave.tac in MANIFEST.in.
+
  -- Colin Watson <cjwatson@xxxxxxxxxx>  Wed, 22 Nov 2017 15:24:06 +0000
 
 launchpad-buildd (156) xenial; urgency=medium