[DRE-commits] r4006 - in trunk/chef/debian: . patches
Joshua Timberman
jtimberman-guest at alioth.debian.org
Thu Aug 27 15:22:03 UTC 2009
Author: jtimberman-guest
Date: 2009-08-27 15:22:02 +0000 (Thu, 27 Aug 2009)
New Revision: 4006
Added:
trunk/chef/debian/README.source
trunk/chef/debian/chef-indexer.logrotate
trunk/chef/debian/chef-indexer.postrm
trunk/chef/debian/chef-server-slice.postrm
trunk/chef/debian/chef-server.lintian-overrides
trunk/chef/debian/chef-server.logrotate
trunk/chef/debian/chef-server.overrides
trunk/chef/debian/chef-server.postrm
trunk/chef/debian/chef.logrotate
trunk/chef/debian/chef.postrm
trunk/chef/debian/stamp-patched
Modified:
trunk/chef/debian/changelog
trunk/chef/debian/chef-client.8
trunk/chef/debian/chef-client.init
trunk/chef/debian/chef-indexer.1
trunk/chef/debian/chef-indexer.dirs
trunk/chef/debian/chef-indexer.init
trunk/chef/debian/chef-server-slice.dirs
trunk/chef/debian/chef-server.1
trunk/chef/debian/chef-server.dirs
trunk/chef/debian/chef-server.init
trunk/chef/debian/chef-solo.8
trunk/chef/debian/chef.dirs
trunk/chef/debian/control
trunk/chef/debian/copyright
trunk/chef/debian/patches/fix_slice_dirs.patch
trunk/chef/debian/patches/remove_rubygems.patch
trunk/chef/debian/patches/series
trunk/chef/debian/rules
trunk/chef/debian/watch
Log:
updates and improvements after packaging for Ubuntu
Added: trunk/chef/debian/README.source
===================================================================
--- trunk/chef/debian/README.source (rev 0)
+++ trunk/chef/debian/README.source 2009-08-27 15:22:02 UTC (rev 4006)
@@ -0,0 +1,5 @@
+ This package uses quilt to manage all modifications to the upstream
+ source. Changes are stored in the source package as diffs in
+ debian/patches and applied during the build.
+
+ See /usr/share/doc/quilt/README.source for a detailed explanation.
Modified: trunk/chef/debian/changelog
===================================================================
--- trunk/chef/debian/changelog 2009-08-27 15:17:41 UTC (rev 4005)
+++ trunk/chef/debian/changelog 2009-08-27 15:22:02 UTC (rev 4006)
@@ -1,5 +1,5 @@
chef (0.7.8-1) unstable; urgency=low
- * Initial release (Closes: #529392)
+ * Initial release (Closes: #529392)
-- Joshua Timberman <joshua at opscode.com> Wed, 12 Aug 2009 12:18:48 -0600
Modified: trunk/chef/debian/chef-client.8
===================================================================
--- trunk/chef/debian/chef-client.8 2009-08-27 15:17:41 UTC (rev 4005)
+++ trunk/chef/debian/chef-client.8 2009-08-27 15:22:02 UTC (rev 4006)
@@ -54,4 +54,8 @@
Full documentation for Chef and chef-client is located on the Chef wiki, http://wiki.opscode.com/display/chef/Home.
.SH AUTHOR
Chef was written by Adam Jacob <adam at ospcode.com> of Opscode (http://www.opscode.com), with contributions from the community.
-This manual page was written by Joshua Timberman <joshua at opscode.com> with help2man
+This manual page was written by Joshua Timberman <joshua at opscode.com> with help2man. Permission is granted
+to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.
+
+On Debian systems, the complete text of the Apache 2.0 License can be found in
+/usr/share/common-licenses/Apache-2.0.
Modified: trunk/chef/debian/chef-client.init
===================================================================
--- trunk/chef/debian/chef-client.init 2009-08-27 15:17:41 UTC (rev 4005)
+++ trunk/chef/debian/chef-client.init 2009-08-27 15:22:02 UTC (rev 4006)
@@ -78,17 +78,17 @@
reload_server() {
[ ! -f "$PIDFILE" ] && return 1
pid=pidofproc $PIDFILE # This is the daemon's pid
- kill -1 $pid
+ /bin/kill -1 $pid
return $?
}
force_stop() {
[ ! -e "$PIDFILE" ] && return
if running ; then
- kill -15 $pid
+ /bin/kill -15 $pid
sleep "$DIETIME"s
if running ; then
- kill -9 $pid
+ /bin/kill -9 $pid
sleep "$DIETIME"s
if running ; then
echo "Cannot kill $NAME (pid=$pid)!"
@@ -157,7 +157,7 @@
else
log_progress_msg "apparently not running"
log_end_msg 1
- exit 1
+ exit 3
fi
;;
reload)
Modified: trunk/chef/debian/chef-indexer.1
===================================================================
--- trunk/chef/debian/chef-indexer.1 2009-08-27 15:17:41 UTC (rev 4005)
+++ trunk/chef/debian/chef-indexer.1 2009-08-27 15:22:02 UTC (rev 4006)
@@ -35,4 +35,8 @@
Full documentation for Chef and chef-indexer is located on the Chef wiki, http://wiki.opscode.com/display/chef/Home.
.SH AUTHOR
Chef was written by Adam Jacob <adam at ospcode.com> of Opscode (http://www.opscode.com), with contributions from the community.
-This manual page was written by Joshua Timberman <joshua at opscode.com> with help2man
+This manual page was written by Joshua Timberman <joshua at opscode.com> with help2man. Permission is granted
+to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.
+
+On Debian systems, the complete text of the Apache 2.0 License can be found in
+/usr/share/common-licenses/Apache-2.0.
Modified: trunk/chef/debian/chef-indexer.dirs
===================================================================
--- trunk/chef/debian/chef-indexer.dirs 2009-08-27 15:17:41 UTC (rev 4005)
+++ trunk/chef/debian/chef-indexer.dirs 2009-08-27 15:22:02 UTC (rev 4006)
@@ -1,5 +1,3 @@
var/lib/chef/search_index
var/log/chef
-usr/bin
etc/chef
-etc/init.d
Modified: trunk/chef/debian/chef-indexer.init
===================================================================
--- trunk/chef/debian/chef-indexer.init 2009-08-27 15:17:41 UTC (rev 4005)
+++ trunk/chef/debian/chef-indexer.init 2009-08-27 15:22:02 UTC (rev 4006)
@@ -78,17 +78,17 @@
reload_server() {
[ ! -f "$PIDFILE" ] && return 1
pid=pidofproc $PIDFILE # This is the daemon's pid
- kill -1 $pid
+ /bin/kill -1 $pid
return $?
}
force_stop() {
[ ! -e "$PIDFILE" ] && return
if running ; then
- kill -15 $pid
+ /bin/kill -15 $pid
sleep "$DIETIME"s
if running ; then
- kill -9 $pid
+ /bin/kill -9 $pid
sleep "$DIETIME"s
if running ; then
echo "Cannot kill $NAME (pid=$pid)!"
@@ -105,7 +105,7 @@
if running ; then
log_progress_msg "apparently already running"
log_end_msg 0
- exit 0
+ exit 3
fi
if start_server ; then
[ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time
Added: trunk/chef/debian/chef-indexer.logrotate
===================================================================
--- trunk/chef/debian/chef-indexer.logrotate (rev 0)
+++ trunk/chef/debian/chef-indexer.logrotate 2009-08-27 15:22:02 UTC (rev 4006)
@@ -0,0 +1,8 @@
+/var/log/chef/indexer.log {
+ rotate 12
+ weekly
+ compress
+ postrotate
+ /etc/init.d/chef-indexer force-reload
+ endscript
+}
Added: trunk/chef/debian/chef-indexer.postrm
===================================================================
--- trunk/chef/debian/chef-indexer.postrm (rev 0)
+++ trunk/chef/debian/chef-indexer.postrm 2009-08-27 15:22:02 UTC (rev 4006)
@@ -0,0 +1,26 @@
+#!/bin/sh
+# postrm script for chef-indexer
+#
+# see: dh_installdeb(1)
+
+set -e
+
+case "$1" in
+ purge)
+ rm -rf /var/log/chef/indexer*
+ ;;
+ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Modified: trunk/chef/debian/chef-server-slice.dirs
===================================================================
--- trunk/chef/debian/chef-server-slice.dirs 2009-08-27 15:17:41 UTC (rev 4005)
+++ trunk/chef/debian/chef-server-slice.dirs 2009-08-27 15:22:02 UTC (rev 4006)
@@ -2,6 +2,5 @@
var/lib/chef/cookbooks
var/lib/chef/openid
var/lib/chef/search_index
-var/log/chef
usr/share/doc/chef-server-slice
usr/share/chef-server-slice/app
Added: trunk/chef/debian/chef-server-slice.postrm
===================================================================
--- trunk/chef/debian/chef-server-slice.postrm (rev 0)
+++ trunk/chef/debian/chef-server-slice.postrm 2009-08-27 15:22:02 UTC (rev 4006)
@@ -0,0 +1,26 @@
+#!/bin/sh
+# postrm script for chef-server-slice
+#
+# see: dh_installdeb(1)
+
+set -e
+
+case "$1" in
+ remove)
+ rm -rf /var/cache/chef
+ ;;
+ purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Modified: trunk/chef/debian/chef-server.1
===================================================================
--- trunk/chef/debian/chef-server.1 2009-08-27 15:17:41 UTC (rev 4005)
+++ trunk/chef/debian/chef-server.1 2009-08-27 15:22:02 UTC (rev 4006)
@@ -101,4 +101,8 @@
.SH AUTHOR
Chef was written by Adam Jacob <adam at ospcode.com> of Opscode (http://www.opscode.com), with contributions from the community.
This manual page was written by Joshua Timberman <joshua at opscode.com> with help2man
-for the Debian project (but may be used by others).
+for the Debian project (but may be used by others).. Permission is granted
+ to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.
+
+ On Debian systems, the complete text of the Apache 2.0 License can be found in
+ /usr/share/common-licenses/Apache-2.0.
Modified: trunk/chef/debian/chef-server.dirs
===================================================================
--- trunk/chef/debian/chef-server.dirs 2009-08-27 15:17:41 UTC (rev 4005)
+++ trunk/chef/debian/chef-server.dirs 2009-08-27 15:22:02 UTC (rev 4006)
@@ -4,7 +4,6 @@
var/lib/chef/openid/store
var/lib/chef/openid/cstore
var/log/chef
-usr/bin
usr/share/doc/chef-server
usr/share/chef-server
etc/chef
Modified: trunk/chef/debian/chef-server.init
===================================================================
--- trunk/chef/debian/chef-server.init 2009-08-27 15:17:41 UTC (rev 4005)
+++ trunk/chef/debian/chef-server.init 2009-08-27 15:22:02 UTC (rev 4006)
@@ -18,10 +18,11 @@
DAEMON=/usr/bin/chef-server
PIDFILE=/var/run/chef/server.%s.pid
MAINPID=/var/run/chef/server.main.pid
+LOGFILE=/var/log/chef/merb.%s.log
MASTER=master
NAME=chef-server
DESC=chef-server
-DAEMON_OPTS="-d -c2 -P $PIDFILE"
+DAEMON_OPTS="-d -c2 -P $PIDFILE -L $LOGFILE"
test -x $DAEMON || exit 0
@@ -105,7 +106,7 @@
else
log_progress_msg "apparently not running"
log_end_msg 1
- exit 1
+ exit 3
fi
;;
*)
Added: trunk/chef/debian/chef-server.lintian-overrides
===================================================================
--- trunk/chef/debian/chef-server.lintian-overrides (rev 0)
+++ trunk/chef/debian/chef-server.lintian-overrides 2009-08-27 15:22:02 UTC (rev 4006)
@@ -0,0 +1,2 @@
+# jquery package from Debian is untested with chef-server and is pending upstream review.
+chef-server: embedded-javascript-library
Added: trunk/chef/debian/chef-server.logrotate
===================================================================
--- trunk/chef/debian/chef-server.logrotate (rev 0)
+++ trunk/chef/debian/chef-server.logrotate 2009-08-27 15:22:02 UTC (rev 4006)
@@ -0,0 +1,9 @@
+/var/log/chef/server.log /var/log/chef/merb*log {
+ rotate 12
+ weekly
+ compress
+ postrotate
+ /etc/init.d/chef-server force-reload
+ endscript
+}
+
Added: trunk/chef/debian/chef-server.overrides
===================================================================
--- trunk/chef/debian/chef-server.overrides (rev 0)
+++ trunk/chef/debian/chef-server.overrides 2009-08-27 15:22:02 UTC (rev 4006)
@@ -0,0 +1,2 @@
+# jquery package from Karmic is untested with chef-server and is pending upstream review.
+W: chef-server: embedded-javascript-library usr/share/chef-server/public/javascripts/jquery.js
Added: trunk/chef/debian/chef-server.postrm
===================================================================
--- trunk/chef/debian/chef-server.postrm (rev 0)
+++ trunk/chef/debian/chef-server.postrm 2009-08-27 15:22:02 UTC (rev 4006)
@@ -0,0 +1,30 @@
+#!/bin/sh
+# postrm script for chef-server
+#
+# see: dh_installdeb(1)
+
+set -e
+
+case "$1" in
+ remove)
+ rm -rf /var/cache/chef
+ ;;
+ purge)
+ rm -rf /var/log/chef/server*
+ rm -rf /var/log/chef/merb*
+ ;;
+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Modified: trunk/chef/debian/chef-solo.8
===================================================================
--- trunk/chef/debian/chef-solo.8 2009-08-27 15:17:41 UTC (rev 4005)
+++ trunk/chef/debian/chef-solo.8 2009-08-27 15:22:02 UTC (rev 4006)
@@ -51,4 +51,8 @@
Full documentation for Chef and chef-solo is located on the Chef wiki, http://wiki.opscode.com/display/chef/Home.
.SH AUTHOR
Chef was written by Adam Jacob <adam at ospcode.com> of Opscode (http://www.opscode.com), with contributions from the community.
-This manual page was written by Joshua Timberman <joshua at opscode.com> with help2man
+This manual page was written by Joshua Timberman <joshua at opscode.com> with help2man. Permission is granted
+to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.
+
+On Debian systems, the complete text of the Apache 2.0 License can be found in
+/usr/share/common-licenses/Apache-2.0.
Modified: trunk/chef/debian/chef.dirs
===================================================================
--- trunk/chef/debian/chef.dirs 2009-08-27 15:17:41 UTC (rev 4005)
+++ trunk/chef/debian/chef.dirs 2009-08-27 15:22:02 UTC (rev 4006)
@@ -2,6 +2,4 @@
var/lib/chef/openid
var/lib/chef/search_index
var/log/chef
-usr/bin
etc/chef
-etc/init.d
Added: trunk/chef/debian/chef.logrotate
===================================================================
--- trunk/chef/debian/chef.logrotate (rev 0)
+++ trunk/chef/debian/chef.logrotate 2009-08-27 15:22:02 UTC (rev 4006)
@@ -0,0 +1,8 @@
+/var/log/chef/client.log {
+ rotate 12
+ weekly
+ compress
+ postrotate
+ /etc/init.d/chef-client force-reload
+ endscript
+}
Added: trunk/chef/debian/chef.postrm
===================================================================
--- trunk/chef/debian/chef.postrm (rev 0)
+++ trunk/chef/debian/chef.postrm 2009-08-27 15:22:02 UTC (rev 4006)
@@ -0,0 +1,29 @@
+#!/bin/sh
+# postrm script for chef
+#
+# see: dh_installdeb(1)
+
+set -e
+
+case "$1" in
+ remove)
+ rm -rf /var/cache/chef
+ ;;
+ purge)
+ rm -rf /var/log/chef/client*
+ ;;
+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Modified: trunk/chef/debian/control
===================================================================
--- trunk/chef/debian/control 2009-08-27 15:17:41 UTC (rev 4005)
+++ trunk/chef/debian/control 2009-08-27 15:22:02 UTC (rev 4006)
@@ -5,13 +5,13 @@
Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
Build-Depends: cdbs, debhelper (>= 7), ruby-pkg-tools (>= 0.14), quilt
Build-Depends-Indep: ruby, rake
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Homepage: http://wiki.opscode.com/display/chef/Home
Package: chef
Architecture: all
Depends: ${misc:Depends}, ruby1.8, libopenid-ruby, liberubis-ruby, libjson-ruby, libextlib-ruby, libstomp-ruby, libohai-ruby, libchef-ruby, libopenssl-ruby
-Recommends: rake
+Suggests: rake
Description: configuration management system written in Ruby
Chef is a systems integration framework and configuration management system
written in Ruby. Chef provides a Ruby library and API that can be used to
@@ -33,9 +33,8 @@
Package: chef-server
Architecture: all
-Depends: ${misc:Depends}, ruby, merb-slices, libmerb-assets-ruby, libmerb-haml-ruby, libmerb-helpers-ruby, chef-server-slice, stompserver, couchdb, libferret-ruby, mongrel, libopenid-ruby, libjson-ruby, libcoderay-ruby, chef-indexer, libchef-ruby
-Recommends: rake
-Suggests: thin, nginx, apache2
+Depends: ${misc:Depends}, ruby, merb-slices, libmerb-assets-ruby, libmerb-haml-ruby, libmerb-helpers-ruby, chef-server-slice, stompserver, libstomp-ruby, couchdb, libferret-ruby, mongrel, libopenid-ruby, libjson-ruby, libcoderay-ruby, chef-indexer, libchef-ruby
+Suggests: thin, nginx, apache2, rake
Description: Merb application providing centralized management for Chef
Chef is a systems integration framework and configuration management system
written in Ruby. Chef provides a Ruby library and API that can be used to
@@ -84,8 +83,9 @@
Package: libchef-ruby1.8
Architecture: all
-Depends: ${misc:Depends}, ruby1.8, libopenssl-ruby, libmixlib-cli-ruby, libmixlib-config-ruby (>= 1.0.9), libmixlib-log-ruby, libohai-ruby
+Depends: ${misc:Depends}, ruby1.8, libopenssl-ruby, libmixlib-cli-ruby, libmixlib-config-ruby (>= 1.0.9), libmixlib-log-ruby, libohai-ruby, libstomp-ruby, liberubis-ruby, libopenid-ruby, libjson-ruby, libextlib-ruby
Recommends: rake, rubygems
+Suggests: cron
Description: Ruby 1.8 libraries for Chef configuration management system
Chef is a systems integration framework and configuration management system
written in Ruby. Chef provides a Ruby library and API that can be used to
Modified: trunk/chef/debian/copyright
===================================================================
--- trunk/chef/debian/copyright 2009-08-27 15:17:41 UTC (rev 4005)
+++ trunk/chef/debian/copyright 2009-08-27 15:22:02 UTC (rev 4006)
@@ -17,19 +17,130 @@
* Copyright 2009, Thom May <thom at clearairturbulence.org>
* Copyright 2009, Joe Williams <joe at joetify.com>
-Chef incorporates code modified from Open4 (http://www.codeforpeople.com/lib/ruby/open4/), which was written by Ara T. Howard.
+License:
-Chef incorporates code modified from Merb (http://www.merbivore.com), which is Copyright (c) 2008 Engine Yard.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+ Full text of the Apache 2.0 license can be found in
+ /usr/share/common-licenses/Apache-2.0.
- http://www.apache.org/licenses/LICENSE-2.0
+chef/lib/chef/mixin/command.rb:
+ Chef incorporates code modified from Open4 (http://www.codeforpeople.com/lib/ruby/open4/),
+ which was written by Ara T. Howard <ara.t.howard at gmail.com>
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+ Copyright: (c) 2007 Ara T. Howard
+ Licensed under the Ruby License:
+
+ http://codeforpeople.com/lib/license.txt
+
+ Ruby's License (http://www.ruby-lang.org/en/LICENSE.txt):
+
+ Systemu is copyrighted free software by Ara T. Howard <ara.t.howard at gmail.com>
+ You can redistribute it and/or modify it under either the terms of the GPL
+ (see /usr/share/common-licenses/GPL-2 file), or the conditions below:
+
+ 1. You may make and give away verbatim copies of the source form of the
+ software without restriction, provided that you duplicate all of the
+ original copyright notices and associated disclaimers.
+
+ 2. You may modify your copy of the software in any way, provided that
+ you do at least ONE of the following:
+
+ a) place your modifications in the Public Domain or otherwise
+ make them Freely Available, such as by posting said
+ modifications to Usenet or an equivalent medium, or by allowing
+ the author to include your modifications in the software.
+
+ b) use the modified software only within your corporation or
+ organization.
+
+ c) rename any non-standard executables so the names do not conflict
+ with standard executables, which must also be provided.
+
+ d) make other distribution arrangements with the author.
+
+ 3. You may distribute the software in object code or executable
+ form, provided that you do at least ONE of the following:
+
+ a) distribute the executables and library files of the software,
+ together with instructions (in the manual page or equivalent)
+ on where to get the original distribution.
+
+ b) accompany the distribution with the machine-readable source of
+ the software.
+
+ c) give non-standard executables non-standard names, with
+ instructions on where to get the original software distribution.
+
+ d) make other distribution arrangements with the author.
+
+ 4. You may modify and include the part of the software into any other
+ software (possibly commercial). But some files in the distribution
+ are not written by the author, so that they are not under this terms.
+
+ They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
+ files under the ./missing directory. See each file for the copying
+ condition.
+
+ 5. The scripts and library files supplied as input to or produced as
+ output from the software do not automatically fall under the
+ copyright of the software, but belong to whomever generated them,
+ and may be sold commercially, and may be aggregated with this
+ software.
+
+ 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE.
+
+chef-server/bin/chef-server:
+ Chef incorporates code modified from Merb (http://www.merbivore.com), which is
+ Copyright (c) 2008 Engine Yard.
+
+ Merb upstream Authors: Yehuda Katz <ykatz at engineyard.com>
+
+ License:
+ Merb is released under the MIT License.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+chef-server/public/javascripts/jquery.js:
+chef-server-slice/public/javascripts/jquery*:
+
+ Chef incorporates code modified from JQuery (http://jquery.com/) and is Copyright (c) John Resig.
+
+ JQuery is dual licensed under the MIT and GPL v2 licenses.
+ http://docs.jquery.com/License
+ Full text of the GPL is available in /usr/share/common-licenses/GPL-2
+ See above for the MIT license, as it is also used by Merb.
+
+The Debian packaging for Chef is Copyright (c) 2009 Joshua Timberman and is licensed
+under the Apache 2.0 license.
Modified: trunk/chef/debian/patches/fix_slice_dirs.patch
===================================================================
--- trunk/chef/debian/patches/fix_slice_dirs.patch 2009-08-27 15:17:41 UTC (rev 4005)
+++ trunk/chef/debian/patches/fix_slice_dirs.patch 2009-08-27 15:22:02 UTC (rev 4006)
@@ -1,10 +1,12 @@
-# Because we're not using the typical rubygems method of running Chef, the
-# slice needs to manually load its root directory and the location of
-# controllers and views.
+# Description: Because we're not using the typical rubygems method of running
+# Chef, the slice needs to manually load its root directory and the location of
+# controllers and views.
+# No upstream patch/ticket filed yet, still discussing how we're going to
+# approach this to be applicable to other platforms than Debian/Ubuntu.
Index: chef-0.7.8/chef-server-slice/lib/chef-server-slice.rb
===================================================================
---- chef-0.7.8.orig/chef-server-slice/lib/chef-server-slice.rb 2009-08-06 00:25:23.000000000 -0600
-+++ chef-0.7.8/chef-server-slice/lib/chef-server-slice.rb 2009-08-06 00:26:19.000000000 -0600
+--- chef-0.7.8.orig/chef-server-slice/lib/chef-server-slice.rb 2009-08-20 14:49:40.284071125 -0600
++++ chef-0.7.8/chef-server-slice/lib/chef-server-slice.rb 2009-08-20 14:50:15.740499619 -0600
@@ -33,6 +33,10 @@
# Stub classes loaded hook - runs before LoadClasses BootLoader
# right after a slice's classes have been loaded internally.
Modified: trunk/chef/debian/patches/remove_rubygems.patch
===================================================================
--- trunk/chef/debian/patches/remove_rubygems.patch 2009-08-27 15:17:41 UTC (rev 4005)
+++ trunk/chef/debian/patches/remove_rubygems.patch 2009-08-27 15:22:02 UTC (rev 4006)
@@ -1,9 +1,11 @@
-# Remove rubygems from the various bits of chef.
+# Description: Remove rubygems from the various bits of chef.
# Also set up chef-server program to load slice correctly due to no rubygems.
+# No upstream patch/ticket filed yet, still discussing how we're going to
+# approach this to be applicable to other platforms than Debian/Ubuntu.
Index: chef-0.7.8/chef-server/bin/chef-indexer
===================================================================
---- chef-0.7.8.orig/chef-server/bin/chef-indexer 2009-08-05 15:52:22.000000000 -0600
-+++ chef-0.7.8/chef-server/bin/chef-indexer 2009-08-05 15:52:31.000000000 -0600
+--- chef-0.7.8.orig/chef-server/bin/chef-indexer 2009-08-20 14:56:55.171895794 -0600
++++ chef-0.7.8/chef-server/bin/chef-indexer 2009-08-20 14:58:38.375887954 -0600
@@ -20,7 +20,6 @@
$: << File.join(File.dirname(__FILE__), "..", "lib")
@@ -16,8 +18,8 @@
+Chef::Application::Indexer.new.run
Index: chef-0.7.8/chef-server/bin/chef-server
===================================================================
---- chef-0.7.8.orig/chef-server/bin/chef-server 2009-08-05 17:22:54.000000000 -0600
-+++ chef-0.7.8/chef-server/bin/chef-server 2009-08-05 17:25:20.000000000 -0600
+--- chef-0.7.8.orig/chef-server/bin/chef-server 2009-08-20 14:56:55.151889438 -0600
++++ chef-0.7.8/chef-server/bin/chef-server 2009-08-20 14:58:38.375887954 -0600
@@ -23,13 +23,10 @@
# Add chef and chef-server-slice lib dirs to the load path
# Load chef and chef-server slice from source rather than gem, if present
@@ -54,8 +56,8 @@
if ARGV[0] && ARGV[0] =~ /^[^-]/
Index: chef-0.7.8/chef-server/public/merb.fcgi
===================================================================
---- chef-0.7.8.orig/chef-server/public/merb.fcgi 2009-08-05 15:54:06.000000000 -0600
-+++ chef-0.7.8/chef-server/public/merb.fcgi 2009-08-05 15:54:10.000000000 -0600
+--- chef-0.7.8.orig/chef-server/public/merb.fcgi 2009-08-20 14:56:55.191856158 -0600
++++ chef-0.7.8/chef-server/public/merb.fcgi 2009-08-20 14:58:38.375887954 -0600
@@ -1,6 +1,5 @@
#!/usr/bin/env ruby
@@ -72,8 +74,14 @@
+ :log_file => merb_root /'log'/'merb.log')
Index: chef-0.7.8/chef/bin/chef-client
===================================================================
---- chef-0.7.8.orig/chef/bin/chef-client 2009-08-05 15:52:41.000000000 -0600
-+++ chef-0.7.8/chef/bin/chef-client 2009-08-05 15:52:48.000000000 -0600
+--- chef-0.7.8.orig/chef/bin/chef-client 2009-08-20 14:56:55.207683729 -0600
++++ chef-0.7.8/chef/bin/chef-client 2009-08-20 14:58:41.964123959 -0600
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#! /usr/bin/ruby1.8
+ #
+ # ./chef-client - Run the chef client
+ #
@@ -20,7 +20,6 @@
$: << File.join(File.dirname(__FILE__), "..", "lib")
@@ -86,8 +94,14 @@
+Chef::Application::Client.new.run
Index: chef-0.7.8/chef/bin/chef-solo
===================================================================
---- chef-0.7.8.orig/chef/bin/chef-solo 2009-08-05 15:52:54.000000000 -0600
-+++ chef-0.7.8/chef/bin/chef-solo 2009-08-05 15:52:58.000000000 -0600
+--- chef-0.7.8.orig/chef/bin/chef-solo 2009-08-20 14:56:55.227719673 -0600
++++ chef-0.7.8/chef/bin/chef-solo 2009-08-20 14:58:41.964123959 -0600
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#! /usr/bin/ruby1.8
+ #
+ # ./chef-solo - Run the chef client, in stand-alone mode
+ #
@@ -20,7 +20,6 @@
$: << File.join(File.dirname(__FILE__), "..", "lib")
@@ -98,8 +112,8 @@
Chef::Application::Solo.new.run
Index: chef-0.7.8/chef/lib/chef.rb
===================================================================
---- chef-0.7.8.orig/chef/lib/chef.rb 2009-08-05 15:55:38.000000000 -0600
-+++ chef-0.7.8/chef/lib/chef.rb 2009-08-05 15:55:47.000000000 -0600
+--- chef-0.7.8.orig/chef/lib/chef.rb 2009-08-20 14:56:55.239908163 -0600
++++ chef-0.7.8/chef/lib/chef.rb 2009-08-20 14:58:38.375887954 -0600
@@ -19,7 +19,6 @@
$:.unshift(File.dirname(__FILE__)) unless
$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
@@ -110,8 +124,8 @@
require 'chef/log'
Index: chef-0.7.8/chef/lib/chef/openid_registration.rb
===================================================================
---- chef-0.7.8.orig/chef/lib/chef/openid_registration.rb 2009-08-05 15:55:16.000000000 -0600
-+++ chef-0.7.8/chef/lib/chef/openid_registration.rb 2009-08-05 15:55:24.000000000 -0600
+--- chef-0.7.8.orig/chef/lib/chef/openid_registration.rb 2009-08-20 14:56:55.263837175 -0600
++++ chef-0.7.8/chef/lib/chef/openid_registration.rb 2009-08-20 14:58:38.375887954 -0600
@@ -20,7 +20,6 @@
require 'chef/mixin/params_validate'
require 'chef/couchdb'
Modified: trunk/chef/debian/patches/series
===================================================================
--- trunk/chef/debian/patches/series 2009-08-27 15:17:41 UTC (rev 4005)
+++ trunk/chef/debian/patches/series 2009-08-27 15:22:02 UTC (rev 4006)
@@ -1,2 +1,2 @@
+fix_slice_dirs.patch
remove_rubygems.patch
-fix_slice_dirs.patch
Modified: trunk/chef/debian/rules
===================================================================
--- trunk/chef/debian/rules 2009-08-27 15:17:41 UTC (rev 4005)
+++ trunk/chef/debian/rules 2009-08-27 15:22:02 UTC (rev 4006)
@@ -4,6 +4,10 @@
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk
+# setup.rb doesn't work very well with separate binary / lib
+# packages, and with subproject directories, so while this
+# looks like duplication of ruby-setup-rb.mk, using that
+# doesn't build these packages properly.
CDBS_NO_DOC_SYMLINKING = ""
PACKAGED_RUBY_SETUP_CMD = /usr/lib/ruby/1.8/setup.rb
@@ -27,26 +31,29 @@
fi
install/chef::
+ # init script name is different from the package:
dh_installinit --name chef-client
cp -rf $(CURDIR)/debian/etc/chef/client.rb $(CURDIR)/debian/chef/etc/chef
cp -rf $(CURDIR)/debian/etc/chef/solo.rb $(CURDIR)/debian/chef/etc/chef
- dh_installdirs
install/libchef-ruby1.8::
+ # straight setup.rb won't build this correctly, see comment at top.
$(CHEF_INSTALL_SETUP_CMD)
(cd chef && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS))
(cd chef && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) setup)
(cd chef && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=../debian/libchef-ruby1.8)
+ mkdir -p $(CURDIR)/debian/chef/usr/bin
mv $(CURDIR)/debian/libchef-ruby1.8/usr/bin/chef-client $(CURDIR)/debian/chef/usr/bin/
mv $(CURDIR)/debian/libchef-ruby1.8/usr/bin/chef-solo $(CURDIR)/debian/chef/usr/bin/
rmdir $(CURDIR)/debian/libchef-ruby1.8/usr/bin/
install/chef-indexer::
- dh_installdirs
+ mkdir -p $(CURDIR)/debian/chef-indexer/usr/bin
cp debian/etc/chef/indexer.rb debian/chef-indexer/etc/chef
cp chef-server/bin/chef-indexer debian/chef-indexer/usr/bin
install/chef-server::
+ mkdir -p $(CURDIR)/debian/chef-server/usr/bin
cp debian/etc/chef/server.rb debian/chef-server/etc/chef
cp chef-server/bin/chef-server debian/chef-server/usr/bin
cp chef-server/README.rdoc debian/chef-server/usr/share/doc/chef-server
@@ -58,15 +65,16 @@
install/chef-server-slice::
cp chef-server-slice/README.rdoc debian/chef-server-slice/usr/share/doc/chef-server-slice
- cp -rf chef-server-slice/app debian/chef-server-slice/usr/share/chef-server-slice
+ cp -rf chef-server-slice/app debian/chef-server-slice/usr/share/chef-server-slice
cp -rf chef-server-slice/config debian/chef-server-slice/usr/share/chef-server-slice
cp -rf chef-server-slice/public debian/chef-server-slice/usr/share/chef-server-slice
- cp -rf chef-server-slice/lib debian/chef-server-slice/usr/share/chef-server-slice
+ cp -rf chef-server-slice/lib debian/chef-server-slice/usr/share/chef-server-slice
rm debian/chef-server-slice/usr/share/chef-server-slice/public/images/treeBuilderImages/Thumbs.db
find debian/chef-server-slice -type f -perm +755 -exec chmod 644 {} \;
- dh_installdirs
clean::
+ $(CHEF_INSTALL_SETUP_CMD)
+ (cd chef && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) distclean)
$(CHEF_REMOVE_SETUP_CMD)
- rm -f $(DEB_SRCDIR)/.config
- rm -f $(DEB_SRCDIR)/InstalledFiles
+ rm -f chef/.config
+ rm -f chef/InstalledFiles
Modified: trunk/chef/debian/watch
===================================================================
--- trunk/chef/debian/watch 2009-08-27 15:17:41 UTC (rev 4005)
+++ trunk/chef/debian/watch 2009-08-27 15:22:02 UTC (rev 4006)
@@ -1,2 +1,2 @@
version=3
-http://githubredir.debian.net/github/opscode/chef /([0-9.]+).tar.gz
+http://githubredir.debian.net/github/opscode/chef /(.*).tar.gz
More information about the Pkg-ruby-extras-commits
mailing list