[libvigraimpex] 08/30: deb/rules: removed some line breaks

[Daniel Stender]

This is an automated email from the git hooks/post-receive script.

danstender-guest pushed a commit to branch master
in repository libvigraimpex.

commit 5b8bf1208e2db7f4264706f154fcbd022908f629
Author: Daniel Stender <debian at danielstender.com>
Date:   Sat Feb 13 18:46:42 2016 +0100

    deb/rules: removed some line breaks
---
 debian/changelog |  4 ++--
 debian/rules     | 44 +++++++++++++++-----------------------------
 2 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7b92869..e6144c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,11 +8,11 @@ libvigraimpex (1.10.0+git20160120.803d5d4-2) UNRELEASED; urgency=medium
     + added Breaks to libvigraimpex6 [thanks to Andreas Metzler].
   * deb/rules:
     + added DH_VERBOSE export line.
-    + removed old and obsolete stuff.
+    + removed old and obsolete stuff, cometics.
   * deb/README.Debian: corrected typo.
   * Dropped deb/libvigraimpex5v5.lintian-overrides.
 
- -- Daniel Stender <debian at danielstender.com>  Sat, 13 Feb 2016 18:36:06 +0100
+ -- Daniel Stender <debian at danielstender.com>  Sat, 13 Feb 2016 18:47:27 +0100
 
 libvigraimpex (1.10.0+git20160120.803d5d4-1) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 16d7811..63bcf21 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,39 +48,27 @@ build-indep:
 build-arch:
 	dh_testdir
 	@echo DEBUGMEMSIZE ; if which free ; then free ; fi
-	$(MAKE) -f debian/rules \
-		obj/CMakeCache.txt \
-		$(patsubst %,obj.%/CMakeCache.txt,$(shell pyversions -r))
-	$(MAKE) -f debian/rules \
-		doc/changelog \
-		obj/build-stamp \
-		$(patsubst %,obj.%/build-stamp,$(shell pyversions -r))
+	$(MAKE) -f debian/rules obj/CMakeCache.txt
+	$(MAKE) -f debian/rules	$(patsubst %,obj.%/CMakeCache.txt,$(shell pyversions -r))
+	$(MAKE) -f debian/rules doc/changelog
+	$(MAKE) -f debian/rules obj/build-stamp
+	$(MAKE) -f debian/rules $(patsubst %,obj.%/build-stamp,$(shell pyversions -r))
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
-	$(MAKE) -k -f debian/rules \
-		obj/test-stamp \
-		$(patsubst %,obj.%/test-stamp,$(shell pyversions -r))
+	$(MAKE) -k -f debian/rules obj/test-stamp
+	$(MAKE) -f debian/rules $(patsubst %,obj.%/test-stamp,$(shell pyversions -r))
 endif
 
 obj/CMakeCache.txt:
 	mkdir -p $(dir $(@))
-	cd $(dir $(@)) && cmake .. $(cmake_options) \
-		-DPYTHON_EXECUTABLE=/usr/bin/python \
-		-DWITH_VIGRANUMPY=0
+	cd $(dir $(@)) && cmake .. $(cmake_options) -DPYTHON_EXECUTABLE=/usr/bin/python -DWITH_VIGRANUMPY=0
 
 obj.python%/CMakeCache.txt:
 	mkdir -p $(dir $(@))
-	cd $(dir $(@)) && \
-		CXXFLAGS=-fno-strict-aliasing cmake .. $(cmake_options) $(call cmake_python_options,$(*))
+	cd $(dir $(@)) && CXXFLAGS=-fno-strict-aliasing cmake .. $(cmake_options) $(call cmake_python_options,$(*))
 	if ! grep VIGRANUMPY_DEPENDENCIES $(@) > /dev/null; then \
-		echo "Error: Numpy for Python $* not found" >&2; \
-		rm -f $(@); \
-		exit 1; \
-	fi
+		echo "Error: Numpy for Python $* not found" >&2; rm -f $(@); exit 1; fi
 	find $(dir $(@))/vigranumpy/ -name 'link.txt' -exec sed -i \
-		-e 's/ -lpython[0-9.]\+ / /g' \
-		-e '/-Wl,-soname,vigranumpycore/b' \
-		-e 's/ -Wl,-soname,[^ ]\+ / /' \
-		{} +
+		-e 's/ -lpython[0-9.]\+ / /g' -e '/-Wl,-soname,vigranumpycore/b' -e 's/ -Wl,-soname,[^ ]\+ / /' {} +
 
 obj/build-stamp: obj/CMakeCache.txt
 	$(MAKE) -C $(dir $(@))
@@ -114,9 +102,8 @@ binary: binary-arch binary-indep
 binary-arch: build-arch
 	dh_testdir
 	dh_testroot
-	$(MAKE) -f debian/rules \
-		obj/install-stamp \
-		$(patsubst %,obj.%/install-stamp,$(shell pyversions -r))
+	$(MAKE) -f debian/rules obj/install-stamp
+	$(MAKE) -f debian/rules $(patsubst %,obj.%/install-stamp,$(shell pyversions -r))
 	dh_install -a
 	dh_installdocs -a
 	dh_installchangelogs -a doc/changelog
@@ -145,9 +132,8 @@ binary-arch: build-arch
 binary-indep: build-indep
 	dh_testdir
 	dh_testroot
-	$(MAKE) -f debian/rules \
-		doc/vigra/build-stamp \
-		doc/vigranumpy/build-stamp
+	$(MAKE) -f debian/rules doc/vigra/build-stamp
+	$(MAKE) -f debian/rules doc/vigranumpy/build-stamp
 	dh_installdocs -i -XLICENSE.txt -Xobjects.inv -Xdoctrees -X.buildinfo -Xbuild-stamp
 	cd debian/libvigraimpex-doc/usr/share/doc/libvigraimpex-doc/ && \
 		rm -rf html && \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libvigraimpex.git