passenger 4.0.5 → 4.0.6

data/build/agents.rb

@@ -60,7 +60,6 @@ dependencies = [
 	'ext/common/agents/HelperAgent/RequestHandler.h',
 	'ext/common/agents/HelperAgent/RequestHandler.cpp',
 	'ext/common/agents/HelperAgent/ScgiRequestParser.h',
-	'ext/common/agents/HelperAgent/BacktracesServer.h',
 	'ext/common/Constants.h',
 	'ext/common/StaticString.h',
 	'ext/common/Account.h',
@@ -177,8 +176,5 @@ file AGENT_OUTPUT_DIR + 'EnvPrinter' => 'ext/common/agents/EnvPrinter.c' do
 end
 
 task 'common:clean' do
-	['PassengerWatchdog', 'PassengerHelperAgent', 'PassengerLoggingAgent', 'SpawnPreparer', 'EnvPrinter'].each do |agent|
-		sh "rm -rf #{AGENT_OUTPUT_DIR}#{agent} #{AGENT_OUTPUT_DIR}#{agent}.o #{AGENT_OUTPUT_DIR}#{agent}.dSYM"
-	end
-	sh "rm -rf agents"
+	sh "rm -rf #{AGENT_OUTPUT_DIR}"
 end

data/build/basics.rb

@@ -23,6 +23,7 @@
 
 require 'rubygems'
 require 'pathname'
+require 'fileutils'
 require 'phusion_passenger'
 PhusionPassenger.locate_directories
 require 'phusion_passenger/packaging'
@@ -82,12 +83,20 @@ def boolean_option(name, default_value = false)
 	end
 end
 
+def maybe_wrap_in_ccache(command)
+	if boolean_option('USE_CCACHE', false)
+		return "ccache #{command}"
+	else
+		return command
+	end
+end
+
 #################################################
 
 if string_option('OUTPUT_DIR')
 	OUTPUT_DIR = string_option('OUTPUT_DIR') + "/"
 else
-	OUTPUT_DIR = ""
+	OUTPUT_DIR = "buildout/"
 end
 
 verbose true if !boolean_option('REALLY_QUIET')
@@ -102,18 +111,21 @@ if boolean_option('STDERR_TO_STDOUT')
 end
 
 if boolean_option('CACHING', true) && !boolean_option('RELEASE')
-	if OUTPUT_DIR.empty?
-		PlatformInfo.cache_dir = File.expand_path("cache", File.dirname(__FILE__))
-	else
-		PlatformInfo.cache_dir = OUTPUT_DIR + "cache"
-	end
+	PlatformInfo.cache_dir = OUTPUT_DIR + "cache"
+	FileUtils.mkdir_p(PlatformInfo.cache_dir)
 end
 
 #################################################
 
+PACKAGE_NAME    = PhusionPassenger::PACKAGE_NAME
+PACKAGE_VERSION = PhusionPassenger::VERSION_STRING
+PACKAGE_SIGNING_KEY = "0x0A212A8C"
+MAINTAINER_NAME  = "Phusion"
+MAINTAINER_EMAIL = "info@phusion.nl"
+
 OPTIMIZE = boolean_option("OPTIMIZE")
-CC       = string_option("CC", "gcc")
-CXX      = string_option("CXX", "g++")
+CC       = maybe_wrap_in_ccache(string_option("CC", "gcc"))
+CXX      = maybe_wrap_in_ccache(string_option("CXX", "g++"))
 LIBEXT   = PlatformInfo.library_extension
 USE_DMALLOC = boolean_option('USE_DMALLOC')
 USE_EFENCE  = boolean_option('USE_EFENCE')
@@ -164,13 +176,14 @@ EXTRA_LDFLAGS  = string_option('EXTRA_LDFLAGS', '').gsub("\n", " ")
 
 
 AGENT_OUTPUT_DIR          = string_option('AGENT_OUTPUT_DIR', OUTPUT_DIR + "agents") + "/"
-COMMON_OUTPUT_DIR         = string_option('COMMON_OUTPUT_DIR', OUTPUT_DIR + "libout/common") + "/"
-APACHE2_OUTPUT_DIR        = string_option('APACHE2_OUTPUT_DIR', OUTPUT_DIR + "libout/apache2") + "/"
-LIBEV_OUTPUT_DIR          = string_option('LIBEV_OUTPUT_DIR', OUTPUT_DIR + "libout/libev") + "/"
-LIBEIO_OUTPUT_DIR         = string_option('LIBEIO_OUTPUT_DIR', OUTPUT_DIR + "libout/libeio") + "/"
+COMMON_OUTPUT_DIR         = string_option('COMMON_OUTPUT_DIR', OUTPUT_DIR + "common") + "/"
+APACHE2_OUTPUT_DIR        = string_option('APACHE2_OUTPUT_DIR', OUTPUT_DIR + "apache2") + "/"
+LIBEV_OUTPUT_DIR          = string_option('LIBEV_OUTPUT_DIR', OUTPUT_DIR + "libev") + "/"
+LIBEIO_OUTPUT_DIR         = string_option('LIBEIO_OUTPUT_DIR', OUTPUT_DIR + "libeio") + "/"
 ruby_extension_archdir    = PlatformInfo.ruby_extension_binary_compatibility_id
 RUBY_EXTENSION_OUTPUT_DIR = string_option('RUBY_EXTENSION_OUTPUT_DIR',
-	OUTPUT_DIR + "libout/ruby/" + ruby_extension_archdir) + "/"
+	OUTPUT_DIR + "ruby/" + ruby_extension_archdir) + "/"
+PKG_DIR                   = string_option('PKG_DIR', "pkg")
 
 
 # Whether to use the vendored libev or the system one.

