[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.44-836-g931cbb1

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 517e5046d73a62d67d9e06dcb1b1bd4f1cad2b4d
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Thu Jun 21 12:01:04 2012 +0200

    p-s.deb: ship piuparts.conf
    
    instead of in the master package
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/README_server.txt b/README_server.txt
index 8b10570..d9b5a13 100644
--- a/README_server.txt
+++ b/README_server.txt
@@ -1,7 +1,9 @@
 The piuparts-server package installs a piuparts server along the lines of
 http://piuparts.debian.org/.
 
-Before running the server, edit /etc/piuparts.conf appropriately, to define
+Before running the server, edit /etc/piuparts.conf appropriately (install
+piuparts-slave (which ships that file), too, or use the template
+/usr/share/doc/piuparts-master/piuparts.conf.sample), to define
 'sections' to be tested (e.g. 'sid') and define references to the Debian
 mirror. Note that the server can place a significant load on the
 repository. Consider setting up a local mirror, or a caching proxy for http
diff --git a/debian/changelog b/debian/changelog
index c5b9bbd..90377c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -178,6 +178,7 @@ piuparts (0.45) UNRELEASED; urgency=low
     requiring explicit editing after installation to activate them.
   * Bump debhelper and dpkg dependencies for using dpkg-maintscript-helper.
   * Remove obsolete /etc/piuparts/piuparts.conf from old piuparts package.
+  * Ship /etc/piuparts/piuparts.conf in the piuparts-slave package.
 
   [ Leo Iannacone ]
   * piuparts.py: add --existing-chroot option, specify a directory as source
diff --git a/debian/piuparts-master.docs b/debian/piuparts-master.docs
index 3869fd5..2506164 100644
--- a/debian/piuparts-master.docs
+++ b/debian/piuparts-master.docs
@@ -1,2 +1,3 @@
 README_server.txt
 README_piatti.txt
+conf/piuparts.conf.sample
diff --git a/debian/piuparts-master.install b/debian/piuparts-master.install
index 0938c8d..ccd0a69 100644
--- a/debian/piuparts-master.install
+++ b/debian/piuparts-master.install
@@ -1,6 +1,5 @@
 etc/apache2/conf.d/piuparts.apache
 etc/cron.d/piuparts-master
-etc/piuparts/piuparts.conf
 #etc/piuparts/known_problems/
 usr/share/piuparts/htdocs/*
 usr/share/piuparts/master/*
diff --git a/debian/piuparts-slave.install b/debian/piuparts-slave.install
index c62c130..d1415f1 100644
--- a/debian/piuparts-slave.install
+++ b/debian/piuparts-slave.install
@@ -1,4 +1,5 @@
 etc/cron.d/piuparts-slave
+etc/piuparts/piuparts.conf
 etc/sudoers.d/piuparts
 usr/share/piuparts/piuparts-slave
 usr/share/piuparts/slave/*

-- 
piuparts git repository