summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2007-11-12 11:38:32 +0000
committerColin Watson <cjwatson@debian.org>2007-11-12 11:38:32 +0000
commitc1161f198c9c8199e071f50c9535caa929e43db4 (patch)
tree04a39755914d81ee6d13c30896c1819724f7ea60
parent155a9d1515a3d3c4265734d4730278ec748891e2 (diff)
* Don't ignore errors from 'make -C contrib clean'.
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index d0b11f074..2cd4ead4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ openssh (1:4.6p1-6) UNRELEASED; urgency=low
10 * Fix sshd/inittab advice in README.Debian to account for rc.d movement 10 * Fix sshd/inittab advice in README.Debian to account for rc.d movement
11 (closes: #450632). 11 (closes: #450632).
12 * Suppress error from debian/rules if lsb-release is not installed. 12 * Suppress error from debian/rules if lsb-release is not installed.
13 * Don't ignore errors from 'make -C contrib clean'.
13 * debconf template translations: 14 * debconf template translations:
14 - Add Slovak (thanks, Ivan Masár; closes: #441690). 15 - Add Slovak (thanks, Ivan Masár; closes: #441690).
15 - Update Brazilian Portuguese (thanks, Eder L. Marques; 16 - Update Brazilian Portuguese (thanks, Eder L. Marques;
diff --git a/debian/rules b/debian/rules
index 5a1d722fd..f735ec6ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -123,7 +123,7 @@ clean:
123 dh_testdir 123 dh_testdir
124 rm -f build-deb-stamp build-udeb-stamp 124 rm -f build-deb-stamp build-udeb-stamp
125 rm -rf build-deb build-udeb 125 rm -rf build-deb build-udeb
126 -$(MAKE) -C contrib clean 126 $(MAKE) -C contrib clean
127 rm -f config.log 127 rm -f config.log
128ifeq ($(PO2DEBCONF),yes) 128ifeq ($(PO2DEBCONF),yes)
129 # Hack for woody compatibility. This makes sure that the 129 # Hack for woody compatibility. This makes sure that the