diff options
author | Jason Kincl <kincljc@ornl.gov> | 2012-11-19 10:37:34 -0500 |
---|---|---|
committer | Jason Kincl <kincljc@ornl.gov> | 2012-11-19 10:37:34 -0500 |
commit | 894299b01b6138c54a99fd41f166554d175d6106 (patch) | |
tree | 88e11cb8c49d3f933cf5f622a93dfa123922960f /debian | |
parent | de0ae51b6dc635a3acd2491d4ca3fd021aa55873 (diff) | |
parent | f4da37aa0a360add3f5c40f37cd3cc010ef8788f (diff) | |
download | bcfg2-894299b01b6138c54a99fd41f166554d175d6106.tar.gz bcfg2-894299b01b6138c54a99fd41f166554d175d6106.tar.bz2 bcfg2-894299b01b6138c54a99fd41f166554d175d6106.zip |
Merge remote branch 'upstream/master' into jasons-hacking
Diffstat (limited to 'debian')
-rw-r--r-- | debian/NEWS | 16 | ||||
-rw-r--r-- | debian/bcfg2-doc.docs | 1 | ||||
-rw-r--r-- | debian/bcfg2-doc.links | 1 | ||||
-rw-r--r-- | debian/bcfg2-server.examples | 1 | ||||
-rwxr-xr-x | debian/bcfg2-server.init | 8 | ||||
-rwxr-xr-x[-rw-r--r--] | debian/bcfg2.init | 15 | ||||
-rw-r--r-- | debian/control | 2 | ||||
-rwxr-xr-x | debian/rules | 4 |
8 files changed, 33 insertions, 15 deletions
diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 000000000..7f99a8eb7 --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,16 @@ +bcfg2 (1.1.0-1) unstable; urgency=low + + Due to repository changes made to support Path entries it is recommended + to upgrade the clients before upgrading the server. After that, you can + use the posixunified.py script (included as an example in the server + package) to convert your repository. + + -- Arto Jantunen <viiru@debian.org> Fri, 05 Nov 2010 19:07:59 +0200 + +bcfg2 (1.0.1-1) unstable; urgency=low + + Since version 1.0, Bcfg2 no longer supports agent mode. Please update your + configuration accordingly if you were using it. + + -- Arto Jantunen <viiru@debian.org> Tue, 03 Aug 2010 12:28:54 +0300 + diff --git a/debian/bcfg2-doc.docs b/debian/bcfg2-doc.docs new file mode 100644 index 000000000..6f7511e54 --- /dev/null +++ b/debian/bcfg2-doc.docs @@ -0,0 +1 @@ +build/sphinx/html diff --git a/debian/bcfg2-doc.links b/debian/bcfg2-doc.links deleted file mode 100644 index 133a58e2e..000000000 --- a/debian/bcfg2-doc.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/bcfg2/html/_sources usr/share/doc/bcfg2/rst diff --git a/debian/bcfg2-server.examples b/debian/bcfg2-server.examples new file mode 100644 index 000000000..98ec4b785 --- /dev/null +++ b/debian/bcfg2-server.examples @@ -0,0 +1 @@ +tools/upgrade diff --git a/debian/bcfg2-server.init b/debian/bcfg2-server.init index a1fa65d14..8de16b9b5 100755 --- a/debian/bcfg2-server.init +++ b/debian/bcfg2-server.init @@ -7,13 +7,13 @@ # ### BEGIN INIT INFO # Provides: bcfg2-server -# Required-Start: $network $remote_fs $named -# Required-Stop: $network $remote_fs $named +# Required-Start: $network $remote_fs $named $syslog +# Required-Stop: $network $remote_fs $named $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Configuration management Server -# Description: Bcfg2 is a configuration management system that builds -# installs configuration files served by bcfg2-server +# Description: The server component of the Bcfg2 configuration management +# system ### END INIT INFO # Include lsb functions diff --git a/debian/bcfg2.init b/debian/bcfg2.init index add840c90..4f83adbf6 100644..100755 --- a/debian/bcfg2.init +++ b/debian/bcfg2.init @@ -70,16 +70,17 @@ start () { case "$1" in start) start - ;; - stop) + ;; + stop|status) exit 0 - ;; + ;; restart|force-reload) start - ;; - *) - echo "Usage: $0 {start|stop|restart|force-reload}" - exit 1 + ;; + *) + echo "Usage: $0 {start|stop|status|restart|force-reload}" + exit 1 + ;; esac exit 0 diff --git a/debian/control b/debian/control index 28ddbf9aa..be03f4942 100644 --- a/debian/control +++ b/debian/control @@ -42,9 +42,9 @@ Description: Configuration management web interface bcfg2-web is the reporting server for bcfg2. Package: bcfg2-doc +Section: doc Architecture: all Depends: ${sphinxdoc:Depends}, ${misc:Depends} -XB-Python-Version: >= 2.4 Description: Configuration management system documentation Bcfg2 is a configuration management system that generates configuration sets for clients bound by client profiles. diff --git a/debian/rules b/debian/rules index 30fd64a43..fcbf6346c 100755 --- a/debian/rules +++ b/debian/rules @@ -16,9 +16,9 @@ override_dh_installinit: # Install bcfg2-server initscript without starting it on postinst dh_installinit --package=bcfg2-server --no-start -override_dh_installdocs: +override_dh_auto_build: + dh_auto_build python setup.py build_sphinx - dh_installdocs build/sphinx/html override_dh_auto_clean: dh_auto_clean |