[ngspice] 58/61: Reinsert adms. Problematic files have already been removed.

[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 9ce1a656d6ebdb571bcadb9d88406da8f008b6fd
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date:   Sat Nov 25 19:55:55 2017 +0000

    Reinsert adms. Problematic files have already been removed.
---
 debian/changelog | 1 -
 debian/rules     | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e0ff484..f6647aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,6 @@ ngspice (27-1) UNRELEASED; urgency=medium
   * 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
diff --git a/debian/rules b/debian/rules
index 7181952..36533b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,8 @@
 #!/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 @@ binary: binary-indep binary-arch
 
 #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; \

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