* Resynchronise with Debian. (LP: #1023931) Remaining changes: - debian/puppetmaster-passenger.postinst: Make sure we error if puppet config print doesn't work - debian/puppetmaster-passenger.postinst: Ensure upgrades from <= 2.7.11-1 fixup passenger apache configuration. * Dropped upstreamed patches: - debian/patches/CVE-2012-1906_CVE-2012-1986_to_CVE-2012-1989.patch - debian/patches/puppet-12844 - debian/patches/2.7.17-Puppet-July-2012-CVE-fixes.patch * Drop Build-Depends on ruby-rspec (in universe): - debian/control: remove ruby-rspec from Build-Depends - debian/patches/no-rspec.patch: make Rakefile work anyway if rspec isn't installed so we can use it in debian/rules.