← Back to branch summary

~ubuntu-branches/ubuntu/raring/ruby1.9.1/raring-security

« back to all changes in this revision

Viewing changes to debian/patches/090729_fix_Makefile_deps.diff

  • Committer: Package Import Robot
  • Author(s): Antonio Terceiro, Lucas Nussbaum, Daigo Moriwaki, James Healy, Antonio Terceiro
  • Date: 2012-06-02 07:42:28 UTC
  • mfrom: (21.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20120602074228-09t2jgg1ozrsnnfo
Tags: 1.9.3.194-1
http://bugs.debian.org/648055
http://bugs.debian.org/654312
http://bugs.debian.org/669582
http://bugs.debian.org/628451
http://bugs.debian.org/674347
http://bugs.debian.org/667964
[ Lucas Nussbaum ]
* Add hurd-path-max.diff. Fixes FTBFS on Hurd. (Closes: #648055)

[ Daigo Moriwaki ]
* Removed debian/patches/debian/patches/sparc-continuations.diff,
  which the upstream has applied.
* debian/rules:
  - Bumped up tcltk_ver to 8.5.
  - Used chrpath for tcltklib.so to fix a lintian error,
    binary-or-shlib-defines-rpath.
* debian/control:
  - Suggests ruby-switch. (Closes: #654312)
  - Build-Depends: chrpath.
* debian/libruby1.9.1.symbols: Added a new symbol for
  rb_str_modify_expand@Base.
* debian/run-test-suites.bash:
  - Corrected options for test-all.
  - Enabled timeout to allow hang tests to be aborted.

[ James Healy ]
* New upstream release: 1.9.3p194 (Closes: #669582)
  + This release includes a fix for CVE-2011-0188 (Closes: #628451)
  + This release also does not segfault when running the test suite under
    amd64 (Closes: #674347)
* Enable hardened build flags (Closes: #667964)
* debian/control:
  - depend on specific version on coreutils
  - update policy version (no changes)

[ Antonio Terceiro ]
* debian/ruby1.9.1.postinst:
  + bump alternatives priority for `ruby` to 51 so that Ruby 1.9 has a
    higher priority than Ruby 1.8 (50).
  + bump alternatives priority for `gem` to 181 so that the Rubygems
    provided by Ruby 1.9 has priority over the one provided by the rubygems
    package.
* debian/control: added myself to Uploaders:
* debian/libruby1.9.1.symbols: update with new symbols added in 1.9.3p194
  upstream release.
* debian/manpages/*: fix references to command names with s/1.9/1.9.1/
* debian/rules: skip running DRB tests, since they seem to make the build
  hang. This should close #647296, but let's way and see. Also, with this do
  not need to timeout the test suite anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/090729_fix_Makefile_deps.diff
9
9
## DP: rebuild ruby1.9 if it was removed.
10
10
 
11
11
@DPATCH@
12
 
--- a/common.mk
13
 
+++ b/common.mk
14
 
@@ -238,7 +238,7 @@ post-install-all:: post-install-local po
 
12
Index: ruby1.9.1/common.mk
 
13
===================================================================
 
14
--- ruby1.9.1.orig/common.mk    2012-02-26 18:47:27.000000000 +0900
 
15
+++ ruby1.9.1/common.mk 2012-02-26 19:40:46.000000000 +0900
 
16
@@ -239,7 +239,7 @@
15
17
 
16
18
 install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
17
19
 pre-install-nodoc:: pre-install-local pre-install-ext
18
20
-do-install-nodoc: $(PREP)
19
21
+do-install-nodoc: $(PREP) $(PROGRAM)
20
 
        $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --mantype="$(MANTYPE)"
 
22
        $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS)
21
23
 post-install-nodoc:: post-install-local post-install-ext
22
24