diff --git a/debian/changelog b/debian/changelog index c4bb2f6..afcd965 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -orafce (3.0.6-3) UNRELEASED; urgency=medium +orafce (3.0.6-3) unstable; urgency=medium * Set team as Maintainer. + * Use lsb_release -is in tests to determine OS. + * Don't install INSTALL.orafunc. - -- Christoph Berg Tue, 01 Jul 2014 14:30:48 +0200 + -- Christoph Berg Thu, 03 Jul 2014 16:02:42 +0200 orafce (3.0.6-2) unstable; urgency=medium diff --git a/debian/copyright b/debian/copyright index 39a17ad..305ca31 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,7 +5,7 @@ Upstream authors: Pavel Stehule and others -Copyright notice: +Copyright notice: Copyright (C) 2008-2012 Orafce Global Development Group Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement diff --git a/debian/rules b/debian/rules index 15893e8..c57c9fc 100755 --- a/debian/rules +++ b/debian/rules @@ -12,4 +12,4 @@ rm -r $(CURDIR)/debian/*/usr/share/doc/postgresql-doc-* override_dh_installdocs: - dh_installdocs -A INSTALL.orafunc README.asciidoc + dh_installdocs -A README.asciidoc diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 0000000..d720a6b --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1,2 @@ +orafce source: changelog-should-mention-nmu +orafce source: source-nmu-has-incorrect-version-number diff --git a/debian/tests/control b/debian/tests/control index 221d1e9..1b44ffe 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,3 +1,3 @@ -Depends: @, postgresql-server-dev-all, locales +Depends: @, postgresql-server-dev-all, locales, lsb-release Tests: installcheck Restrictions: needs-root allow-stderr diff --git a/debian/tests/installcheck b/debian/tests/installcheck index d733ac2..812a399 100755 --- a/debian/tests/installcheck +++ b/debian/tests/installcheck @@ -2,16 +2,17 @@ set -e -if [ -f /etc/locale.gen ]; then - # Debian +case $(lsb_release -is) in +Debian) if ! grep -Fwq "en_US.UTF-8 UTF-8" /etc/locale.gen; then echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen locale-gen fi -else - # Ubuntu + ;; +Ubuntu) locale-gen en_US.UTF-8 -fi + ;; +esac # to_multi_byte needs English, and UTF-8 export LC_ALL=en_US.utf8