data/build/cplusplus_support.rb

@@ -38,6 +38,15 @@ def run_compiler(*command)
 			      "https://www.digitalocean.com/community/articles/how-to-add-swap-on-ubuntu-12-04" +
 			      "</b>"
 			fail(PhusionPassenger::Utils::AnsiColors.ansi_colorize(msg))
+		elsif $? && $?.termsig == 9
+			msg = "<b>" +
+			      "-----------------------------------------------\n" +
+			      "Your compiler was killed by the operating system. This " +
+			      "probably means that it ran out of memory. To solve " +
+			      "this problem, try increasing your swap space: " +
+			      "https://www.digitalocean.com/community/articles/how-to-add-swap-on-ubuntu-12-04" +
+			      "</b>"
+			fail(PhusionPassenger::Utils::AnsiColors.ansi_colorize(msg))
 		else
 			fail "Command failed with status (#{$? ? $?.exitstatus : 1}): [#{show_command}]"
 		end

data/build/debian.rb

@@ -0,0 +1,129 @@
+# encoding: utf-8
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2013 Phusion
+#
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#
+#  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.
+
+require 'build/preprocessor'
+
+ALL_DISTRIBUTIONS  = ["raring", "precise", "lucid"]
+DEBIAN_NAME        = "ruby-passenger"
+DEBIAN_EPOCH       = 1
+DEBIAN_ORIG_TARBALL_FILES = lambda { PhusionPassenger::Packaging.debian_orig_tarball_files }
+
+def create_debian_package_dir(distribution)
+	require 'time'
+
+	variables = {
+		:distribution => distribution
+	}
+
+	root = "#{PKG_DIR}/#{distribution}"
+	sh "rm -rf #{root}"
+	sh "mkdir -p #{root}"
+	recursive_copy_files(DEBIAN_ORIG_TARBALL_FILES.call, root)
+	recursive_copy_files(Dir["debian.template/**/*"], root,
+		true, variables)
+	sh "mv #{root}/debian.template #{root}/debian"
+	changelog = File.read("#{root}/debian/changelog")
+	changelog =
+		"#{DEBIAN_NAME} (#{DEBIAN_EPOCH}:#{PACKAGE_VERSION}-1~#{distribution}1) #{distribution}; urgency=low\n" +
+		"\n" +
+		"  * Package built.\n" +
+		"\n" +
+		" -- #{MAINTAINER_NAME} <#{MAINTAINER_EMAIL}>  #{Time.now.rfc2822}\n\n" +
+		changelog
+	File.open("#{root}/debian/changelog", "w") do |f|
+		f.write(changelog)
+	end
+end
+
+task 'debian:orig_tarball' => Packaging::PREGENERATED_FILES do
+	if File.exist?("#{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz")
+		puts "WARNING: Debian orig tarball #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz already exists. " +
+			"It will not be regenerated. If you are sure that the orig tarball is outdated, please delete it " +
+			"and rerun this task."
+	else
+		sh "rm -rf #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}"
+		sh "mkdir -p #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}"
+		recursive_copy_files(DEBIAN_ORIG_TARBALL_FILES.call, "#{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}")
+		sh "cd #{PKG_DIR} && tar -c #{DEBIAN_NAME}_#{PACKAGE_VERSION} | gzip --best > #{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz"
+	end
+end
+
+desc "Build Debian source and binary package(s) for local testing"
+task 'debian:dev' do
+	sh "rm -f #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz"
+	Rake::Task["debian:clean"].invoke
+	Rake::Task["debian:orig_tarball"].invoke
+	case distro = string_option('DISTRO', 'current')
+	when 'current'
+		distributions = [File.read("/etc/lsb-release").scan(/^DISTRIB_CODENAME=(.+)/).first.first]
+	when 'all'
+		distributions = ALL_DISTRIBUTIONS
+	else
+		distributions = distro.split(',')
+	end
+	distributions.each do |distribution|
+		create_debian_package_dir(distribution)
+		sh "cd #{PKG_DIR}/#{distribution} && dpkg-checkbuilddeps"
+	end
+	distributions.each do |distribution|
+		sh "cd #{PKG_DIR}/#{distribution} && debuild -F -us -uc"
+	end
+end
+
+desc "Build Debian source packages to be uploaded to repositories"
+task 'debian:production' => 'debian:orig_tarball' do
+	if boolean_option('USE_CCACHE', false)
+		# The resulting Debian rules file must not set USE_CCACHE.
+		abort "USE_CCACHE must be returned off when running the debian:production task."
+	end
+	if filename = string_option('GPG_PASSPHRASE_FILE')
+		filename = File.expand_path(filename)
+		if !File.exist?(filename)
+			abort "GPG passphrase file #{filename} does not exist!"
+		end
+		if File.stat(filename).mode != 0100600
+			abort "The GPG passphrase file #{filename} must be chmodded 0600!"
+		end
+		gpg_options = "-p'gpg --passphrase-file #{filename} --no-use-agent'"
+	end
+
+	ALL_DISTRIBUTIONS.each do |distribution|
+		create_debian_package_dir(distribution)
+		sh "cd #{PKG_DIR}/#{distribution} && dpkg-checkbuilddeps"
+	end
+	ALL_DISTRIBUTIONS.each do |distribution|
+		sh "cd #{PKG_DIR}/#{distribution} && debuild -S -sa #{gpg_options} -k#{PACKAGE_SIGNING_KEY}"
+	end
+end
+
+desc "Clean Debian packaging products, except for orig tarball"
+task 'debian:clean' do
+	files = Dir["#{PKG_DIR}/*.{changes,build,deb,dsc,upload}"]
+	sh "rm -f #{files.join(' ')}"
+	sh "rm -rf #{PKG_DIR}/dev"
+	ALL_DISTRIBUTIONS.each do |distribution|
+		sh "rm -rf #{PKG_DIR}/#{distribution}"
+	end
+	sh "rm -rf #{PKG_DIR}/*.debian.tar.gz"
+end

