[ngspice] 05/61: Fixed get-orig-source target

[Andreas Tille]

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

tille pushed a commit to branch master
in repository ngspice.

commit 97aeb38df3264881870a574f1141032ebf6e0fd7
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date:   Fri May 29 07:08:07 2009 +0000

    Fixed get-orig-source target
---
 debian/changelog |  5 +++--
 debian/rules     | 28 ++++++++++++++--------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b6f9166..382c2dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ng-spice-rework (19-1) unstable; urgency=low
+ng-spice-rework (19-1) UNRELEASED; urgency=low
 
   * New upstream release
   * Remove all patches since they are already in upstream
@@ -7,8 +7,9 @@ ng-spice-rework (19-1) unstable; urgency=low
   * Not removing getopt files, since they are BSD now
   * Change /usr/share/ng-spice-rework to /usr/share/ngspice
   * Remove quilt dependency
+  * Fix get-orig-source target
 
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Thu, 21 May 2009 20:42:59 +0200
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Fri, 29 May 2009 09:07:10 +0200
 
 ng-spice-rework (18-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index d0c57bb..b0992d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -165,23 +165,23 @@ binary-arch: build install
 
 binary: binary-indep binary-arch
 
-DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep '^Version:' | sed -e 's/Version: \(.*\)\.*/\1/')
+DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep '^Version:' | sed -e 's/Version: \(.*\)-\(.*\)\.*/\1/')
 DIRNAME=ng-spice-rework-${DEB_UPSTREAM_VERSION}
 TARNAME=ng-spice-rework_${DEB_UPSTREAM_VERSION}.orig.tar.gz
 ARCHIVE=ng-spice-rework-${DEB_UPSTREAM_VERSION}.tar.gz
 get-orig-source:
-	uscan --download-version ${DEB_UPSTREAM_VERSION} .
-	tar -zxf ${ARCHIVE}
-	# Remove xgraph
-	rm -rf ${DIRNAME}/xgraph
-	# Remove CVS dirs
-	find . -name CVS -type d -exec rm -rf {} \;
-	find . -name .cvsignore -exec rm -f {} \;
-	rm -f doc/*.ps
-	rm -f doc/*.pdf
-	rm -f config.sub
-	rm -f config.guess
-	tar -zcf ${TARNAME} ${DIRNAME}
-	rm -rf ${DIRNAME} ${ARCHIVE}
+	uscan --download-version ${DEB_UPSTREAM_VERSION} --force-download .
+	(cd .. ;\
+	rm -rf ${DIRNAME} ;\
+	tar -zxf ${ARCHIVE} ;\
+	mv ngspice-${DEB_UPSTREAM_VERSION} ${DIRNAME} ;\
+	rm -rf ${DIRNAME}/xgraph ;\
+	find ${DIRNAME} -name CVS -type d -exec rm -rf {} \; ;\
+	find ${DIRNAME} -name .cvsignore -exec rm -f {} \; ;\
+	rm -f ${DIRNAME}/doc/*.ps ;\
+	rm -f ${DIRNAME}/doc/*.pdf ;\
+	rm -f ${DIRNAME}/config.sub ;\
+	rm -f ${DIRNAME}/config.guess ;\
+	tar -zcf ${TARNAME} ${DIRNAME})
 
 .PHONY: build clean binary-indep binary-arch binary install 

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