--- pe-passenger-4.0.18.orig/debian.template/changelog
+++ pe-passenger-4.0.18/debian.template/changelog
@@ -1,3 +1,6 @@
+<<<<<<< HEAD:debian/changelog
+pe-passenger (4.0.1-1puppet3) lucid squeeze precise wheezy; urgency=low
+=======
 ruby-passenger (1:4.0.5-1bbox1~precise1) precise; urgency=high
 
   * New upstream release, 4.0.5. Fixes CVE-2013-2119
@@ -130,187 +133,107 @@
  -- John Leach <john@brightbox.co.uk>  Sun, 12 Dec 2010 14:20:31 +0000
 
 passenger (3.0.0-1bbox3) hardy; urgency=low
+>>>>>>> upstream-3.0.x:debian.template/changelog
 
-  * Fixed clean of vendored libev
+  * Update fixshebang.sh and debian rules to call it correctly
 
- -- John Leach <john@brightbox.co.uk>  Thu, 11 Nov 2010 17:30:20 +0000
+ -- Matthaus Owens <matthaus@puppetlabs.com>  Tue, 14 May 2013 21:07:34 +0000
 
-passenger (3.0.0-1bbox2) hardy; urgency=low
+pe-passenger (4.0.1-1puppet2) lucid squeeze precise wheezy; urgency=low
 
-  * Fixed packaging bug with vendored libev
-
- -- John Leach <john@brightbox.co.uk>  Wed, 19 Oct 2010 21:37:19 +0100
-
-passenger (3.0.0-1bbox1) hardy; urgency=low
-
-  * New Upstream Version, 3.0.0
-
- -- John Leach <john@brightbox.co.uk>  Wed, 19 Oct 2010 12:57:07 +0100
-
-passenger (3.0.0-1bbox1~pre3) hardy; urgency=low
-
-  * New Upstream Version, 3.0.0~pre3
-
- -- John Leach <john@brightbox.co.uk>  Wed, 20 Sep 2010 17:27:09 +0100
-
-passenger (2.2.15-1bbox1) hardy; urgency=low
-
-  * New Upstream Version, 2.2.15
-
- -- Ben Arblaster <ben@brightbox.co.uk>  Tue, 06 Jul 2010 14:37:38 +0100
-
-passenger (2.2.14-1bbox2) hardy; urgency=low
-
-  * New Upstream Version, 2.2.14
-
- -- Ben Arblaster <ben@brightbox.co.uk>  Wed, 23 Jun 2010 11:32:26 +0100
-
-passenger (2.2.11-1bbox2) hardy; urgency=low
-
-  * Fix dependency on passenger-common
-
- -- John Leach <john@brightbox.co.uk>  Fri, 18 Jun 2010 07:41:26 +0100
-
-passenger (2.2.11-1bbox1) hardy; urgency=low
-
-  * New Upstream Version, 2.2.11
-
- -- John Leach <john@brightbox.co.uk>  Fri, 05 Mar 2010 15:03:50 +0000
-
-passenger (2.2.10-1bbox2) hardy; urgency=low
+  * Update passenger layout to be based in
+    /opt/puppet/share/phusion_passenger
 
-  * Change depency from apache mpm to apache common package
+ -- Matthaus Owens <matthaus@puppetlabs.com>  Fri, 10 May 2013 22:35:56 +0000
 
- -- John Leach <john@brightbox.co.uk>  Thu, 04 Mar 2010 14:52:46 +0000
+pe-passenger (4.0.1-1puppet1) lucid squeeze precise wheezy; urgency=low
 
-passenger (2.2.10-1bbox1) hardy; urgency=low
+  * Imported Upstream version 4.0.1
 
-  * New Upstream Version, 2.2.10
+ -- Matthaus Owens <matthaus@puppetlabs.com>  Fri, 10 May 2013 01:36:03 +0000
 
- -- John Leach <john@brightbox.co.uk>  Thu, 25 Feb 2010 15:31:42 +0000
+pe-passenger (4.0.0-0.1rc6puppet3) lucid squeeze precise wheezy; urgency=low
 
-passenger (2.2.9-1bbox1) hardy; urgency=low
+  * Update rack dependency to pe-rubygem-rack.
 
-  * New Upstream Version, 2.2.9
+ -- Matthaus Litteken <matthaus@puppetlabs.com>  Wed, 24 Apr 2013 23:50:49 +0000
 
- -- John Leach <john@brightbox.co.uk>  Fri, 08 Jan 2010 11:37:10 +0000
+pe-passenger (4.0.0-0.1rc6puppet2) lucid squeeze precise wheezy; urgency=low
 
-passenger (2.2.7-1bbox1) hardy; urgency=low
+  * Add links because Passenger sucks
 
-  * New Upstream Version, 2.2.7
+ -- Matthaus Owens <matthaus@puppetlabs.com>  Wed, 24 Apr 2013 17:34:05 +0000
 
- -- John Leach <john@brightbox.co.uk>  Mon, 23 Nov 2009 20:04:04 +0000
+pe-passenger (4.0.0-0.1rc6puppet1) lucid squeeze precise wheezy; urgency=low
 
-passenger (2.2.5-1bbox1) hardy; urgency=low
+  * Rebase to 4.0.0-rc6, Unify debian branches, rename to pe-passenger
 
