Viewing all changes in revision 67.
- Committer: Package Import Robot
- Date: 2013-04-08 15:03:25 UTC
- mfrom: (3.1.46 sid)
- Revision ID: package-import@ubuntu.com-20130408150325-4o91hljzz2zca5fi
* Merge from Debian unstable. This merges the vim addon fix in 2.7.18-2
(LP: #1163927). 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.
- 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.
* Drop upstreamed patches:
- debian/patches/security-mar-2013.patch
(LP: #1163927). 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.
- 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.
* Drop upstreamed patches:
- debian/patches/security-mar-2013.patch
- files added:
- .pc/2.7.18-CVE-Rollup.patch
- .pc/2.7.18-CVE-Rollup.patch/acceptance
- .pc/2.7.18-CVE-Rollup.patch/acceptance/tests
- .pc/2.7.18-CVE-Rollup.patch/acceptance/tests/security
- .pc/2.7.18-CVE-Rollup.patch/conf
- .pc/2.7.18-CVE-Rollup.patch/lib
- .pc/2.7.18-CVE-Rollup.patch/lib/puppet
- .pc/2.7.18-CVE-Rollup.patch/lib/puppet/indirector
- .pc/2.7.18-CVE-Rollup.patch/lib/puppet/indirector/catalog
- .pc/2.7.18-CVE-Rollup.patch/lib/puppet/indirector/certificate_status
- .pc/2.7.18-CVE-Rollup.patch/lib/puppet/indirector/file_bucket_file
- .pc/2.7.18-CVE-Rollup.patch/lib/puppet/indirector/resource
- .pc/2.7.18-CVE-Rollup.patch/lib/puppet/indirector/run
- .pc/2.7.18-CVE-Rollup.patch/lib/puppet/network
- .pc/2.7.18-CVE-Rollup.patch/lib/puppet/network/handler
- .pc/2.7.18-CVE-Rollup.patch/lib/puppet/network/http
- .pc/2.7.18-CVE-Rollup.patch/lib/puppet/network/http/rack
- .pc/2.7.18-CVE-Rollup.patch/lib/puppet/parser
- .pc/2.7.18-CVE-Rollup.patch/lib/puppet/util
- .pc/2.7.18-CVE-Rollup.patch/spec
- .pc/2.7.18-CVE-Rollup.patch/spec/integration
- .pc/2.7.18-CVE-Rollup.patch/spec/integration/indirector
- .pc/2.7.18-CVE-Rollup.patch/spec/integration/indirector/catalog
- .pc/2.7.18-CVE-Rollup.patch/spec/integration/resource
- .pc/2.7.18-CVE-Rollup.patch/spec/unit
- .pc/2.7.18-CVE-Rollup.patch/spec/unit/indirector
- .pc/2.7.18-CVE-Rollup.patch/spec/unit/indirector/catalog
- .pc/2.7.18-CVE-Rollup.patch/spec/unit/network
- .pc/2.7.18-CVE-Rollup.patch/spec/unit/network/http
- .pc/2.7.18-CVE-Rollup.patch/spec/unit/network/http/rack
- .pc/2.7.18-CVE-Rollup.patch/spec/unit/parser
- .pc/2.7.18-CVE-Rollup.patch/spec/unit/parser/functions
- .pc/2.7.18-CVE-Rollup.patch/spec/unit/ssl
- .pc/2.7.18-CVE-Rollup.patch/spec/unit/util
- .pc/2.7.x-unit-test-fix.patch
- .pc/2.7.x-unit-test-fix.patch/test
- .pc/2.7.x-unit-test-fix.patch/test/language
- .pc/fix-symlink-1-ee4c6f7c697737aa919b9f90436ab0cc69934b03
- .pc/fix-symlink-1-ee4c6f7c697737aa919b9f90436ab0cc69934b03/spec
- .pc/fix-symlink-1-ee4c6f7c697737aa919b9f90436ab0cc69934b03/spec/integration
- .pc/fix-symlink-1-ee4c6f7c697737aa919b9f90436ab0cc69934b03/spec/integration/type
- .pc/fix-symlink-2-1b0e812ad9e33b3cc148fac30a28490f60f40c63
- .pc/fix-symlink-2-1b0e812ad9e33b3cc148fac30a28490f60f40c63/lib
- .pc/fix-symlink-2-1b0e812ad9e33b3cc148fac30a28490f60f40c63/lib/puppet
- .pc/fix-symlink-2-1b0e812ad9e33b3cc148fac30a28490f60f40c63/lib/puppet/type
- .pc/fix-symlink-2-1b0e812ad9e33b3cc148fac30a28490f60f40c63/lib/puppet/type/file
- .pc/fix-symlink-3-3a00ed468617c17b5a527c68cfc37d7d1fddaa72
- .pc/fix-symlink-3-3a00ed468617c17b5a527c68cfc37d7d1fddaa72/spec
- .pc/fix-symlink-3-3a00ed468617c17b5a527c68cfc37d7d1fddaa72/spec/unit
- .pc/fix-symlink-3-3a00ed468617c17b5a527c68cfc37d7d1fddaa72/spec/unit/type
- .pc/fix-symlink-3-3a00ed468617c17b5a527c68cfc37d7d1fddaa72/spec/unit/type/file
- .pc/fix-symlink-4-1d8a76e060f610a9db20cf1bdd4ff95dddba9309
- .pc/fix-symlink-4-1d8a76e060f610a9db20cf1bdd4ff95dddba9309/acceptance
- .pc/fix-symlink-4-1d8a76e060f610a9db20cf1bdd4ff95dddba9309/acceptance/tests
- .pc/fix-symlink-4-1d8a76e060f610a9db20cf1bdd4ff95dddba9309/acceptance/tests/resource
- .pc/fix-symlink-4-1d8a76e060f610a9db20cf1bdd4ff95dddba9309/acceptance/tests/resource/file
- acceptance/tests/resource
- acceptance/tests/resource/file
- files removed:
- .pc/security-mar-2013.patch
- .pc/security-mar-2013.patch/acceptance
- .pc/security-mar-2013.patch/acceptance/tests
- .pc/security-mar-2013.patch/acceptance/tests/security
- .pc/security-mar-2013.patch/conf
- .pc/security-mar-2013.patch/lib
- .pc/security-mar-2013.patch/lib/puppet
- .pc/security-mar-2013.patch/lib/puppet/indirector
- .pc/security-mar-2013.patch/lib/puppet/indirector/catalog
- .pc/security-mar-2013.patch/lib/puppet/indirector/certificate_status
- .pc/security-mar-2013.patch/lib/puppet/indirector/file_bucket_file
- .pc/security-mar-2013.patch/lib/puppet/indirector/resource
- .pc/security-mar-2013.patch/lib/puppet/indirector/run
- .pc/security-mar-2013.patch/lib/puppet/network
- .pc/security-mar-2013.patch/lib/puppet/network/handler
- .pc/security-mar-2013.patch/lib/puppet/network/http
- .pc/security-mar-2013.patch/lib/puppet/network/http/rack
- .pc/security-mar-2013.patch/lib/puppet/parser
- .pc/security-mar-2013.patch/lib/puppet/util
- .pc/security-mar-2013.patch/spec
- .pc/security-mar-2013.patch/spec/integration
- .pc/security-mar-2013.patch/spec/integration/indirector
- .pc/security-mar-2013.patch/spec/integration/indirector/catalog
- .pc/security-mar-2013.patch/spec/integration/resource
- .pc/security-mar-2013.patch/spec/unit
- .pc/security-mar-2013.patch/spec/unit/indirector
- .pc/security-mar-2013.patch/spec/unit/indirector/catalog
- .pc/security-mar-2013.patch/spec/unit/network
- .pc/security-mar-2013.patch/spec/unit/network/http
- .pc/security-mar-2013.patch/spec/unit/network/http/rack
- .pc/security-mar-2013.patch/spec/unit/parser
- .pc/security-mar-2013.patch/spec/unit/parser/functions
- .pc/security-mar-2013.patch/spec/unit/ssl
- .pc/security-mar-2013.patch/spec/unit/util
- .pc/security-mar-2013.patch/test
- .pc/security-mar-2013.patch/test/language
- files modified:
- .pc/applied-patches
expand all
collapse all
added
removed
