[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.44-765-gbc61ac5

[Holger Levsen]

The following commit has been merged in the develop branch:
commit 6ff781353f107c3c2b5735d5fa68c58fa26c03ba
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Jun 18 21:02:13 2012 +0200

    Move /etc/sudoers.d/piuparts to piuparts-slave package.

diff --git a/TODO b/TODO
index e67cebd..5f255f7 100644
--- a/TODO
+++ b/TODO
@@ -11,8 +11,6 @@ for 0.45:
 - do not upload with sunny.png weather-severe-alert.png included. Replace them
   with links and add depends to tango-icon-theme. Update copyright.
 
-- conf/piuparts.sudoers needs to be moved to slave package
-
 - test installation via packages only.
 
 
@@ -28,6 +26,8 @@ for 0.46:
 - split /etc/piuparts/piuparts.conf in /etc/piuparts/master.conf and 
   /etc/piuparts/slave.conf?! or use /etc/default/slave to define sections?
 
+- conf/piuparts.sudoers should be split for master+slave packages.
+
 - merge/cleanup README_piatti.txt and README_server.txt?
 
 - use cdn.debian.net as mirror default (instead of "your.mirror.here") and provide
diff --git a/debian/changelog b/debian/changelog
index 7e7db77..3ed1075 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ piuparts (0.45) UNRELEASED; urgency=low
   * Switch to debhelper8 packaging.
   * debian/copyight: use versioned URI of the machine-readable copyright file,
     thanks lintian.
+  * Move /etc/sudoers.d/piuparts to piuparts-slave package.
 
   [ David Steele ]
   * Remove debian/postinst as it was only dealing with lenny time area
diff --git a/debian/piuparts-master.install b/debian/piuparts-master.install
index 2b393d2..67155ca 100644
--- a/debian/piuparts-master.install
+++ b/debian/piuparts-master.install
@@ -1,7 +1,6 @@
 etc/apache2/conf.d/piuparts.apache
 etc/cron.d/piuparts-master
 etc/piuparts*
-etc/sudoers.d/piuparts
 usr/share/piuparts/htdocs/*
 usr/share/piuparts/master/*
 usr/share/piuparts/piuparts-analyze
diff --git a/debian/piuparts-slave.install b/debian/piuparts-slave.install
index b4a0b81..c62c130 100644
--- a/debian/piuparts-slave.install
+++ b/debian/piuparts-slave.install
@@ -1,3 +1,4 @@
 etc/cron.d/piuparts-slave
+etc/sudoers.d/piuparts
 usr/share/piuparts/piuparts-slave
 usr/share/piuparts/slave/*

-- 
piuparts git repository