-  * New Upstream Version, 2.2.5
+ -- Moses Mendoza <moses@puppetlabs.com>  Thu, 11 Apr 2014 10:16:11 +0000
 
- -- John Leach <john@brightbox.co.uk>  Thu, 03 Sep 2009 08:13:14 +0100
+pe-httpd-passenger (2.2.11-1puppet11) wheezy; urgency=low
 
-passenger (2.2.4-1bbox1) hardy; urgency=low
+  * Add gcc patch to passenger to fix boost issue.
 
-  * New Upstream Version, 2.2.4
+ -- Matthaus Litteken <matthaus@puppetlabs.com>  Mon, 05 Nov 2012 21:33:11 +0000
 
- -- John Leach <john@brightbox.co.uk>  Mon, 29 Jun 2009 11:05:34 +0100
+pe-httpd-passenger (2.2.11-1puppet10) wheezy; urgency=low
 
-passenger (2.2.2-1bbox2) hardy; urgency=low
+  * Add wheezy support
 
-  * Changed dependency from librack to librack1.8
+ -- Matthaus Litteken <matthaus@puppetlabs.com>  Thu, 01 Nov 2012 22:18:08 +0000
 
- -- John Leach <john@brightbox.co.uk>  Fri, 01 May 2009 13:05:22 +0100
+pe-httpd-passenger (2.2.11-1puppet9) precise; urgency=low
 
-passenger (2.2.2-1bbox1) hardy; urgency=low
-
-  * New Upstream Version, 2.2.2
-  * Updated dependency to librack 1.0.0
-
- -- John Leach <john@brightbox.co.uk>  Fri, 01 May 2009 12:21:43 +0100
-
-passenger (2.2.1-1bbox2) hardy; urgency=low
-
-  * Conflicts with older versions of libapache2-mod-passenger
-  * libapache2-mod-passenger depends on exact version of passenger-common
-
- -- John Leach <john@brightbox.co.uk>  Wed, 22 Apr 2009 18:49:42 +0100
-
-passenger (2.2.1-1bbox1) hardy; urgency=low
-
-  * New Upstream Version, 2.2.1
-  * Split into separate packages, to allow nginx support
-
- -- John Leach <john@brightbox.co.uk>  Mon, 20 Apr 2009 17:18:09 +0100
-
-passenger (2.2.0-1bbox1) hardy; urgency=low
-
-  * New Upstream Version, 2.2
-
- -- John Leach <john@brightbox.co.uk>  Fri, 17 Apr 2009 10:34:14 +0100
-
-passenger (2.1.3-1bbox1) hardy; urgency=low
-
-  * New upstream version, 2.1.3
-
- -- John Leach <john@brightbox.co.uk>  Sun, 05 Apr 2009 15:14:34 +0100
-
-passenger (2.1.2-1bbox1) hardy; urgency=low
-
-  * New upstream version
-
- -- John Leach <john@brightbox.co.uk>  Sat, 14 Mar 2009 17:34:17 +0000
-
-passenger (2.1.1.20090309-0bbox1) hardy; urgency=low
-
-  * New upstream version
+  * Added patch for passenger-status
 
- -- John Leach <john@brightbox.co.uk>  Wed, 11 Mar 2009 00:05:15 +0000
+ -- Moses Mendoza <moses@puppetlabs.com>  Wed, 18 Apr 2012 00:16:45 +0000
 
-passenger (2.0.6-0bbox2) hardy; urgency=low
+pe-httpd-passenger (2.2.11-1puppet8) precise; urgency=low
 
-  * Fixed depends to allow apache2-mpm-prefork instead of apache2-mpm-worker
+  * Adding precise build.
 
- -- John Leach <john@brightbox.co.uk>  Sun, 11 Jan 2009 15:01:22 +0000
+ -- Matthaus Litteken <matthaus@puppetlabs.com>  Sat, 24 Mar 2012 22:34:54 +0000
 
-passenger (2.0.6-0bbox1) hardy; urgency=low
+pe-httpd-passenger (2.2.11-1puppet7) squeeze; urgency=low
 
-  * New Upstream Version, 2.0.6
+  * [5370f20] Updating lintian overrides for passenger.
 
- -- John Leach <john@brightbox.co.uk>  Mon, 15 Dec 2008 19:29:13 +0000
+ -- Michael Stahnke <stahnma@puppetlabs.com>  Thu, 16 Jun 2011 16:43:03 -0700
 
-passenger (2.0.5-0bbox1) hardy; urgency=low
+pe-httpd-passenger (2.2.11-1puppet6) squeeze; urgency=low
 
