[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. 5f74ce5dc7c497efcf2bc75a2b257a56ea496266

[Micah Anderson]

The following commit has been merged in the master branch:
commit 5f74ce5dc7c497efcf2bc75a2b257a56ea496266
Author: Micah Anderson <micah at riseup.net>
Date:   Wed Mar 12 00:48:57 2008 -0400

    * Updated outdated debian/control substrvar for puppet to ${source:Version}
    * Updated link in debian/copyright for new URL to license
    * Updated copyright in debian/copyright
    * Bumped standards version to 3.7.3.0 (no changes)
    * Switch debhelper from Build-Depends-Indep to Build-Depends because it is
      required to run clean target (lintian: clean-should-be-satisfied-by-build-depends)
    * Moved homepage from Description to control field
    * Added Vcs-Browser and Vcs-Git fields to debian/control

diff --git a/debian/changelog b/debian/changelog
index 6f14dd5..d2400dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,15 @@ puppet (0.24.3-1) UNRELEASED; urgency=low
   * Add factpath and pluginsync=true to the default puppet.conf so that
     facts added through pluginsync are loaded by puppet
   * Add [plugins] section to fileserver.conf
+  * Updated outdated debian/control substrvar for puppet to ${source:Version}
+  * Updated link in debian/copyright for new URL to license
+  * Updated copyright in debian/copyright
+  * Bumped standards version to 3.7.3.0 (no changes)
+  * Switch debhelper from Build-Depends-Indep to Build-Depends because it is
+    required to run clean target (lintian check:
+    clean-should-be-satisfied-by-build-depends)
+  * Moved homepage from Description to control field
+  * Added Vcs-Browser and Vcs-Git fields to debian/control
   [ Thom May ]
   * If puppet can't start, continue with package install
 
diff --git a/debian/control b/debian/control
index 8b0e92e..c809320 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,13 @@ Source: puppet
 Section: admin
 Priority: optional
 Maintainer: Puppet Package Maintainers <pkg-puppet-devel at lists.alioth.debian.org>
-Uploaders: Thom May <thom at debian.org>
-Build-Depends-Indep: debhelper (>= 4.0.0), ruby (>= 1.8.1)
-Standards-Version: 3.6.2
+Uploaders: Thom May <thom at debian.org>, Micah Anderson <micah at debian.org>
+Build-Depends-Indep: ruby (>= 1.8.1)
+Build-Depends: debhelper (>= 4.0.0)
+Standards-Version: 3.7.3.0
+Vcs-Git: git://git.debian.org/git/pkg-puppet/puppet.git
+Vcs-Browser: http://git.debian.org/?p=pkg-puppet/puppet.git
+Homepage: http://reductivelabs.com/trac/puppet
 
 Package: puppet
 Architecture: all
@@ -21,12 +25,10 @@ Description: centralised configuration management for networks
  classing abilities for drawing out the similarities between hosts while
  allowing them to be as specific as necessary, and it handles dependency
  and prerequisite relationships between objects clearly and explicitly.
- .
- Homepage: http://reductivelabs.com/projects/puppet
 
 Package: puppetmaster
 Architecture: all
-Depends: ruby (>= 1.8.1), puppet (= ${Source-Version}), facter, lsb-base
+Depends: ruby (>= 1.8.1), puppet (= ${source:Version}), facter, lsb-base
 Recommends: rails (>= 1.2.3-2), rdoc
 Description: centralised configuration management control daemon
  Puppet lets you centrally manage every important aspect of your system
@@ -41,5 +43,4 @@ Description: centralised configuration management control daemon
  and prerequisite relationships between objects clearly and explicitly.
  .
  This package contains the manifest server, 'puppetmaster'.
- .
- Homepage: http://reductivelabs.com/projects/puppet
+
diff --git a/debian/copyright b/debian/copyright
index 06bdcab..9053c4c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,12 +3,12 @@ Thu, 27 Apr 2006 10:18:04 +1000.
 
 It was downloaded from http://reductivelabs.com/downloads/puppet
 
-Copyright Holder: Luke Kanies <luke at madstop.com>
+Puppet - Automating Configuration Management. Copyright (C) 2005 Reductive Labs LLC
 
 License:
 
 From
-http://reductivelabs.com/documents/faq#what-license-is-puppet-released-under:
+http://reductivelabs.com/trac/puppet/wiki/FrequentlyAskedQuestions#what-license-is-puppet-released-under :
 
 Puppet is open source and is released under the GNU Public License.
 
diff --git a/debian/fileserver.conf b/debian/fileserver.conf
index 160b9d6..19cccda 100644
--- a/debian/fileserver.conf
+++ b/debian/fileserver.conf
@@ -14,4 +14,4 @@
 [plugins]
 #  allow *.example.com
 #  deny *.evil.example.com
-#  allow 192.168.0.0/24
\ No newline at end of file
+#  allow 192.168.0.0/24
diff --git a/debian/puppet.manpages b/debian/puppet.manpages
index c1389d9..d2b8b0d 100644
--- a/debian/puppet.manpages
+++ b/debian/puppet.manpages
@@ -1 +1 @@
-man/man8/puppet.8
\ No newline at end of file
+man/man8/puppet.8
diff --git a/debian/puppetmaster.manpages b/debian/puppetmaster.manpages
index c107737..4f42524 100644
--- a/debian/puppetmaster.manpages
+++ b/debian/puppetmaster.manpages
@@ -1 +1 @@
-man/man8/puppetmaster.8
\ No newline at end of file
+man/man8/puppetmaster.8
diff --git a/debian/rules b/debian/rules
index 5417620..e3e6da5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,7 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
+	rm -f man/man8/puppetmaster.8
 	dh_clean 
 
 install: build

-- 
Puppet packaging for Debian