data/build/documentation.rb

@@ -53,7 +53,9 @@ Packaging::ASCII_DOCS.each do |target|
 	end
 	
 	task :clean do
-		sh "rm -f '#{target}'"
+		if boolean_option('CLEAN_DOCS', true)
+			sh "rm -f '#{target}'"
+		end
 	end
 end
 
@@ -84,7 +86,9 @@ def create_markdown_compilation_task(target)
 	end
 
 	task :clean do
-		sh "rm -f #{target}"
+		if boolean_option('CLEAN_DOCS', true)
+			sh "rm -f #{target}"
+		end
 	end
 end
 

data/build/integration_tests.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -51,8 +51,19 @@ task 'test:integration:nginx' => dependencies do
 	end
 end
 
+desc "Run native packaging tests"
+task 'test:integration:native_packaging' do
+	if PlatformInfo.rspec.nil?
+		abort "RSpec is not installed for Ruby interpreter '#{PlatformInfo.ruby_command}'. Please install it."
+	else
+		Dir.chdir("test") do
+			ruby "#{PlatformInfo.rspec} -c -f s integration_tests/native_packaging_spec.rb"
+		end
+	end
+end
+
 dependencies = [:apache2, NATIVE_SUPPORT_TARGET].compact
-desc "Run the 'restart' integration test infinitely, and abort if/when it fails"
+desc "Run the 'apache2' integration test infinitely, and abort if/when it fails"
 task 'test:restart' => dependencies do
 	Dir.chdir("test") do
 		color_code_start = "\e[33m\e[44m\e[1m"

data/build/misc.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2013 Phusion
 #
@@ -156,6 +157,21 @@ task :news_as_markdown do
 	puts contents
 end
 
