← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/common_test/test/ct_config_SUITE_data/config/config.txt

  • 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:
lib/common_test/test/ct_config_SUITE_data/config/config.txt
 
1
{x, suite}.
 
2
{gen_cfg,
 
3
        [
 
4
                {a,a_value},
 
5
                {b,b_value}
 
6
        ]}.
 
7
{gen_cfg2,
 
8
        [
 
9
                {c, "Hello, world!"},
 
10
                {d, atom_value},
 
11
                {e, {tuple,1,"third value",[]}},
 
12
                {f, []},
 
13
                {g, [1,atom,"string",13.6,{1,2,3}]}
 
14
        ]}.
 
15
{gen_cfg3,
 
16
        [
 
17
                {h,
 
18
                [
 
19
                        {i, third1},
 
20
                        {j, "Third2"},
 
21
                        {k, 'THIRD3'}
 
22
                ]},
 
23
                {l,
 
24
                [
 
25
                        {m,
 
26
                        [
 
27
                                {n, "N"},
 
28
                                {o, 'O'}
 
29
                        ]}
 
30
                ]}
 
31
        ]}.