diff -Nru adms-2.3.6/debian/adms.install adms-2.3.6/debian/adms.install --- adms-2.3.6/debian/adms.install 2019-03-30 09:20:53.000000000 +0000 +++ adms-2.3.6/debian/adms.install 2020-12-08 19:01:22.000000000 +0000 @@ -1 +1,2 @@ usr/bin/* +usr/include/adms/*.vams diff -Nru adms-2.3.6/debian/changelog adms-2.3.6/debian/changelog --- adms-2.3.6/debian/changelog 2019-03-30 09:20:53.000000000 +0000 +++ adms-2.3.6/debian/changelog 2020-12-08 19:08:31.000000000 +0000 @@ -1,3 +1,23 @@ +adms (2.3.6-3) unstable; urgency=medium + + * Team upload. + + [ Ruben Undheim ] + * debian/tests/*: Added autopkgtest + * debian/gitlab-ci.yml: + - Enable continuous integration on salsa + + [ Anton Gladky ] + * [6075017] Update watch file format version to 4. + * [8924bb9] Bump debhelper from old 11 to 12. + * [63e486a] Set debhelper-compat version in Build-Depends. + * [c7311e3] Drop unnecessary dependency on dh-autoreconf. + * [9c1d4b9] Remove obsolete field Name from debian/upstream/metadata + * [b1d524b] Apply cme fix dpkg + * Chris Lambs reprocibility patch (Closes: #926298) + + -- Anton Gladky Tue, 08 Dec 2020 20:08:31 +0100 + adms (2.3.6-2) unstable; urgency=high * debian/rules: diff -Nru adms-2.3.6/debian/compat adms-2.3.6/debian/compat --- adms-2.3.6/debian/compat 2019-03-30 09:20:53.000000000 +0000 +++ adms-2.3.6/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru adms-2.3.6/debian/control adms-2.3.6/debian/control --- adms-2.3.6/debian/control 2019-03-30 09:20:53.000000000 +0000 +++ adms-2.3.6/debian/control 2020-12-08 19:05:50.000000000 +0000 @@ -1,26 +1,27 @@ Source: adms -Section: science -Priority: optional Maintainer: Debian Science Maintainers Uploaders: Ruben Undheim , Bastien ROUCARIÈS , Felix Salfelder -Build-Depends: debhelper (>= 11), - bison, - flex, - libgd-perl, - libxml-parser-perl, - libxml-libxml-perl, - perl -Standards-Version: 4.2.1 -Homepage: https://github.com/Qucs/ADMS +Section: science +Priority: optional +Build-Depends: debhelper-compat (= 12), + bison, + flex, + libgd-perl, + libxml-parser-perl, + libxml-libxml-perl, + perl +Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/science-team/adms Vcs-Git: https://salsa.debian.org/science-team/adms.git +Homepage: https://github.com/Qucs/ADMS Package: adms Architecture: any Depends: libadms0 (= ${binary:Version}), - ${shlibs:Depends}, ${misc:Depends} + ${shlibs:Depends}, + ${misc:Depends} Description: Automatic device model synthesizer for Verilog-AMS ADMS is a code generator that converts electrical compact device models specified in high-level description language into @@ -30,11 +31,11 @@ Package: libadms0 Architecture: any +Multi-Arch: same Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} -Multi-Arch: same Description: Shared library for automatic device model synthesizer ADMS is a code generator that converts electrical compact device models specified in high-level description language into diff -Nru adms-2.3.6/debian/gitlab-ci.yml adms-2.3.6/debian/gitlab-ci.yml --- adms-2.3.6/debian/gitlab-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ adms-2.3.6/debian/gitlab-ci.yml 2020-05-03 20:12:52.000000000 +0000 @@ -0,0 +1,3 @@ +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -Nru adms-2.3.6/debian/libadms0.lintian-overrides adms-2.3.6/debian/libadms0.lintian-overrides --- adms-2.3.6/debian/libadms0.lintian-overrides 2019-03-30 09:20:53.000000000 +0000 +++ adms-2.3.6/debian/libadms0.lintian-overrides 2020-12-08 19:01:22.000000000 +0000 @@ -1,3 +1,3 @@ -# The SOVERSION for the three .so files "follow" each other so that one package -# contains all the three of them +# The SOVERSION for the four .so files "follow" each other so that one package +# contains all the four of them libadms0 binary: package-name-doesnt-match-sonames libadmsAdmstpath0 libadmsElement0 libadmsPreprocessor0 libadmsVeriloga0 diff -Nru adms-2.3.6/debian/patches/0002-fix-includepath.patch adms-2.3.6/debian/patches/0002-fix-includepath.patch --- adms-2.3.6/debian/patches/0002-fix-includepath.patch 1970-01-01 00:00:00.000000000 +0000 +++ adms-2.3.6/debian/patches/0002-fix-includepath.patch 2020-12-08 19:05:50.000000000 +0000 @@ -0,0 +1,37 @@ +Description: fix includepath + Date: Sat Oct 27 14:11:10 2018 +0100 + . + augment searchpath + . + admsXml used to drop headers in ${CWD}, and complain. + also it failed to look for headers in the right place. + . + (postpone disabling the header creation.) + . + diff --git a/admsXml/Makefile.am b/admsXml/Makefile.am + index f9cbbc3..d2e96c2 100644 +Author: Felix Salfelder +--- a/admsXml/Makefile.am ++++ b/admsXml/Makefile.am +@@ -50,6 +50,7 @@ bin_PROGRAMS=admsXml admsCheck + + admsXml_SOURCES=admsXml.c + admsXml_LDADD=-lm libadmsElement.la libadmsVeriloga.la libadmsPreprocessor.la libadmsAdmstpath.la ++admsXml_CPPFLAGS=${AM_CPPFLAGS} -DADMS_INCLUDEDIR=\"${pkgincludedir}\" + + admsXml.c: adms.implicit.xml.c + +diff --git a/admsXml/admsXml.c b/admsXml/admsXml.c +index a618dad..fa15213 100644 +--- a/admsXml/admsXml.c ++++ b/admsXml/admsXml.c +@@ -616,6 +616,9 @@ static void parseva (const int argc,const char** argv,char* myverilogamsfile) + adms_slist_push(&pproot()->skipp_text,(p_adms)(long)(0)); + pproot()->includePath=getlist_from_argv(argc,argv,"-I","directory"); + adms_slist_push(&pproot()->includePath,(p_adms)"."); ++#ifdef ADMS_INCLUDEDIR ++ adms_slist_push(&pproot()->includePath,(p_adms)ADMS_INCLUDEDIR); ++#endif + adms_preprocessor_get_define_from_argv(argc,argv); + adms_preprocessor_define_add_default("insideADMS"); + adms_message_verbose(("create temporary file %s\n",mytmpverilogamsfile)) diff -Nru adms-2.3.6/debian/patches/0003-reproduce.patch adms-2.3.6/debian/patches/0003-reproduce.patch --- adms-2.3.6/debian/patches/0003-reproduce.patch 1970-01-01 00:00:00.000000000 +0000 +++ adms-2.3.6/debian/patches/0003-reproduce.patch 2020-12-08 19:08:21.000000000 +0000 @@ -0,0 +1,27 @@ +Description: reproduce + diff --git a/admsXml/mkelements.pl b/admsXml/mkelements.pl + index 8e62a49..b3ae052 100644 +--- a/admsXml/mkelements.pl ++++ b/admsXml/mkelements.pl +@@ -1884,7 +1884,7 @@ () + } + push @Location03," ENDIFIDENT\n"; + } +-foreach(keys(%A)) ++foreach(sort keys(%A)) + { + my($aname,$ee)=($_,$A{$_}); + push @Location03," IFIDENT($aname)\n"; +diff --git a/admsXml/mkgrammar.pl b/admsXml/mkgrammar.pl +index 4a7ff06..9e3470b 100644 +--- a/admsXml/mkgrammar.pl ++++ b/admsXml/mkgrammar.pl +@@ -71,7 +71,7 @@ + die "bisonrule should terminate with ';' - see $_" if(not m/^\s+;$/); + } + } +-map {print OFH "\%token <_lexval> $_\n";} keys %Token; ++map {print OFH "\%token <_lexval> $_\n";} sort keys %Token; + print OFH "\n"; + map {print OFH "\%type <_yaccval> $_->{name}\n";} @allbisonrule; + print OFH "\n"; diff -Nru adms-2.3.6/debian/patches/series adms-2.3.6/debian/patches/series --- adms-2.3.6/debian/patches/series 2019-03-30 09:20:53.000000000 +0000 +++ adms-2.3.6/debian/patches/series 2020-12-08 19:08:08.000000000 +0000 @@ -1 +1,3 @@ 0001-Spelling-errors.patch +0002-fix-includepath.patch +0003-reproduce.patch diff -Nru adms-2.3.6/debian/rules adms-2.3.6/debian/rules --- adms-2.3.6/debian/rules 2019-03-30 09:20:53.000000000 +0000 +++ adms-2.3.6/debian/rules 2020-12-08 19:08:21.000000000 +0000 @@ -6,7 +6,7 @@ %: - dh $@ --with autoreconf --no-parallel + dh $@ --no-parallel override_dh_auto_configure: dh_auto_configure -- --enable-maintainer-mode diff -Nru adms-2.3.6/debian/tests/can-show-help adms-2.3.6/debian/tests/can-show-help --- adms-2.3.6/debian/tests/can-show-help 1970-01-01 00:00:00.000000000 +0000 +++ adms-2.3.6/debian/tests/can-show-help 2020-12-08 19:01:22.000000000 +0000 @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +admsXml -h + +admsCheck -h +echo "run: OK" diff -Nru adms-2.3.6/debian/tests/control adms-2.3.6/debian/tests/control --- adms-2.3.6/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ adms-2.3.6/debian/tests/control 2020-12-08 19:01:22.000000000 +0000 @@ -0,0 +1,2 @@ +Tests: can-show-help +Depends: adms diff -Nru adms-2.3.6/debian/upstream/metadata adms-2.3.6/debian/upstream/metadata --- adms-2.3.6/debian/upstream/metadata 2019-03-30 09:20:53.000000000 +0000 +++ adms-2.3.6/debian/upstream/metadata 2020-12-08 19:05:04.000000000 +0000 @@ -1,6 +1,5 @@ --- Bug-Database: https://github.com/Qucs/ADMS/issues Bug-Submit: https://github.com/Qucs/ADMS/issues/new -Name: ADMS Repository: https://github.com/Qucs/ADMS.git Repository-Browse: https://github.com/Qucs/ADMS diff -Nru adms-2.3.6/debian/watch adms-2.3.6/debian/watch --- adms-2.3.6/debian/watch 2019-03-30 09:20:53.000000000 +0000 +++ adms-2.3.6/debian/watch 2020-12-08 19:08:21.000000000 +0000 @@ -1,2 +1,2 @@ -version=3 +version=4 opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|[a-c])\d*)$/$1~$2/ https://github.com/Qucs/ADMS/releases /Qucs/ADMS/archive/release-(\d\S+)\.tar\.(?:bz2|gz|xz) debian uupdate