[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/2.6.0-2-119-g611c2bb

[Mathias Gug]

The following commit has been merged in the master branch:
commit 36175240d47cc183ec749d09838b6fecdae6d8ab
Author: Mathias Gug <mathias.gug at canonical.com>
Date:   Thu Aug 19 18:54:54 2010 -0400

    Move common master files to puppetmaster-common.
    
    Move files needed by the master to run under both webrick and passenger.

diff --git a/debian/puppetmaster.docs b/debian/puppetmaster-common.docs
similarity index 100%
rename from debian/puppetmaster.docs
rename to debian/puppetmaster-common.docs
diff --git a/debian/puppetmaster.install b/debian/puppetmaster-common.install
similarity index 82%
copy from debian/puppetmaster.install
copy to debian/puppetmaster-common.install
index 8ba97cf..1457e09 100644
--- a/debian/puppetmaster.install
+++ b/debian/puppetmaster-common.install
@@ -1,7 +1,6 @@
 debian/fileserver.conf etc/puppet
 conf/auth.conf etc/puppet
 ext/puppetlast usr/bin
-debian/tmp/usr/sbin/puppetmasterd usr/sbin
 debian/tmp/usr/sbin/puppetca usr/sbin
 debian/tmp/usr/sbin/puppetrun usr/sbin
 debian/tmp/usr/sbin/puppetqd usr/sbin
diff --git a/debian/puppetmaster.manpages b/debian/puppetmaster-common.manpages
similarity index 70%
copy from debian/puppetmaster.manpages
copy to debian/puppetmaster-common.manpages
index 3ec4315..3ef3fb9 100644
--- a/debian/puppetmaster.manpages
+++ b/debian/puppetmaster-common.manpages
@@ -1,4 +1,3 @@
-man/man8/puppetmasterd.8
 man/man8/puppetrun.8
 man/man8/puppetca.8
 man/man8/puppetqd.8
diff --git a/debian/puppetmaster.install b/debian/puppetmaster.install
index 8ba97cf..be155ee 100644
--- a/debian/puppetmaster.install
+++ b/debian/puppetmaster.install
@@ -1,7 +1 @@
-debian/fileserver.conf etc/puppet
-conf/auth.conf etc/puppet
-ext/puppetlast usr/bin
 debian/tmp/usr/sbin/puppetmasterd usr/sbin
-debian/tmp/usr/sbin/puppetca usr/sbin
-debian/tmp/usr/sbin/puppetrun usr/sbin
-debian/tmp/usr/sbin/puppetqd usr/sbin
diff --git a/debian/puppetmaster.manpages b/debian/puppetmaster.manpages
index 3ec4315..08717a0 100644
--- a/debian/puppetmaster.manpages
+++ b/debian/puppetmaster.manpages
@@ -1,4 +1 @@
 man/man8/puppetmasterd.8
-man/man8/puppetrun.8
-man/man8/puppetca.8
-man/man8/puppetqd.8

-- 
Puppet packaging for Debian