From 79749fd2939781e201191ef081143d8a575984e7 Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Thu, 12 Jan 2012 22:47:21 -0500
Subject: [PATCH] Added 'set -e' to composite cmdline constructs in
debian/rules to prevent swallowing errors. Thanks to Jakub Wilk for citing me
the relevant exerpt from Debian policy ;-)
---
debian/changelog | 7 +++++--
debian/rules | 2 ++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d17aa6d327..ded5178503 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-scikit-learn (0.10.0~pre1-1) unstable; urgency=low
+scikit-learn (0.10.0-1) unstable; urgency=low
* Snapshot of upstream release branch
- Python 2.5 compatibility dropped
@@ -8,8 +8,11 @@ scikit-learn (0.10.0~pre1-1) unstable; urgency=low
* Adjusted dfsg and other rules to operate on sklearn directory
* Dropping cherry-picked fix up_release_sv_coef_memory
* Operate on 'requested' not all supported Python versions
+ * Added 'set -e' to composite cmdline constructs in debian/rules to
+ prevent swallowing errors. Thanks to Jakub Wilk for citing me the relevant
+ exerpt from Debian policy ;-)
- -- Yaroslav Halchenko <debian@onerussian.com> Tue, 10 Jan 2012 17:52:27 -0500
+ -- Yaroslav Halchenko <debian@onerussian.com> Thu, 12 Jan 2012 22:42:03 -0500
scikit-learn (0.9.0.dfsg-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 850da5ecd6..f654b8dc13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,6 +57,7 @@ override_dh_installchangelogs:
## move binary libraries into -lib
override_dh_pysupport:
: # Move platform-specific libraries into -lib
+ set -e; \
for lib in $$(find $(PACKAGE_ROOT_DIR)/usr -name '*.so'); do \
sdir=$$(dirname $$lib) ; \
tdir=$(PACKAGE_ROOT_DIR)-lib/$${sdir#*$(PACKAGE_NAME)/} ; \
@@ -68,6 +69,7 @@ override_dh_pysupport:
: # Prune scikits/__init__.py to avoid conflicts
find debian -wholename \*scikits/__init__.py -delete
: # Move scikits. space into a compatibility package
+ set -e; \
find debian -wholename \*scikits -type d | while read skd; do \
skbd=$$(dirname $$skd); \
skbd_=$$(echo $$skbd | sed -e 's/sklearn/scikits-learn/g'); \
--
GitLab