From 47d3ddcb320675911ec4e55eb5823ebbceeb3687 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 20 Mar 2017 13:23:50 +0000 Subject: Revert "Strip out debian metadata" This reverts commit 4d9ca84e57dad6746eb0882b91171ccd69298807. --- debian/control | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 debian/control (limited to 'debian/control') diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..1fdc4f5 --- /dev/null +++ b/debian/control @@ -0,0 +1,68 @@ +Source: mauvealert +Maintainer: Matthew Bloch +Uploaders: Patrick J Cherry +Section: ruby +Priority: optional +Build-Depends: ruby | ruby-interpreter, debhelper, cdbs, rdoc, txt2man, cdbs, libsetup-ruby1.8 | ruby-setup +Standards-Version: 3.9.1 + +Package: mauvealert-client +Architecture: all +Depends: ruby | ruby-interpreter, + mauvealert-common (>= 3.8.0), + ${misc:Depends} +Recommends: liblocale-ruby1.8 | ruby-locale +Description: Mauve network alert system -- client + Mauve is a network alert system for system and network administrators. You + can use it to quickly set up ad-hoc monitoring for a variety of services, and + to confidently replace all scripts that might otherwise send floods of emails + or text messages. + . + This is the client package. + +Package: mauvealert-server +Architecture: all +Pre-Depends: libjs-jquery +Depends: mauvealert-common (>= 3.8.0), + adduser, + ruby-dm-core (>= 1.2.0) | libdm-core-ruby1.8 (>= 1.2.0), + ruby-dm-migrations (>= 1.2.0) | libdm-migrations-ruby1.8 (>= 1.2.0), + ruby-dm-sqlite-adapter (>= 1.2.0) | libdm-sqlite-adapter-ruby1.8 (>= 1.2.0), + ruby-dm-types (>= 1.2.0) | libdm-types-ruby1.8 (>= 1.2.0), + ruby-dm-aggregates (>= 1.2.0) | libdm-aggregates-ruby1.8 (>= 1.2.0), + ruby-dm-validations (>= 1.2.0) | libdm-validations-ruby1.8 (>= 1.2.0), + ruby-dm-transactions (>= 1.2.0) | libdm-transactions-ruby1.8 (>= 1.2.0), + ruby-haml (>= 3.0.15) | libhaml-ruby1.8 (>= 3.0.15) | haml (>= 3.0.15), + ruby-sanitize (>= 2.0.3) | libsanitize-ruby1.8 (>= 2.0.3), + ruby-sinatra (>= 1.0) | libsinatra-ruby1.8 (>= 1.0), + ruby-ipaddress | libipaddresss-ruby1.8, + ruby-log4r | liblog4r-ruby1.8, + ruby-redcloth | libredcloth-ruby1.8, + ruby-rmail | librmail-ruby1.8, + ruby-thin | thin1.8 | thin, + ruby-xmpp4r | libxmpp4r-ruby1.8, + lsb-base (>= 3.2-14), + ruby1.8 (>= 1.8.7), + ${misc:Depends} +Suggests: mauvealert-client +Recommends: ruby-locale | liblocale-ruby1.8 +Description: Mauve network alert system -- server + Mauve is a network alert system for system and network administrators. You can + use it to quickly set up ad-hoc monitoring for a variety of services, and to + confidently replace all scripts that might otherwise send floods of emails or + text messages. + . + This is the server package. + +Package: mauvealert-common +Architecture: all +Depends: ruby | ruby-interpreter, ruby-protobuf, ${misc:Depends} +Suggests: mauvealert-client +Description: Mauve network alert system -- common libraries + Mauve is a network alert system for system and network administrators. You can + use it to quickly set up ad-hoc monitoring for a variety of services, and to + confidently replace all scripts that might otherwise send floods of emails or + text messages. + . + This is the package of libraries in common with both the client and server. + -- cgit v1.2.1 From bcde8969e4ef5acba8ee1fe3a284c9757c73678d Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 20 Mar 2017 15:36:33 +0000 Subject: Added haml-contrib for the textile filter; updated debian packaging a little --- debian/control | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 1fdc4f5..491aedf 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,9 @@ Maintainer: Matthew Bloch Uploaders: Patrick J Cherry Section: ruby Priority: optional -Build-Depends: ruby | ruby-interpreter, debhelper, cdbs, rdoc, txt2man, cdbs, libsetup-ruby1.8 | ruby-setup +Build-Depends: ruby | ruby-interpreter, debhelper, rdoc, txt2man, gem2deb, dh-systemd, ruby-setup Standards-Version: 3.9.1 +XS-Ruby-Versions: all Package: mauvealert-client Architecture: all @@ -25,24 +26,24 @@ Architecture: all Pre-Depends: libjs-jquery Depends: mauvealert-common (>= 3.8.0), adduser, - ruby-dm-core (>= 1.2.0) | libdm-core-ruby1.8 (>= 1.2.0), - ruby-dm-migrations (>= 1.2.0) | libdm-migrations-ruby1.8 (>= 1.2.0), - ruby-dm-sqlite-adapter (>= 1.2.0) | libdm-sqlite-adapter-ruby1.8 (>= 1.2.0), - ruby-dm-types (>= 1.2.0) | libdm-types-ruby1.8 (>= 1.2.0), - ruby-dm-aggregates (>= 1.2.0) | libdm-aggregates-ruby1.8 (>= 1.2.0), - ruby-dm-validations (>= 1.2.0) | libdm-validations-ruby1.8 (>= 1.2.0), - ruby-dm-transactions (>= 1.2.0) | libdm-transactions-ruby1.8 (>= 1.2.0), - ruby-haml (>= 3.0.15) | libhaml-ruby1.8 (>= 3.0.15) | haml (>= 3.0.15), - ruby-sanitize (>= 2.0.3) | libsanitize-ruby1.8 (>= 2.0.3), - ruby-sinatra (>= 1.0) | libsinatra-ruby1.8 (>= 1.0), - ruby-ipaddress | libipaddresss-ruby1.8, - ruby-log4r | liblog4r-ruby1.8, - ruby-redcloth | libredcloth-ruby1.8, - ruby-rmail | librmail-ruby1.8, - ruby-thin | thin1.8 | thin, - ruby-xmpp4r | libxmpp4r-ruby1.8, - lsb-base (>= 3.2-14), - ruby1.8 (>= 1.8.7), + ruby-dm-core, + ruby-dm-migrations, + ruby-dm-sqlite-adapter, + ruby-dm-types, + ruby-dm-aggregates, + ruby-dm-validations, + ruby-dm-transactions, + ruby-haml, + ruby-haml-contrib, + ruby-sanitize, + ruby-sinatra, + ruby-ipaddress, + ruby-log4r, + ruby-redcloth, + ruby-rubymail, + ruby-thin, + lsb-base, + ruby | ruby-interpreter, ${misc:Depends} Suggests: mauvealert-client Recommends: ruby-locale | liblocale-ruby1.8 -- cgit v1.2.1 From 40533e34cca72fee719a9d84f6e07b13ca893b6e Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 20 Mar 2017 22:41:48 +0000 Subject: Updated packaging .. still need a datamapper package --- debian/control | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 491aedf..70baca0 100644 --- a/debian/control +++ b/debian/control @@ -3,36 +3,14 @@ Maintainer: Matthew Bloch Uploaders: Patrick J Cherry Section: ruby Priority: optional -Build-Depends: ruby | ruby-interpreter, debhelper, rdoc, txt2man, gem2deb, dh-systemd, ruby-setup +Build-Depends: ruby | ruby-interpreter, debhelper, rdoc, txt2man, dh-systemd, bundler Standards-Version: 3.9.1 -XS-Ruby-Versions: all - -Package: mauvealert-client -Architecture: all -Depends: ruby | ruby-interpreter, - mauvealert-common (>= 3.8.0), - ${misc:Depends} -Recommends: liblocale-ruby1.8 | ruby-locale -Description: Mauve network alert system -- client - Mauve is a network alert system for system and network administrators. You - can use it to quickly set up ad-hoc monitoring for a variety of services, and - to confidently replace all scripts that might otherwise send floods of emails - or text messages. - . - This is the client package. Package: mauvealert-server Architecture: all Pre-Depends: libjs-jquery Depends: mauvealert-common (>= 3.8.0), adduser, - ruby-dm-core, - ruby-dm-migrations, - ruby-dm-sqlite-adapter, - ruby-dm-types, - ruby-dm-aggregates, - ruby-dm-validations, - ruby-dm-transactions, ruby-haml, ruby-haml-contrib, ruby-sanitize, @@ -55,6 +33,20 @@ Description: Mauve network alert system -- server . This is the server package. +Package: mauvealert-client +Architecture: all +Depends: ruby | ruby-interpreter, + mauvealert-common (>= 3.8.0), + ${misc:Depends} +Recommends: liblocale-ruby1.8 | ruby-locale +Description: Mauve network alert system -- client + Mauve is a network alert system for system and network administrators. You + can use it to quickly set up ad-hoc monitoring for a variety of services, and + to confidently replace all scripts that might otherwise send floods of emails + or text messages. + . + This is the client package. + Package: mauvealert-common Architecture: all Depends: ruby | ruby-interpreter, ruby-protobuf, ${misc:Depends} -- cgit v1.2.1 From ce399f3203cbd7f5834fb5fb93d36576adb85834 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Thu, 22 Jun 2017 14:20:04 +0100 Subject: Update gitlab-ci and debian control to use gems --- debian/control | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 70baca0..5ce74d8 100644 --- a/debian/control +++ b/debian/control @@ -9,20 +9,7 @@ Standards-Version: 3.9.1 Package: mauvealert-server Architecture: all Pre-Depends: libjs-jquery -Depends: mauvealert-common (>= 3.8.0), - adduser, - ruby-haml, - ruby-haml-contrib, - ruby-sanitize, - ruby-sinatra, - ruby-ipaddress, - ruby-log4r, - ruby-redcloth, - ruby-rubymail, - ruby-thin, - lsb-base, - ruby | ruby-interpreter, - ${misc:Depends} +Depends: adduser, lsb-base, ruby | ruby-interpreter, ${misc:Depends} Suggests: mauvealert-client Recommends: ruby-locale | liblocale-ruby1.8 Description: Mauve network alert system -- server -- cgit v1.2.1 From 783a411ec3369949e9122b2fc9ed6ce525f5dcf9 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Thu, 22 Jun 2017 14:29:34 +0100 Subject: Updated build-deps --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 5ce74d8..f4cdbab 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Maintainer: Matthew Bloch Uploaders: Patrick J Cherry Section: ruby Priority: optional -Build-Depends: ruby | ruby-interpreter, debhelper, rdoc, txt2man, dh-systemd, bundler +Build-Depends: ruby | ruby-interpreter, debhelper, rdoc, txt2man, dh-systemd, + bundler, libsqlite3-dev, zlib1g-dev, libxml2-dev, ruby-dev, libpq-dev Standards-Version: 3.9.1 Package: mauvealert-server -- cgit v1.2.1 From a2e698d0b173f5f7531ff0c70b26f2eacf3a5608 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Thu, 22 Jun 2017 14:40:00 +0100 Subject: Add postgres headers. --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index f4cdbab..7786112 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,8 @@ Uploaders: Patrick J Cherry Section: ruby Priority: optional Build-Depends: ruby | ruby-interpreter, debhelper, rdoc, txt2man, dh-systemd, - bundler, libsqlite3-dev, zlib1g-dev, libxml2-dev, ruby-dev, libpq-dev + bundler, libsqlite3-dev, zlib1g-dev, libxml2-dev, ruby-dev, libpq-dev, + postgresql-server-dev-9.4 | postgresql-server-dev-9.6 Standards-Version: 3.9.1 Package: mauvealert-server -- cgit v1.2.1 From da925080e7eddd86f5987f6ef95c7b0e333bb2b5 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 31 Jul 2017 11:42:14 +0100 Subject: Removed init script, added systemd service, removed common package etc Also * added bundler boilerplate to bin/mauveserver * fixed jquery symlinks in server postinst and links files * updated gitignore --- debian/control | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 7786112..3686b43 100644 --- a/debian/control +++ b/debian/control @@ -9,9 +9,9 @@ Build-Depends: ruby | ruby-interpreter, debhelper, rdoc, txt2man, dh-systemd, Standards-Version: 3.9.1 Package: mauvealert-server -Architecture: all +Architecture: any Pre-Depends: libjs-jquery -Depends: adduser, lsb-base, ruby | ruby-interpreter, ${misc:Depends} +Depends: adduser, lsb-base, ruby | ruby-interpreter, ruby-bundler, libpq5, ${misc:Depends} Suggests: mauvealert-client Recommends: ruby-locale | liblocale-ruby1.8 Description: Mauve network alert system -- server @@ -24,10 +24,12 @@ Description: Mauve network alert system -- server Package: mauvealert-client Architecture: all -Depends: ruby | ruby-interpreter, - mauvealert-common (>= 3.8.0), +Depends: ruby | ruby-interpreter, ruby-protobuf, ${misc:Depends} ${misc:Depends} Recommends: liblocale-ruby1.8 | ruby-locale +Replaces: mauvealert-common +Conflicts: mauvealert-common +Provides: mauvealert-common Description: Mauve network alert system -- client Mauve is a network alert system for system and network administrators. You can use it to quickly set up ad-hoc monitoring for a variety of services, and @@ -36,15 +38,3 @@ Description: Mauve network alert system -- client . This is the client package. -Package: mauvealert-common -Architecture: all -Depends: ruby | ruby-interpreter, ruby-protobuf, ${misc:Depends} -Suggests: mauvealert-client -Description: Mauve network alert system -- common libraries - Mauve is a network alert system for system and network administrators. You can - use it to quickly set up ad-hoc monitoring for a variety of services, and to - confidently replace all scripts that might otherwise send floods of emails or - text messages. - . - This is the package of libraries in common with both the client and server. - -- cgit v1.2.1 From eee62dc8edaec35aebc89d5ce430ab53eae5a5ae Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 31 Jul 2017 13:10:18 +0100 Subject: Added in shlibs substitution variable --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 3686b43..528abff 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Standards-Version: 3.9.1 Package: mauvealert-server Architecture: any Pre-Depends: libjs-jquery -Depends: adduser, lsb-base, ruby | ruby-interpreter, ruby-bundler, libpq5, ${misc:Depends} +Depends: adduser, lsb-base, ruby | ruby-interpreter, ruby-bundler, ${shlibs:Depends}, ${misc:Depends} Suggests: mauvealert-client Recommends: ruby-locale | liblocale-ruby1.8 Description: Mauve network alert system -- server -- cgit v1.2.1 From 1cf80d07aed06f9d0d53d22fccfb6645d8933b34 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Tue, 1 Aug 2017 11:29:07 +0100 Subject: Fix typo in control --- debian/control | 1 - 1 file changed, 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 528abff..5e913b3 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,6 @@ Description: Mauve network alert system -- server Package: mauvealert-client Architecture: all Depends: ruby | ruby-interpreter, ruby-protobuf, ${misc:Depends} - ${misc:Depends} Recommends: liblocale-ruby1.8 | ruby-locale Replaces: mauvealert-common Conflicts: mauvealert-common -- cgit v1.2.1