+desc "Update CONTRIBUTORS file"
+task :contributors do
+	entries = `git log --format='%aN' | sort -u`.split("\n")
+	entries.delete "Hongli Lai"
+	entries.delete "Hongli Lai (Phusion"
+	entries.delete "Ninh Bui"
+	entries.push "Ninh Bui (Phusion)"
+	entries.delete "Tinco Andringa"
+	entries.push "Tinco Andringa (Phusion)"
+	File.open("CONTRIBUTORS", "w") do |f|
+		f.puts(entries.sort{ |a, b| a.downcase <=> b.downcase }.join("\n"))
+	end
+	puts "Updated CONTRIBUTORS"
+end
+
 dependencies = [
 	COMMON_LIBRARY.link_objects,
 	LIBBOOST_OXT,

data/build/packaging.rb

@@ -21,6 +21,32 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+ORIG_TARBALL_FILES = lambda { PhusionPassenger::Packaging.files }
+
+def recursive_copy_files(files, destination_dir, preprocess = false, variables = {})
+	require 'fileutils' if !defined?(FileUtils)
+	files.each_with_index do |filename, i|
+		dir = File.dirname(filename)
+		if !File.exist?("#{destination_dir}/#{dir}")
+			FileUtils.mkdir_p("#{destination_dir}/#{dir}")
+		end
+		if !File.directory?(filename)
+			if preprocess && filename =~ /\.template$/
+				real_filename = filename.sub(/\.template$/, '')
+				FileUtils.install(filename, "#{destination_dir}/#{real_filename}", :preserve => true)
+				Preprocessor.new.start(filename, "#{destination_dir}/#{real_filename}",
+					variables)
+			else
+				FileUtils.install(filename, "#{destination_dir}/#{filename}", :preserve => true)
+			end
+		end
+		printf "\r[%5d/%5d] [%3.0f%%] Copying files...", i + 1, files.size, i * 100.0 / files.size
+		STDOUT.flush
+	end
+	printf "\r[%5d/%5d] [%3.0f%%] Copying files...\n", files.size, files.size, 100
+end
+
+
 task :clobber => 'package:clean'
 
 desc "Build, sign & upload gem & tarball"
@@ -37,9 +63,15 @@ task 'package:release' => ['package:gem', 'package:tarball', 'package:sign'] do
 	is_beta        = !!version.split('.')[3]
 	tag_prefix     = is_open_source ? 'release' : 'enterprise'
 	
+	if !`git status --porcelain | grep -Ev '^\\?\\? '`.empty?
+		STDERR.puts "-------------------"
+		abort "*** ERROR: There are uncommitted files. See 'git status'"
+	end
+
 	begin
 		website_config = YAML.load_file(File.expand_path("~/.passenger_website.yml"))
 	rescue Errno::ENOENT
+		STDERR.puts "-------------------"
 		abort "*** ERROR: Please put the Phusion Passenger website admin " +
 			"password in ~/.passenger_website.yml:\n" +
 			"admin_password: ..."
@@ -52,8 +84,7 @@ task 'package:release' => ['package:gem', 'package:tarball', 'package:sign'] do
 		sh "git push origin #{tag_prefix}-#{version}"
 		
 		if is_open_source
-			sh "scp pkg/#{basename}.{gem.asc,tar.gz.asc} app@shell.phusion.nl:/u/apps/signatures/phusion-passenger/"
-			sh "./dev/googlecode_upload.py -p phusion-passenger -s 'Phusion Passenger #{version}' pkg/passenger-#{version}.tar.gz"
+			sh "s3cmd -P put pkg/passenger-#{version}.{gem,tar.gz,gem.asc,tar.gz.asc} s3://phusion-passenger/releases/"
 			sh "gem push pkg/passenger-#{version}.gem"
 			puts "Updating version number on website..."
 			if is_beta
@@ -100,20 +131,7 @@ task 'package:tarball' => Packaging::PREGENERATED_FILES do
 	basename = "#{PhusionPassenger::PACKAGE_NAME}-#{PhusionPassenger::VERSION_STRING}"
 	sh "rm -rf pkg/#{basename}"
 	sh "mkdir -p pkg/#{basename}"
-	files = Dir[*PhusionPassenger::Packaging::GLOB] -
-		Dir[*PhusionPassenger::Packaging::EXCLUDE_GLOB]
-	files.each_with_index do |filename, i|
-		dir = File.dirname(filename)
-		if !File.exist?("pkg/#{basename}/#{dir}")
-			FileUtils.mkdir_p("pkg/#{basename}/#{dir}")
-		end
-		if !File.directory?(filename)
-			FileUtils.install(filename, "pkg/#{basename}/#{filename}")
-		end
-		printf "\r[%5d/%5d] [%3.0f%%] Copying files...", i, files.size, i * 100.0 / files.size
-		STDOUT.flush
-	end
-	puts
+	recursive_copy_files(ORIG_TARBALL_FILES.call, "pkg/#{basename}")
 	sh "cd pkg && tar -c #{basename} | gzip --best > #{basename}.tar.gz"
 	sh "rm -rf pkg/#{basename}"
 end
@@ -162,57 +180,64 @@ task 'package:clean' do
 end
 
 desc "Create a fakeroot, useful for building native packages"
-task :fakeroot => [:apache2, :nginx] + Packaging::ASCII_DOCS do
+task :fakeroot => [:apache2, :nginx, :doc] do
 	require 'rbconfig'
 	require 'fileutils'
-	include Config
+	include RbConfig
 	fakeroot = "pkg/fakeroot"
 	
 	# We don't use CONFIG['archdir'] and the like because we want
 	# the files to be installed to /usr, and the Ruby interpreter
 	# on the packaging machine might be in /usr/local.
 	fake_rubylibdir = "#{fakeroot}/usr/lib/ruby/vendor_ruby"
-	fake_libdir = "#{fakeroot}/usr/lib/phusion-passenger"
+	fake_libdir = "#{fakeroot}/usr/lib/passenger"
 	fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
 	fake_agents_dir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
 	fake_helper_scripts_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
-	fake_resources_dir = "#{fakeroot}/usr/share/phusion-passenger"
-	fake_include_dir = "#{fakeroot}/usr/share/phusion-passenger/include"
+	fake_resources_dir = "#{fakeroot}/usr/share/passenger"
+	fake_include_dir = "#{fakeroot}/usr/share/passenger/include"
 	fake_docdir = "#{fakeroot}/usr/share/doc/#{GLOBAL_NAMESPACE_DIRNAME}"
 	fake_bindir = "#{fakeroot}/usr/bin"
 	fake_sbindir = "#{fakeroot}/usr/sbin"
 	fake_apache2_module_dir = "#{fakeroot}/usr/lib/apache2/modules"
 	fake_apache2_module = "#{fake_apache2_module_dir}/mod_passenger.so"
-	fake_ruby_extension_source_dir = "#{fakeroot}/usr/share/phusion-passenger/ruby_extension_source"
+	fake_ruby_extension_source_dir = "#{fakeroot}/usr/share/passenger/ruby_extension_source"
 	
 	sh "rm -rf #{fakeroot}"
 	sh "mkdir -p #{fakeroot}"
 	
+	# Ruby sources
 	sh "mkdir -p #{fake_rubylibdir}"
 	sh "cp #{PhusionPassenger.ruby_libdir}/phusion_passenger.rb #{fake_rubylibdir}/"
 	sh "cp -R #{PhusionPassenger.ruby_libdir}/phusion_passenger #{fake_rubylibdir}/"
 
+	# Phusion Passenger common libraries
 	sh "mkdir -p #{fake_libdir}"
 	sh "cp -R #{PhusionPassenger.lib_dir}/common #{fake_libdir}/"
 	sh "rm -rf #{fake_libdir}/common/libboost_oxt"
 	
+	# Ruby extension binaries
 	sh "mkdir -p #{fake_native_support_dir}"
 	native_support_archdir = PlatformInfo.ruby_extension_binary_compatibility_id
 	sh "mkdir -p #{fake_native_support_dir}"
-	sh "cp -R libout/ruby/#{native_support_archdir}/*.#{LIBEXT} #{fake_native_support_dir}/"
+	sh "cp -R buildout/ruby/#{native_support_archdir}/*.#{LIBEXT} #{fake_native_support_dir}/"
 	
+	# Agents
 	sh "mkdir -p #{fake_agents_dir}"
 	sh "cp -R #{PhusionPassenger.agents_dir}/* #{fake_agents_dir}/"
 	sh "rm -rf #{fake_agents_dir}/*.dSYM"
 	sh "rm -rf #{fake_agents_dir}/*/*.dSYM"
 	sh "rm -rf #{fake_agents_dir}/*.o"
 	
+	# Helper scripts
 	sh "mkdir -p #{fake_helper_scripts_dir}"
 	sh "cp -R #{PhusionPassenger.helper_scripts_dir}/* #{fake_helper_scripts_dir}/"
 	
+	# Resources
 	sh "mkdir -p #{fake_resources_dir}"
 	sh "cp -R resources/* #{fake_resources_dir}/"
 
+	# Headers necessary for building the Nginx module
 	sh "mkdir -p #{fake_include_dir}"
 	# Infer headers that the Nginx module needs
 	headers = []
@@ -222,67 +247,58 @@ task :fakeroot => [:apache2, :nginx] + Packaging::ASCII_DOCS do
 		end
 	end
 	headers.each do |header|
-		target = "#{fake_include_dir}/#{header[1]}"
+		target = "#{fake_include_dir}/common/#{header[1]}"
 		dir = File.dirname(target)
 		if !File.directory?(dir)
 			sh "mkdir -p #{dir}"
 		end
 		sh "cp #{header[0]} #{target}"
 	end
+
+	# Nginx module sources
+	sh "mkdir -p #{fake_resources_dir}/ngx_http_passenger_module"
+	sh "cp ext/nginx/* #{fake_resources_dir}/ngx_http_passenger_module/"
 	
+	# Documentation
 	sh "mkdir -p #{fake_docdir}"
-	Packaging::ASCII_DOCS.each do |docfile|
-		sh "cp", docfile, "#{fake_docdir}/"
-	end
+	sh "cp doc/*.html #{fake_docdir}/"
 	sh "cp -R doc/images #{fake_docdir}/"
 	
+	# User binaries
 	sh "mkdir -p #{fake_bindir}"
 	Packaging::USER_EXECUTABLES.each do |exe|
 		sh "cp bin/#{exe} #{fake_bindir}/"
 	end
 	
+	# Superuser binaries
 	sh "mkdir -p #{fake_sbindir}"
 	Packaging::SUPER_USER_EXECUTABLES.each do |exe|
 		sh "cp bin/#{exe} #{fake_sbindir}/"
 	end
 	
+	# Apache 2 module
 	sh "mkdir -p #{fake_apache2_module_dir}"
 	sh "cp #{APACHE2_MODULE} #{fake_apache2_module_dir}/"
 
+	# Ruby extension sources
 	sh "mkdir -p #{fake_ruby_extension_source_dir}"
 	sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/* #{fake_ruby_extension_source_dir}"
 
 	puts "Creating #{fake_rubylibdir}/phusion_passenger/locations.ini"
 	File.open("#{fake_rubylibdir}/phusion_passenger/locations.ini", "w") do |f|
+		f.puts "[locations]"
 		f.puts "natively_packaged=true"
 		f.puts "bin=/usr/bin"
-		f.puts "agents=/usr/lib/phusion-passenger/agents"
-		f.puts "libdir=/usr/lib/phusion-passenger"
-		f.puts "helper_scripts=/usr/share/phusion-passenger/helper-scripts"
-		f.puts "resources=/usr/share/phusion-passenger"
-		f.puts "includedir=/usr/share/phusion-passenger/include"
-		f.puts "doc=/usr/share/doc/phusion-passenger"
+		f.puts "agents=/usr/lib/passenger/agents"
+		f.puts "libdir=/usr/lib/passenger"
+		f.puts "helper_scripts=/usr/share/passenger/helper-scripts"
+		f.puts "resources=/usr/share/passenger"
+		f.puts "includedir=/usr/share/passenger/include"
+		f.puts "doc=/usr/share/doc/passenger"
 		f.puts "rubylibdir=/usr/lib/ruby/vendor_ruby"
 		f.puts "apache2_module=/usr/lib/apache2/modules/mod_passenger.so"
-		f.puts "ruby_extension_source=/usr/share/phusion-passenger/ruby_extension_source"
+		f.puts "ruby_extension_source=/usr/share/passenger/ruby_extension_source"
 	end
 
 	sh "find #{fakeroot} -name .DS_Store -print0 | xargs -0 rm -f"
 end
-
-desc "Create a Debian package"
-task 'package:debian' do
-	checkbuilddeps = PlatformInfo.find_command("dpkg-checkbuilddeps")
-	debuild = PlatformInfo.find_command("debuild")
-	if !checkbuilddeps || !debuild
-		# devscripts requires dpkg-dev which contains dpkg-checkbuilddeps.
-		abort "Please run `apt-get install devscripts` first."
-	end
-	
-	if !system(checkbuilddeps)
-		STDERR.puts
-		abort "Please install aforementioned build dependencies first."
-	end
-	
-	sh "debuild"
-end