~ubuntu-branches/ubuntu/trusty/erlang/trusty

« back to all changes in this revision

Viewing changes to debian/patches/man.patch

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2011-05-05 15:48:43 UTC
  • mfrom: (3.5.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110505154843-0om6ekzg6m7ugj27
Tags: 1:14.b.2-dfsg-3ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not
    supposed to.
  - Drop erlang-wx binary.
  - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they
    do not really need wx. Also drop it from -debugger; the GUI needs wx,
    but it apparently has CLI bits as well, and is also needed by -megaco,
    so let's keep the package for now.
  - debian/patches/series: Do what I meant, and enable build-options.patch
    instead.
* Additional changes:
  - Drop erlang-wx from -et
* Dropped Changes:
  - patches/pcre-crash.patch: CVE-2008-2371: outer level option with
    alternatives caused crash. (Applied Upstream)
  - fix for ssl certificate verification in newSSL: 
    ssl_cacertfile_fix.patch (Applied Upstream)
  - debian/patches/series: Enable native.patch again, to get stripped beam
    files and reduce the package size again. (build-options is what
    actually accomplished this)
  - Remove build-options.patch on advice from upstream and because it caused
    odd build failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
4
4
(Erlang manual pages are placed to /usr/share/man/ hierarchy
5
5
as required by Debian policy.)
6
6
 
7
 
--- erlang-13.b.3-dfsg.orig/erts/etc/common/erlexec.c
8
 
+++ erlang-13.b.3-dfsg/erts/etc/common/erlexec.c
9
 
@@ -699,8 +699,10 @@
 
7
--- erlang-14.b.2-dfsg.orig/erts/etc/common/erlexec.c
 
8
+++ erlang-14.b.2-dfsg/erts/etc/common/erlexec.c
 
9
@@ -720,8 +720,10 @@
10
10
                        error("-man not supported on Windows");
11
11
 #else
12
12
                        argv[i] = "man";
13
 
-                       sprintf(tmpStr, "%s/man", rootdir);
 
13
-                       erts_snprintf(tmpStr, sizeof(tmpStr), "%s/man", rootdir);
14
14
-                       set_env("MANPATH", tmpStr);
15
15
+                       /*
16
16
+                       * Conform to erlang-manpages content.
17
17
+                       */
18
 
+                       putenv(strsave("MANSECT=3erl:1:4:6:7"));
 
18
+                       putenv(strsave("MANSECT=3erl:1:5:7"));
19
19
                        execvp("man", argv+i);
20
20
                        error("Could not execute the 'man' command.");
21
21
 #endif