summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVarac <varac@leap.se>2017-10-26 14:02:23 +0200
committerVarac <varac@leap.se>2017-10-26 14:02:52 +0200
commit1e4e828acf6f4de196fa5f22e37b665933eda530 (patch)
tree15a62d78c18c3c104f8d5269524d4556f5dabecd
parent0312dd53f4e485034799bff8d66319b4af593f49 (diff)
Standards-Version 4.1.1, Ubuntu artful package
-rw-r--r--.gitlab-ci.yml22
-rw-r--r--debian/control2
2 files changed, 17 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index adcc4507..eb22efab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,9 +102,9 @@ package:amd64_jessie:
ARCH: "amd64"
DIST: "jessie"
REPONAMES: "platform,client"
- # Default is to fail on warnings, we disable it here
+ # Default is to fail on warnings, we disable it here
# unless a manpage is included (see #8895)
- LINTIAN_OPTS: "-X filename-length"
+ LINTIAN_OPTS: "--fail-on-warnings -X filename-length,manpages"
<<: *package
@@ -115,7 +115,7 @@ package:amd64_stretch:
REPONAMES: "platform,client"
# Default is to fail on warnings, we disable it here
# unless a manpage is included (see #8895)
- LINTIAN_OPTS: "-X filename-length"
+ LINTIAN_OPTS: "--fail-on-warnings -X filename-length,manpages"
<<: *package
package:amd64_buster:
@@ -128,7 +128,7 @@ package:amd64_buster:
# Also, ignore the `build-depends-on-obsolete-package` tag
# until we can deprecate jessie and take out the dh-systemd
# build-depends (see #8963)
- LINTIAN_OPTS: "-X filename-length --suppress-tags build-depends-on-obsolete-package"
+ LINTIAN_OPTS: "--fail-on-warnings -X filename-length,manpages --suppress-tags build-depends-on-obsolete-package"
<<: *package
package:amd64_zesty:
@@ -136,9 +136,19 @@ package:amd64_zesty:
ARCH: "amd64"
DIST: "zesty"
REPONAMES: "platform,client"
- # Default is to fail on warnings, we disable it here
+ # Default is to fail on warnings, we disable it here
+ # unless a manpage is included (see #8895)
+ LINTIAN_OPTS: "--fail-on-warnings -X filename-length,manpages"
+ <<: *package
+
+package:amd64_artful:
+ variables:
+ ARCH: "amd64"
+ DIST: "artful"
+ REPONAMES: "platform,client"
+ # Default is to fail on warnings, we disable it here
# unless a manpage is included (see #8895)
- LINTIAN_OPTS: "-X filename-length"
+ LINTIAN_OPTS: "--fail-on-warnings -X filename-length,manpages"
<<: *package
diff --git a/debian/control b/debian/control
index e3c5f8a6..38322a88 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Micah Anderson <micah@debian.org>
Uploaders: LEAP automated build <sysdev@leap.se>
Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), python-wheel, debhelper (>= 9), dh-python, dh-systemd
-Standards-Version: 4.1.0
+Standards-Version: 4.1.1
Package: soledad-server
Architecture: all