[libvigraimpex] 03/30: deb/rules: removed old pointers, moved a target

[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 a1b4cece7ca5c6792e9007dfece477fad0301778
Author: Daniel Stender <debian at danielstender.com>
Date:   Sat Feb 13 18:35:34 2016 +0100

    deb/rules: removed old pointers, moved a target
---
 debian/changelog |  4 ++--
 debian/rules     | 13 +++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 011a83b..d0a210e 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.
-    + clean up phony targets.
+    + cleaned up.
   * deb/README.Debian: corrected typo.
   * Dropped deb/libvigraimpex5v5.lintian-overrides.
 
- -- Daniel Stender <debian at danielstender.com>  Sat, 13 Feb 2016 18:29:17 +0100
+ -- Daniel Stender <debian at danielstender.com>  Sat, 13 Feb 2016 18:34:34 +0100
 
 libvigraimpex (1.10.0+git20160120.803d5d4-1) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 52c17ed..30d2b06 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,6 +39,7 @@ cmake_options = \
     -DCMAKE_C_FLAGS_RELEASE="$(CFLAGS)" \
     -DCMAKE_CXX_FLAGS_RELEASE="$(CXXFLAGS)" \
     -DCMAKE_SHARED_LINKER_FLAGS_RELEASE="$(LDFLAGS)"
+
 cmake_python_options = \
     -DPYTHON_EXECUTABLE=/usr/bin/python$(1) \
     -DPYTHON_INCLUDE_DIR=/usr/include/python$(1)/ \
@@ -53,7 +54,6 @@ build: build-arch build-indep
 
 .PHONY: build-indep
 build-indep:
-	# Nothing to do in build-indep, "thanks" to bug #374029.
 
 .PHONY: build-arch
 build-arch:
@@ -94,8 +94,6 @@ obj.python%/CMakeCache.txt:
 		rm -f $(@); \
 		exit 1; \
 	fi
-	# We don't want to link with libpythonX.Y.
-	# We don't want SONAMES (except vigranumpycore.so)
 	find $(dir $(@))/vigranumpy/ -name 'link.txt' -exec sed -i \
 		-e 's/ -lpython[0-9.]\+ / /g' \
 		-e '/-Wl,-soname,vigranumpycore/b' \
@@ -151,13 +149,16 @@ binary-arch: build-arch
 	dh_strip -a
 	dh_makeshlibs -V 'libvigraimpex6 (>= 1.10.0)'
 	dh_shlibdeps
-	# See <http://lists.debian.org/debian-python/2010/07/msg00042.html>:
 	dh_numpy -p python-vigra
 	dh_installdeb -a
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a
 
+%/install-stamp: %/build-stamp
+	$(MAKE) -C $(dir $(@)) install DESTDIR=$(CURDIR)/debian/tmp/
+	touch $(@)
+
 .PHONY: binary-indep
 binary-indep: build-indep
 	dh_testdir
@@ -190,10 +191,6 @@ endif
 	dh_md5sums -i
 	dh_builddeb -i
 
-%/install-stamp: %/build-stamp
-	$(MAKE) -C $(dir $(@)) install DESTDIR=$(CURDIR)/debian/tmp/
-	touch $(@)
-
 doc/vigra/build-stamp: obj/build-stamp
 	$(MAKE) doc_cpp -C obj/
 	touch $(@)

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