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

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

Author: gudjon-guest
Date: Sat Nov 25 19:55:55 2017
New Revision: 47585

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47585
Log:
Reinsert adms. Problematic files have already been removed.

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=47585&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/changelog	(original)
+++ packages/ng-spice-rework/trunk/debian/changelog	Sat Nov 25 19:55:55 2017
@@ -3,7 +3,6 @@
   * Change standards version to 4.0.1, no changes needed
   * Add hardening +all
   * Change vcs browser field from http to https
-  * Remove adms from source, licensing issues
   * Fix copyright file
   * Add patch 03_fix_spelling
   * Change compat level to 9

Modified: packages/ng-spice-rework/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/rules?rev=47585&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/rules	(original)
+++ packages/ng-spice-rework/trunk/debian/rules	Sat Nov 25 19:55:55 2017
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
+
+include /usr/share/dpkg/pkg-info.mk
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -181,16 +183,14 @@
 
 #DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep '^Version:' | sed -e 's/Version: \(.*\)-\(.*\)\.*/\1/')
 get-orig-source:
-	VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-+~]+).*,\1,p'); \
 	set -e;\
+	VER=$(DEB_VERSION_UPSTREAM);\
 	wget -q http://sourceforge.net/projects/ngspice/files/ng-spice-rework/$$VER/ngspice-$$VER.tar.gz; \
 	tar xzf ngspice-$$VER.tar.gz --exclude=CVS --exclude=xgraph; \
 	rm -f ngspice-$$VER/config.sub ;\
 	rm -f ngspice-$$VER/config.guess ;\
 	rm -rf ngspice-$$VER/examples/TransImpedanceAmp ;\
 	rm -rf ngspice-$$VER/examples/tclspice\tcl-testbench3 ;\
-	rm -rf ngspice-$$VER/examples/adms
-	rm -rf ngspice-$$VER/src/spicelib/devices/adms
 	tar czf ngspice_$$VER.orig.tar.gz ngspice-$$VER; \
 	rm -f ngspice-$$VER.tar.gz; \
 	rm -rf ngspice-$$VER; \