diff options
| author |  Yun Peng <pcloudy@google.com> | 2016-07-01 12:40:41 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-07-01 13:36:44 +0000 |
| commit | fdb5a8c06985d78c55981a981a72bd4f0766ddb8 (patch) | |
| tree | dc7fdc24cecb5f89127a72ea4dae779fa51ec9cc /tools/build_defs/pkg/README.md | |
| parent | d0d266732afc4f6ac589df31cf45c1f4cc8e300d (diff) | |
Fixed Bazel deb package dependency on Ubuntu 16.04
Declare openjdk-9-jdk as Conflicts
Progress towards #1456
--
Change-Id: I67c17b78f90f81dbcc9c39bf6f3915789662fa94
Reviewed-on: https://bazel-review.googlesource.com/#/c/3951
MOS_MIGRATED_REVID=126402113
Diffstat (limited to 'tools/build_defs/pkg/README.md')
| -rw-r--r-- | tools/build_defs/pkg/README.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/build_defs/pkg/README.md b/tools/build_defs/pkg/README.md index 80956476b2..4e6b8a600b 100644 --- a/tools/build_defs/pkg/README.md +++ b/tools/build_defs/pkg/README.md @@ -227,7 +227,7 @@ Creates a tar file from a list of inputs. ### pkg_deb ```python -pkg_deb(name, data, package, architecture, maintainer, preinst, postinst, prerm, postrm, version, version_file, description, description_file, built_using, built_using_file, priority, section, homepage, depends, suggests, enhances, predepends, recommends) +pkg_deb(name, data, package, architecture, maintainer, preinst, postinst, prerm, postrm, version, version_file, description, description_file, built_using, built_using_file, priority, section, homepage, depends, suggests, enhances, conflicts, predepends, recommends) ``` Create a debian package. See <a @@ -358,7 +358,7 @@ for more details on this. <tr> <td> <code>depends</code>, <code>suggests</code>, <code>enhances</code>, - <code>predepends</code> and <code>recommends</code>. + <code>conflicts</code>, <code>predepends</code> and <code>recommends</code>. </td> <td> <code>String list, optional</code> |