[liblinear] 107/123: Fix get-orig-rules target in debian/rules

[Christian Kastner]

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

chrisk-guest pushed a commit to branch master
in repository liblinear.

commit 902da4c2e6306a7c7c78c21dd725d742ee398c8b
Author: Christian Kastner <debian at kvr.at>
Date:   Wed Feb 19 00:07:04 2014 +0100

    Fix get-orig-rules target in debian/rules
    
    The generated tarball did not match the git version
---
 debian/rules | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 2d0ae21..37f8bc3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,7 +50,7 @@ override_dh_strip:
 get-orig-source:
 	test -x /usr/bin/unzip || { echo "Package 'unzip' required"; exit 1; }
 	
-	uscan --noconf --force-download --download-current-version \
+	uscan --noconf --force-download --download-version $(LVER).$(LSUBVER) \
 		--check-dirname-level=0 --destdir=$(CURDIR) $(PKGDIR)
 	
 	unzip liblinear-$(UPVER).zip
@@ -61,9 +61,13 @@ get-orig-source:
 	
 	# Remove BLAS implementation with unknown license
 	rm -rf liblinear-$(UPVER)/blas/
+	# matlab Makefile
+	sed -i -e '/^\.\.\/blas\/blas\.a:/,+2d' liblinear-$(UPVER)/matlab/Makefile
 	sed -i -e 's| ../blas/blas.a||' liblinear-$(UPVER)/matlab/Makefile
-	sed -i -e 's| blas/blas.a||' liblinear-$(UPVER)/Makefile
 	sed -i -e '/blas/d' liblinear-$(UPVER)/matlab/Makefile
+	# main Makefile
+	sed -i -e '/^/blas\/blas\.a:/,+2d' liblinear-$(UPVER)/Makefile
+	sed -i -e 's| blas/blas.a||' liblinear-$(UPVER)/Makefile
 	sed -i -e '/blas/d' liblinear-$(UPVER)/Makefile
 	
 	mv liblinear-$(UPVER) liblinear-$(UPVER).orig

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