-
Committer:
Package Import Robot
-
Author(s):
Marc Deslauriers
-
Date:
2013-03-25 10:33:34 UTC
-
mfrom:
(21.1.11 sid)
-
Revision ID:
package-import@ubuntu.com-20130325103334-8sdimzo5koy4zx1e
Tags: 1.9.3.194-8.1ubuntu1
* Merge from Debian testing. Remaining changes:
- debian/control: Add ca-certificates to libruby1.9.1 depends so that
rubygems can perform certificate verification
- debian/rules: Don't install SSL certificates from upstream sources
- debian/patches/20120927-rubygems_disable_upstream_certs.patch: Use
/etc/ssl/certs/ca-certificates.crt for the trusted CA certificates.
- debian/patches/CVE-2012-4522.patch: Adjust patch to fix build test
error. Use the version of the fix from upstream's 1.9.3 tree to fix
the NoMethodError for assert_file_not, which doesn't exist in 1.9.3.
Adjust the Origin patch tag accordingly.