← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/inets/test/ftp_SUITE_data/ftpd_hosts.skel

  • 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/inets/test/ftp_SUITE_data/ftpd_hosts.skel
 
1
%% Add a host name in the appropriate list
 
2
%% Each "platform" contains a list of hostnames (a string) that can 
 
3
%% be used for testing the ftp client.
 
4
%% The definition below are an example!!
 
5
[{solaris8_sparc,      ["solaris8_sparc_dummy1", "solaris8_sparc_dummy2"]}, 
 
6
 {solaris9_sparc,      ["solaris9_sparc_dummy1"]}, 
 
7
 {solaris10_sparc,     ["solaris10_sparc_dummy1"]}, 
 
8
 {solaris10_x86,       ["solaris10_x86_dummy1", "solaris10_x86_dummy2"]}, 
 
9
 {linux_x86,           ["linux_x86_dummy1", "linux_x86_dummy2"]}, 
 
10
 {linux_ppc,           ["linux_ppc_dummy1"]}, 
 
11
 {macosx_ppc,          ["macosx_ppc_dummy1"]},
 
12
 {macosx_x86,          ["macosx_x86_dummy1", "macosx_x86_dummy2"]},
 
13
 {openbsd_x86,         []},
 
14
 {freebsd_x86,         ["freebsd_x86_dummy1"]},
 
15
 {netbsd_x86,          []},
 
16
 {windows_xp,          []},
 
17
 {windows_2003_server, ["win2003_dummy1"]},
 
18
 {ticket_test,         ["solaris8_x86_dummy1", "linux_x86_dummy1"]}].