diff options
| author | Lennart Weller <lhw@ring0.de> | 2016-05-09 15:52:06 +0000 |
|---|---|---|
| committer | Lennart Weller <lhw@ring0.de> | 2016-05-09 15:52:06 +0000 |
| commit | cb88c62e6e347404e03ec6edb1ad45252c823e5a (patch) | |
| tree | fb73a0ca3027451086386714af1fb9ec968b2337 | |
| parent | some bug fixes (diff) | |
| parent | initial split for packages (diff) | |
| download | netdata-cb88c62e6e347404e03ec6edb1ad45252c823e5a.tar.xz netdata-cb88c62e6e347404e03ec6edb1ad45252c823e5a.zip | |
merged too many
| -rw-r--r-- | debian/control | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/debian/control b/debian/control index c36269696..edb277208 100644 --- a/debian/control +++ b/debian/control @@ -17,6 +17,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/netdata.git Package: netdata Architecture: any +Multi-Arch: same Depends: adduser, libcap2-bin (>= 1:2.0), lsb-base (>= 3.1-23.2), @@ -32,6 +33,10 @@ Description: real-time charts for system monitoring Package: netdata-data Architecture: all +<<<<<<< HEAD +======= +Multi-Arch: foreign +>>>>>>> f2a27bcd6e16cafd4505fc84d9beac11cbcfdf8d Depends: ${misc:Depends}, ${shlibs:Depends} Description: real-time charts for system monitoring Netdata is a daemon that collects data in realtime (per second) @@ -43,6 +48,10 @@ Description: real-time charts for system monitoring Package: netdata-plugins-nodejs Architecture: all +<<<<<<< HEAD +======= +Multi-Arch: foreign +>>>>>>> f2a27bcd6e16cafd4505fc84d9beac11cbcfdf8d Depends: nodejs, ${misc:Depends}, ${shlibs:Depends} Description: real-time charts for system monitoring Netdata is a daemon that collects data in realtime (per second) |