aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick J Cherry <patrick@bytemark.co.uk>2017-03-20 15:36:33 +0000
committerPatrick J Cherry <patrick@bytemark.co.uk>2017-03-20 15:36:33 +0000
commitbcde8969e4ef5acba8ee1fe3a284c9757c73678d (patch)
treef0b888decc92668791602be4834127741d13cf2f
parent23befe9cd55fba860a0fa3be33a600be3f43c4f7 (diff)
Added haml-contrib for the textile filter; updated debian packaging a little
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock3
-rw-r--r--debian/compat2
-rw-r--r--debian/control39
-rwxr-xr-xdebian/rules7
5 files changed, 27 insertions, 25 deletions
diff --git a/Gemfile b/Gemfile
index 0bd6198..5af4b41 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,6 +19,7 @@ gem "sanitize", "= 2.1.0"
gem "rmail", "= 1.1.0"
gem "thin", "= 1.6.3"
gem "haml", "= 4.0.5"
+gem "haml-contrib"
gem "RedCloth", "= 4.2.9"
gem "rack", "= 1.5.2"
gem "rack-protection", "= 1.5.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index 437527d..165fef9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -68,6 +68,8 @@ GEM
fastercsv (1.5.5)
haml (4.0.5)
tilt
+ haml-contrib (1.0.0.1)
+ haml (>= 3.2.0.alpha.13)
ipaddress (0.8.0)
json (1.8.1)
json_pure (1.8.6)
@@ -127,6 +129,7 @@ DEPENDENCIES
dm-types
dm-validations
haml (= 4.0.5)
+ haml-contrib
ipaddress (= 0.8.0)
json (= 1.8.1)
locale (= 2.1.0)
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
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 <matthew@bytemark.co.uk>
Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>
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
diff --git a/debian/rules b/debian/rules
index 99a63c4..f938869 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,5 @@
#!/usr/bin/make -f
-#
-# Use CDBS, so we can build for etch (ugh)
-#
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
+%:
+ dh $@ --buildsystem=ruby --with ruby --with systemd