r35742 - in /packages/ng-spice-rework/trunk/debian: changelog rules

[gudjon-guest at users.alioth.debian.org]

Author: gudjon-guest
Date: Fri May 29 07:08:07 2009
New Revision: 35742

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35742
Log:
Fixed get-orig-source target

Modified:
    packages/ng-spice-rework/trunk/debian/changelog
    packages/ng-spice-rework/trunk/debian/rules

Modified: packages/ng-spice-rework/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/changelog?rev=35742&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/changelog (original)
+++ packages/ng-spice-rework/trunk/debian/changelog Fri May 29 07:08:07 2009
@@ -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 @@
   * 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
 

Modified: packages/ng-spice-rework/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/rules?rev=35742&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/rules (original)
+++ packages/ng-spice-rework/trunk/debian/rules Fri May 29 07:08:07 2009
@@ -165,23 +165,23 @@
 
 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