-  * New Upstream Version, 2.0.5
+  * [b868496] (#5997) Fix shebang lines on installed scripts
 
- -- John Leach <john@brightbox.co.uk>  Fri, 05 Dec 2008 14:22:41 +0000
+ -- Jacob Helwig <jacob@puppetlabs.com>  Tue, 25 Jan 2011 17:48:04 -0800
 
-passenger (2.0.4-1bbox2) hardy; urgency=medium
+pe-httpd-passenger (2.2.11-1puppet5) squeeze; urgency=low
 
-  * Added 11_fix_passenger-config_version.patch to fix bug in passenger-config
-    (Thanks to Rich Drummond)
-  * Changed depends to allow apache2-mpm-prefork instead of apache2-mpm-worker
+  * [b3a241c] Create an empty passenger-extra.conf file for use with pe-
+    httpd
 
- -- John Leach <john@brightbox.co.uk>  Wed, 03 Dec 2008 18:14:46 +0000
+ -- Jacob Helwig <jacob@puppetlabs.com>  Thu, 30 Dec 2010 01:20:37 -0500
 
-passenger (2.0.4-1bbox1) hardy; urgency=low
+pe-httpd-passenger (2.2.11-1puppet4) squeeze; urgency=low
 
-  * New upstream version, 2.0.4
+  * [9ae9a69] Update lintian overrides for i386
 
- -- John Leach <john@brightbox.co.uk>  Mon, 01 Dec 2008 23:00:11 +0000
+ -- Jacob Helwig <jacob@puppetlabs.com>  Fri, 17 Dec 2010 11:04:27 -0800
 
-passenger (2.0.3-1bbox4) hardy; urgency=low
+pe-httpd-passenger (2.2.11-1puppet3) squeeze; urgency=low
 
-  * Tweaked build-depends for Ruby 1.8
+  * [c429cd6] Set PassengerRuby in pe-httpd-passenger.conf
+  * [dc55cb5] Require pe-ruby1.8 >= 1.8.7.299
 
- -- John Leach <john@brightbox.co.uk>  Wed, 26 Nov 2008 17:41:07 +0000
+ -- Jacob Helwig <jacob@puppetlabs.com>  Mon, 13 Dec 2010 00:28:55 -0800
 
-passenger (2.0.3-0ubuntu1~bbox3) hardy; urgency=low
+pe-httpd-passenger (2.2.11-1puppet2) squeeze; urgency=low
 
-  * Change rubygems depends to suggests
-  * Fix typo in control that led to mod_passenger.so being put in /
+  * [94e7805] Fix package name in depends for pe-rubygems1.8
 
- -- John Leach <john@brightbox.co.uk>  Wed, 26 Nov 2008 14:02:29 +0000
+ -- Jacob Helwig <jacob@puppetlabs.com>  Sun, 12 Dec 2010 11:11:27 -0800
 
-passenger (2.0.3-0ubuntu1~bbox2) intrepid; urgency=low
+pe-httpd-passenger (2.2.11-1puppet1) squeeze; urgency=low
 
-  * Initial release: closes LP: #246719
+  * [99729b5] Start packaging Phusion Passenger for Puppet Enterprise
 
- -- Neil Wilson <neil@brightbox.co.uk>  Sun, 17 Aug 2008 22:30:35 +0100
+ -- Jacob Helwig <jacob@puppetlabs.com>  Fri, 10 Dec 2010 17:37:03 -0800
--- pe-passenger-4.0.18.orig/debian/pe-passenger.conf
+++ pe-passenger-4.0.18/debian/pe-passenger.conf
@@ -0,0 +1,5 @@
+<IfModule mod_passenger.c>
+  Header always unset "X-Powered-By"
+  PassengerRoot /opt/puppet/share/phusion_passenger/locations.ini
+  PassengerRuby /opt/puppet/bin/ruby
+</IfModule>
--- pe-passenger-4.0.18.orig/debian/README.Debian
+++ pe-passenger-4.0.18/debian/README.Debian
@@ -0,0 +1,15 @@
+Phusion Passenger module for Apache2
+AKA mod_rails or mod_rack
+
+This is the Phusion Passenger (mod_rails/mod_rack) Apache 2 module
+package offering support for Ruby web applications based on Rails or
+Rack. There is even experimental support for WSGI Python apps.
+
+This package version manages the dependencies for you and will install
+a fully working Apache2 setup with the module in place and activated. No
+need to run any installers or other programs. The package does all that
+for you.
+
+All you need do is add your virtual host to your setup, and reload
+Apache2. See the User Guide (passenger/Users guide.html or
+passenger/Users guide.txt.gz) for more information.
--- pe-passenger-4.0.18.orig/debian/changelog
+++ pe-passenger-4.0.18/debian/changelog
@@ -0,0 +1,152 @@
+pe-passenger (4.0.18-1puppet3) squeeze wheezy lucid precise; urgency=low
+
+  * Add newly required key 'nginx_module_source_dir' to locations.ini
+
+ -- Moses Mendoza <moses@puppetlabs.com>  Fri, 20 Sep 2013 23:31:07 +0000
+
+pe-passenger (4.0.18-1puppet2) squeeze wheezy lucid precise; urgency=low
+
+  * Update keys in locations.ini file for new format
+
+ -- Moses Mendoza <moses@puppetlabs.com>  Fri, 20 Sep 2013 17:11:07 +0000
+
+pe-passenger (4.0.18-1puppet1) squeeze wheezy lucid precise; urgency=low
+
+  * Rebase to upstream 4.0.18
+
+ -- Moses Mendoza <moses@puppetlabs.com>  Fri, 20 Sep 2013 11:32:07 +0000
+
+pe-passenger (4.0.10-1puppet5) squeeze wheezy lucid precise; urgency=low
+
+  * (PE-981) Hide Passenger version number
+
+ -- Melissa Stone <melissa@puppetlabs.com>  Thu, 01 Aug 2013 19:26:07 +0000
+
+pe-passenger (4.0.10-1puppet4) squeeze wheezy lucid precise; urgency=low
+
+  * (PE-836) Remove mods-enable even though they're symlinks
+
+ -- Matthaus Owens <matthaus@puppetlabs.com>  Wed, 31 Jul 2013 23:06:19 +0000
+
+pe-passenger (4.0.10-1puppet3) squeeze wheezy lucid precise; urgency=low
+
+  * (PE-1112) Modify pe-passenger to add correct permissions on binary files
+
+ -- Melissa Stone <melissa@puppetlabs.com>  Tue, 30 Jul 2013 23:01:03 +0000
+
+pe-passenger (4.0.10-1puppet2) squeeze wheezy lucid precise; urgency=low
+
+  * (PE-836) Modify pe-passenger to rm old symlinks
+
+ -- Matthaus Owens <matthaus@puppetlabs.com>  Mon, 29 Jul 2013 20:56:02 +0000
+
+pe-passenger (4.0.10-1puppet1) lucid squeeze precise wheezy; urgency=low
+
+  * Imported Upstream version 4.0.10
+
+ -- Melissa Stone <melissa@puppetlabs.com>  Tue, 16 Jul 2013 16:46:59 +0000
+
+pe-passenger (4.0.1-1puppet3) lucid squeeze precise wheezy; urgency=low
+
+  * Update fixshebang.sh and debian rules to call it correctly
+
+ -- Matthaus Owens <matthaus@puppetlabs.com>  Tue, 14 May 2013 21:07:34 +0000
+
+pe-passenger (4.0.1-1puppet2) lucid squeeze precise wheezy; urgency=low
+
+  * Update passenger layout to be based in
+    /opt/puppet/share/phusion_passenger
+
+ -- Matthaus Owens <matthaus@puppetlabs.com>  Fri, 10 May 2013 22:35:56 +0000
+
+pe-passenger (4.0.1-1puppet1) lucid squeeze precise wheezy; urgency=low
+
+  * Imported Upstream version 4.0.1
+
+ -- Matthaus Owens <matthaus@puppetlabs.com>  Fri, 10 May 2013 01:36:03 +0000
+
+pe-passenger (4.0.0-0.1rc6puppet3) lucid squeeze precise wheezy; urgency=low
+
+  * Update rack dependency to pe-rubygem-rack.
+
+ -- Matthaus Litteken <matthaus@puppetlabs.com>  Wed, 24 Apr 2013 23:50:49 +0000
+
+pe-passenger (4.0.0-0.1rc6puppet2) lucid squeeze precise wheezy; urgency=low
+
+  * Add links because Passenger sucks
+
+ -- Matthaus Owens <matthaus@puppetlabs.com>  Wed, 24 Apr 2013 17:34:05 +0000
+
+pe-passenger (4.0.0-0.1rc6puppet1) lucid squeeze precise wheezy; urgency=low
+
+  * Rebase to 4.0.0-rc6, Unify debian branches, rename to pe-passenger
+
+ -- Moses Mendoza <moses@puppetlabs.com>  Thu, 11 Apr 2014 10:16:11 +0000
+
+pe-httpd-passenger (2.2.11-1puppet11) wheezy; urgency=low
+
+  * Add gcc patch to passenger to fix boost issue.
+
+ -- Matthaus Litteken <matthaus@puppetlabs.com>  Mon, 05 Nov 2012 21:33:11 +0000
+
+pe-httpd-passenger (2.2.11-1puppet10) wheezy; urgency=low
+
+  * Add wheezy support
+
+ -- Matthaus Litteken <matthaus@puppetlabs.com>  Thu, 01 Nov 2012 22:18:08 +0000
+
+pe-httpd-passenger (2.2.11-1puppet9) precise; urgency=low
+
+  * Added patch for passenger-status
+
+ -- Moses Mendoza <moses@puppetlabs.com>  Wed, 18 Apr 2012 00:16:45 +0000
+
+pe-httpd-passenger (2.2.11-1puppet8) precise; urgency=low
+
+  * Adding precise build.
+
+ -- Matthaus Litteken <matthaus@puppetlabs.com>  Sat, 24 Mar 2012 22:34:54 +0000
+
+pe-httpd-passenger (2.2.11-1puppet7) squeeze; urgency=low
+
+  * [5370f20] Updating lintian overrides for passenger.
+
+ -- Michael Stahnke <stahnma@puppetlabs.com>  Thu, 16 Jun 2011 16:43:03 -0700
+
+pe-httpd-passenger (2.2.11-1puppet6) squeeze; urgency=low
+
+  * [b868496] (#5997) Fix shebang lines on installed scripts
+
+ -- Jacob Helwig <jacob@puppetlabs.com>  Tue, 25 Jan 2011 17:48:04 -0800
+
+pe-httpd-passenger (2.2.11-1puppet5) squeeze; urgency=low
+
+  * [b3a241c] Create an empty passenger-extra.conf file for use with pe-
+    httpd
+
+ -- Jacob Helwig <jacob@puppetlabs.com>  Thu, 30 Dec 2010 01:20:37 -0500
+
+pe-httpd-passenger (2.2.11-1puppet4) squeeze; urgency=low
+
+  * [9ae9a69] Update lintian overrides for i386
+
+ -- Jacob Helwig <jacob@puppetlabs.com>  Fri, 17 Dec 2010 11:04:27 -0800
+
+pe-httpd-passenger (2.2.11-1puppet3) squeeze; urgency=low
+
+  * [c429cd6] Set PassengerRuby in pe-httpd-passenger.conf
+  * [dc55cb5] Require pe-ruby1.8 >= 1.8.7.299
+
+ -- Jacob Helwig <jacob@puppetlabs.com>  Mon, 13 Dec 2010 00:28:55 -0800
+
+pe-httpd-passenger (2.2.11-1puppet2) squeeze; urgency=low
+
+  * [94e7805] Fix package name in depends for pe-rubygems1.8
+
+ -- Jacob Helwig <jacob@puppetlabs.com>  Sun, 12 Dec 2010 11:11:27 -0800
+
+pe-httpd-passenger (2.2.11-1puppet1) squeeze; urgency=low
+
+  * [99729b5] Start packaging Phusion Passenger for Puppet Enterprise
+
+ -- Jacob Helwig <jacob@puppetlabs.com>  Fri, 10 Dec 2010 17:37:03 -0800
--- pe-passenger-4.0.18.orig/debian/pe-passenger.postinst
+++ pe-passenger-4.0.18/debian/pe-passenger.postinst
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+reload_apache() {
+    invoke-rc.d pe-httpd reload > /dev/null 2>&1 || :
+}
+
+if [ "$1" = "configure" ]; then
+    # Clean up old pe-httpd-passenger conf files
+    if [ -f /etc/puppetlabs/httpd/mods-available/pe-httpd-passenger.load ] ; then
+      rm /etc/puppetlabs/httpd/mods-available/pe-httpd-passenger.load > /dev/null 2>&1 || :
+    fi
+    if [ -f /etc/puppetlabs/httpd/mods-available/pe-httpd-passenger.conf ] ; then
+      rm /etc/puppetlabs/httpd/mods-available/pe-httpd-passenger.conf > /dev/null 2>&1 || :
+    fi
+    if [ -L /etc/puppetlabs/httpd/mods-enabled/pe-httpd-passenger.load ] ; then
+      rm /etc/puppetlabs/httpd/mods-enabled/pe-httpd-passenger.load > /dev/null 2>&1 || :
+    fi
+    if [ -L /etc/puppetlabs/httpd/mods-enabled/pe-httpd-passenger.conf ] ; then
+      rm /etc/puppetlabs/httpd/mods-enabled/pe-httpd-passenger.conf > /dev/null 2>&1 || :
+    fi
+
+    # Make sure binary files have correct permissions
+    for FILE in passenger passenger-config
+    do
+      chmod 700 /opt/puppet/share/phusion_passenger/bin/$FILE || :
+    done
+    for FILE in passenger-memory-stats passenger-status
+    do
+      chmod 700 /opt/puppet/share/phusion_passenger/sbin/$FILE || :
+    done
+
+    # Enable pe-passenger module if not already
+    /opt/puppet/sbin/a2enmod -q pe-passenger >/dev/null 2>&1 || :
+
+    # On a different note, we want to reload apache so passenger gets loaded
+    reload_apache
+fi
+
+exit 0
--- pe-passenger-4.0.18.orig/debian/pe-passenger.prerm
+++ pe-passenger-4.0.18/debian/pe-passenger.prerm
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" != "remove" -a "$1" != "purge" ]; then
+        exit 0
+fi;
+
+if [ -e /etc/puppetlabs/apache2/apache2.conf ]; then
+  /opt/puppet/sbin/a2dismod pe-passenger || true
+fi
+
+exit 0
--- pe-passenger-4.0.18.orig/debian/control
+++ pe-passenger-4.0.18/debian/control
@@ -0,0 +1,22 @@
+Source: pe-passenger
+Section: web
+Priority: optional
+Maintainer: Puppet Labs <info@puppetlabs.com>
+Build-Depends: pe-httpd-threaded-dev, pe-httpd-mpm-worker,
+ libapr1-dev, pe-ruby, pe-rubygems, pe-rubygem-rake, debhelper (>= 7), doxygen,
+ asciidoc (>= 8.2), graphviz, cdbs, source-highlight, libev-dev,
+ libcurl4-openssl-dev
+Standards-Version: 3.8.4
+Homepage: http://www.modrails.com/
+XS-Vcs-git: git://github.com/FooBarWidget/passenger.git
+XS-Vcs-browser: https://github.com/FooBarWidget/passenger
+
+Package: pe-passenger
+Architecture: any
+Depends: ${shlibs:Depends}, pe-rubygem-rack, pe-ruby ( >= 1.9.3.392), pe-rubygems, pe-httpd-mpm-worker (>= 2.2.9-9) | pe-httpd-mpm-prefork (>=2.2.9-9) | pe-httpd-mpm-itk (>= 2.2.9-9)
+Conflicts: pe-httpd-passenger
+Replaces: pe-httpd-passenger
+Description: Rails and Rack support for Apache2
+ Phusion Passenger — a.k.a. mod_rails or mod_rack — makes
+ deployment of Ruby web applications, such as those built on the
+ revolutionary Ruby on Rails web framework, a breeze.
--- pe-passenger-4.0.18.orig/debian/fixshebang.sh
+++ pe-passenger-4.0.18/debian/fixshebang.sh
@@ -0,0 +1,36 @@
+#!/bin/bash -x
+for target_dir in $@
+do
+  for f in `find "$target_dir" -type f 2>/dev/null`
+  do
+    textflag=0
+    filetype="`file -b $f`"
+    for ft in $filetype
+    do
+      if [ "${#ft}" -lt 4 ]
+      then
+        continue
+      fi
+      if [ "${ft}" = "text" ]
+      then
+        textflag=1
+        break
+      fi
+    done
+
+    if [ "$textflag" -eq 0 ]
+    then
+      continue
+    fi
+
+    cp -pf $f $f.tmp
+    sed -e '1,1s,^#![ 	]*\([^ 	]*\)/\(ruby\|env ruby\)$,#!/opt/puppet/bin/ruby,' \
+        -e '1,1s,^#![ 	]*\([^ 	]*\)/\(wish\|perl\)$,#!/usr/bin/\2,' < $f > $f.tmp
+    if ! cmp $f $f.tmp >/dev/null
+    then
+        mv -f $f.tmp $f
+    else
+        rm -f $f.tmp
+    fi
+  done
+done
--- pe-passenger-4.0.18.orig/debian/rules
+++ pe-passenger-4.0.18/debian/rules
@@ -0,0 +1,94 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/buildcore.mk
+
+export DH_VERBOSE=1
+export CFLAGS="-g -O0 -burgers"
+
+passenger_version = 4.0.10
+pe_prefix = opt/puppet
+bindir = $(pe_prefix)/bin
+sbindir = $(pe_prefix)/sbin
+builddir = pkg/fakeroot
+libdir = $(pe_prefix)/lib
+datadir = $(pe_prefix)/share
+sysconfdir = etc/puppetlabs
+
+RUBY=/$(bindir)/ruby
+RAKE=/$(bindir)/rake
+SHELL=/bin/bash
+
+rubylibdir=$(shell $(RUBY) -rrbconfig -e 'puts RbConfig::CONFIG["rubylibdir"]')
+rubyarchdir=$(shell $(RUBY) -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')
+
+# passenger 4 hardcodes these paths as /usr/lib/ruby/$ruby_version and
+# /usr/lib/ruby/$ruby_version/$arch rather than using ruby's RbConfig,  so we
+# have to reconstruct this path to know where to rip the files out of.
+ruby_version=$(shell $(RUBY) -rrbconfig -e 'puts RbConfig::CONFIG["ruby_version"]')
+ruby_arch=$(shell $(RUBY) -rrbconfig -e 'puts RbConfig::CONFIG["arch"]')
+
+# This is really "fakeroot/$path" in the build, but we'll leave that out of the
+# variable for clarity when we're moving files around
+fakeroot_rubylibdir=/usr/lib/ruby/vendor_ruby
+fakeroot_rubyarchdir=/usr/lib/ruby/$(ruby_version)/$(ruby_arch)
+
+modsavailabledir = $(sysconfdir)/httpd/mods-available
+
+DEB_INSTALL_DIRS += $(bin_dir)
+DEB_INSTALL_DIRS += $(lib_dir)
+
+clean/pe-passenger::
+	$(RAKE) clean
+	rm -rf $(CURDIR)/doc/rdoc
+
+build/pe-passenger::
+	env PATH=/$(bindir):/$(sbindir):$$PATH \
+		$(RAKE) fakeroot APXS2=/$(bindir)/apxs2
+
+binary-install/pe-passenger::
+	mkdir -p $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/doc \
+		$(CURDIR)/debian/$(cdbs_curpkg)/$(bindir) \
+		$(CURDIR)/debian/$(cdbs_curpkg)/$(sysconfdir)/httpd/mods-available \
+		$(CURDIR)/debian/$(cdbs_curpkg)/$(libdir)/phusion_passenger/agents \
+		$(CURDIR)/debian/$(cdbs_curpkg)/$(rubyarchdir) \
+		$(CURDIR)/debian/$(cdbs_curpkg)/$(datadir)/phusion_passenger \
+		$(CURDIR)/debian/$(cdbs_curpkg)/$(datadir)/phusion_passenger/agents \
+		$(CURDIR)/debian/$(cdbs_curpkg)/$(datadir)/doc/pe-passenger-$(passenger_version)
+	cp -r $(CURDIR)/$(builddir)/$(fakeroot_rubylibdir)/phusion_passenger.rb \
+    $(CURDIR)/debian/$(cdbs_curpkg)/$(rubylibdir)
+	cp -r $(CURDIR)/$(builddir)/$(fakeroot_rubylibdir)/phusion_passenger \
+    $(CURDIR)/debian/$(cdbs_curpkg)/$(rubylibdir)
+	cp -r $(CURDIR)/$(builddir)/$(fakeroot_rubyarchdir)/*.so \
+    $(CURDIR)/debian/$(cdbs_curpkg)/$(rubyarchdir)
+	rm -rf $(CURDIR)/$(builddir)/usr/lib/passenger/agents/*.dSYM
+	rm -rf $(CURDIR)/$(builddir)/usr/lib/passenger/agents/*/*.dSYM
+	cp -r $(CURDIR)/$(builddir)/usr/lib/passenger/agents \
+		$(CURDIR)/debian/$(cdbs_curpkg)/$(datadir)/phusion_passenger
+	cp -r $(CURDIR)/$(builddir)/usr/share/passenger/* \
+		$(CURDIR)/debian/$(cdbs_curpkg)/$(datadir)/phusion_passenger
+	cp -r $(CURDIR)/$(builddir)/usr/share/doc/passenger/ \
+		$(CURDIR)/debian/$(cdbs_curpkg)/usr/share/doc/pe-passenger-$(passenger_version)
+	cp -r $(CURDIR)/$(builddir)/usr/bin \
+	  $(CURDIR)/debian/$(cdbs_curpkg)/$(datadir)/phusion_passenger
+	cp -r $(CURDIR)/$(builddir)/usr/sbin \
+	  $(CURDIR)/debian/$(cdbs_curpkg)/$(datadir)/phusion_passenger
+	pushd $(CURDIR)/debian/$(cdbs_curpkg)/$(bindir); \
+	  ln -s ../share/phusion_passenger/bin/passenger-config; \
+	  ln -s ../share/phusion_passenger/bin/passenger; \
+	  ln -s ../share/phusion_passenger/sbin/passenger-status; \
+	  ln -s ../share/phusion_passenger/sbin/passenger-memory-stats; \
+	popd;
+	cp $(CURDIR)/$(builddir)/usr/lib/apache2/modules/mod_passenger.so \
+		$(CURDIR)/debian/$(cdbs_curpkg)/$(datadir)/phusion_passenger/
+	cp $(CURDIR)/debian/locations.ini \
+		$(CURDIR)/debian/$(cdbs_curpkg)/$(datadir)/phusion_passenger/locations.ini
+	cp $(CURDIR)/debian/$(cdbs_curpkg).load \
+		$(CURDIR)/debian/$(cdbs_curpkg).conf \
+		$(CURDIR)/debian/$(cdbs_curpkg)/$(modsavailabledir)
+	mkdir -p $(CURDIR)/debian/$(cdbs_curpkg)/$(sysconfdir)/httpd/conf.d
+	touch $(CURDIR)/debian/$(cdbs_curpkg)/$(sysconfdir)/httpd/conf.d/passenger-extra.conf
+	# Fix shebang lines of scripts installed to $(pe_prefix)/bin
+	sh -x $(CURDIR)/debian/fixshebang.sh '$(CURDIR)/debian/$(cdbs_curpkg)/opt/puppet/share/phusion_passenger/sbin'
+	sh -x $(CURDIR)/debian/fixshebang.sh '$(CURDIR)/debian/$(cdbs_curpkg)/opt/puppet/share/phusion_passenger/bin'
+
--- pe-passenger-4.0.18.orig/debian/gbp.conf
+++ pe-passenger-4.0.18/debian/gbp.conf
@@ -0,0 +1,29 @@
+[DEFAULT]
+snapshot-number = os.popen("git-log --pretty=oneline | wc -l").readlines()[0]
+postbuild = lintian --suppress-tags bad-distribution-in-changes-file $GBP_CHANGES_FILE
+# tell git-buildpackage howto clean the source tree
+cleaner = fakeroot debian/rules clean
+# this is how we invoke pbuilder, arguments passed to git-buildpackage will be
+# passed to dpkg-buildpackge in the chroot
+pbuilder = true
+# Sign tags by default:
+sign-tags = True
+#keyid = 0x3f3e6426
+# use pristine tar by defaul
+pristine-tar = True
+
+
+[git-dch]
+git-log=--no-merges
+# Parse meta tags like Closes: from commit messages
+meta = True
+# Add seven digits of the commits sha1 to the commit message
+id-length = 7
+# Regex for matching bugs to close
+meta-closes = Closes|LP|BZ
+# Ignore these in commit messages
+ignore-regex = (Signed-off|Acked)-by:
+
+[git-import-orig]
+# Automatically forward the changelog after importing a new upstream version
+postimport = git-dch -N%(version)s -S -a --debian-branch=$GBP_BRANCH
--- pe-passenger-4.0.18.orig/debian/locations.ini
+++ pe-passenger-4.0.18/debian/locations.ini
@@ -0,0 +1,13 @@
+[locations]
+natively_packaged=true
+bin_dir=/opt/puppet/bin
+agents_dir=/opt/puppet/share/phusion_passenger/agents
+lib_dir=/opt/puppet/lib/ruby/1.9.1/phusion_passenger
+helper_scripts_dir=/opt/puppet/share/phusion_passenger/helper-scripts
+resources_dir=/opt/puppet/share/phusion_passenger/
+include_dir=/opt/puppet/share/phusion_passenger/include
+doc_dir=/usr/share/doc/pe-passenger
+ruby_libdir=/opt/puppet/lib/ruby/1.9.1
+apache2_module_path=/opt/puppet/share/phusion_passenger/mod_passenger.so
+ruby_extension_source_dir=/opt/puppet/share/phusion_passenger/ruby_extension_source
+nginx_module_source_dir=/opt/puppet/share/phusion_passenger/ngx_http_passenger_module
--- pe-passenger-4.0.18.orig/debian/pe-passenger.postrm
+++ pe-passenger-4.0.18/debian/pe-passenger.postrm
@@ -0,0 +1,27 @@
+#!/bin/sh -e
+
+if [ "$1" = purge -a "$DONT_PURGE" != 1 ]; then
+    rm -f /etc/puppetlabs/httpd/mods-enabled/pe-passenger.* \
+        /etc/puppetlabs/httpd/mods-available/pe-passenger.*
+fi
+
+restore_conffile() {
+    if [ -e $1.dpkg-pe-httpd-passenger.old ]; then
+        echo Restoring previous version of $1 ...
+        mv $1.dpkg-pe-httpd-passenger.old $1
+    fi
+
+    if [ -e $1.dpkg-pe-passenger.old ]; then
+        echo Restoring previous version of $1 ...
+        mv $1.dpkg-pe-passenger.old $1
+    fi
+}
+
+if [ "$1" = abort-upgrade ]; then
+    restore_conffile /etc/puppetlabs/httpd/mods-available/pe-httpd-passenger.load
+    restore_conffile /etc/puppetlabs/httpd/mods-available/pe-httpd-passenger.conf
+    restore_conffile /etc/puppetlabs/httpd/mods-available/pe-passenger.load
+    restore_conffile /etc/puppetlabs/httpd/mods-available/pe-passenger.conf
+fi
+
+#DEBHELPER#
--- pe-passenger-4.0.18.orig/debian/pe-passenger.load
+++ pe-passenger-4.0.18/debian/pe-passenger.load
@@ -0,0 +1 @@
+LoadModule passenger_module /opt/puppet/share/phusion_passenger/mod_passenger.so
--- pe-passenger-4.0.18.orig/debian/compat
+++ pe-passenger-4.0.18/debian/compat
@@ -0,0 +1 @@
+5
--- pe-passenger-4.0.18.orig/debian/pe-passenger.lintian-overrides
+++ pe-passenger-4.0.18/debian/pe-passenger.lintian-overrides
@@ -0,0 +1,26 @@
+pe-passenger binary: dir-or-file-in-opt opt/puppet/
+pe-passenger binary: wrong-path-for-interpreter opt/puppet/bin/passenger (#!/opt/puppet/bin/ruby != /usr/bin/ruby)
+pe-passenger binary: ruby-script-but-no-ruby-dep opt/puppet/bin/passenger
+pe-passenger binary: wrong-path-for-interpreter opt/puppet/bin/passenger-config (#!/opt/puppet/bin/ruby != /usr/bin/ruby)
+pe-passenger binary: ruby-script-but-no-ruby-dep opt/puppet/bin/passenger-config
+pe-passenger binary: wrong-path-for-interpreter opt/puppet/bin/passenger-memory-stats (#!/opt/puppet/bin/ruby != /usr/bin/ruby)
+pe-passenger binary: ruby-script-but-no-ruby-dep opt/puppet/bin/passenger-memory-stats
+pe-passenger binary: wrong-path-for-interpreter opt/puppet/bin/passenger-status (#!/opt/puppet/bin/ruby != /usr/bin/ruby)
+pe-passenger binary: ruby-script-but-no-ruby-dep opt/puppet/bin/passenger-status
+pe-passenger binary: python-script-but-no-python-dep opt/puppet/lib/ruby/1.9.1/phusion_passenger/wsgi/request_handler.py
+pe-passenger binary: ruby-script-but-no-ruby-dep opt/puppet/share/phusion_passenger/helper-scripts/backtrace-sanitizer.rb
+pe-passenger binary: ruby-script-but-no-ruby-dep opt/puppet/share/phusion_passenger/helper-scripts/meteor-loader.rb
+pe-passenger binary: python-script-but-no-python-dep opt/puppet/share/phusion_passenger/helper-scripts/system-memory-stats.py
+pe-passenger binary: ruby-script-but-no-ruby-dep opt/puppet/share/phusion_passenger/helper-scripts/prespawn
+pe-passenger: ruby-script-but-no-ruby-dep opt/puppet/share/phusion_passenger/sbin/passenger-memory-stats
+pe-passenger: ruby-script-but-no-ruby-dep opt/puppet/share/phusion_passenger/sbin/passenger-status
+pe-passenger: ruby-script-but-no-ruby-dep opt/puppet/share/phusion_passenger/bin/passenger
+pe-passenger: ruby-script-but-no-ruby-dep opt/puppet/share/phusion_passenger/bin/passenger-config
+pe-passenger: ruby-script-but-no-ruby-dep opt/puppet/share/phusion_passenger/bin/passenger-install-apache2-module
+pe-passenger: ruby-script-but-no-ruby-dep opt/puppet/share/phusion_passenger/bin/passenger-install-nginx-module
+pe-passenger: wrong-path-for-interpreter opt/puppet/share/phusion_passenger/sbin/passenger-memory-stats (#!/opt/puppet/bin/ruby != /usr/bin/ruby)
+pe-passenger: wrong-path-for-interpreter opt/puppet/share/phusion_passenger/sbin/passenger-status (#!/opt/puppet/bin/ruby != /usr/bin/ruby)
+pe-passenger: wrong-path-for-interpreter opt/puppet/share/phusion_passenger/bin/passenger (#!/opt/puppet/bin/ruby != /usr/bin/ruby)
+pe-passenger: wrong-path-for-interpreter opt/puppet/share/phusion_passenger/bin/passenger-config (#!/opt/puppet/bin/ruby != /usr/bin/ruby)
+pe-passenger: wrong-path-for-interpreter opt/puppet/share/phusion_passenger/bin/passenger-install-apache2-module (#!/opt/puppet/bin/ruby != /usr/bin/ruby)
+pe-passenger: wrong-path-for-interpreter opt/puppet/share/phusion_passenger/bin/passenger-install-nginx-module (#!/opt/puppet/bin/ruby != /usr/bin/ruby)
--- pe-passenger-4.0.18.orig/debian/copyright
+++ pe-passenger-4.0.18/debian/copyright
@@ -0,0 +1,20 @@
+Upstream : Copyright (c) 2010 Phusion
+Packaging: Copyright (c) 2010 Brightbox Systems
+
+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.
