[ngspice] 01/01: * Change standards version to 4.1.2, no changes needed * Remove elyxer from Build-Depends-Indep to allow for the removal of elyxer from Debian. The build in HTML export support in LyX improved during the last years and is equally usable or even better regarding new LyX file formats. * Add lintian overrides file

Gudjon I. Gudjonsson gudjon-guest at moszumanska.debian.org
Fri Dec 22 16:48:31 UTC 2017


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

gudjon-guest pushed a commit to branch master
in repository ngspice.

commit 829ba4d904e822137f48fb11adba52fcb5d17eb8
Author: Gudjon I. Gudjonsson <gudjon at fessender>
Date:   Fri Dec 22 17:43:24 2017 +0100

    * Change standards version to 4.1.2, no changes needed
    * Remove elyxer from Build-Depends-Indep to allow for the removal of elyxer
      from Debian. The build in HTML export support in LyX improved during the
      last years and is equally usable or even better regarding new LyX file
      formats.
    * Add lintian overrides file
---
 debian/changelog                     |   9 ++-
 debian/control                       |  42 +++++++++---
 debian/ngspice.lintian-overrides     |   2 +
 debian/patches/03_fix_spelling.patch | 126 ++++++++++++++++++++++++++++++++++-
 debian/rules                         |   1 +
 debian/tclspice.lintian-overrides    |   2 +
 6 files changed, 169 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3a0791f..2175e8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 ngspice (27-1) UNRELEASED; urgency=medium
 
   [ Gudjon I. Gudjonsson ]
-  * Change standards version to 4.0.1, no changes needed
+  * Change standards version to 4.1.2, no changes needed
   * Add hardening +all
   * Change vcs browser field from http to https
   * Fix copyright file
@@ -12,6 +12,13 @@ ngspice (27-1) UNRELEASED; urgency=medium
   * Moved packaging from SVN to Git
   * Priority: extra -> optional
 
+  [ Gudjon I. Gudjonsson ]
+  * Remove elyxer from Build-Depends-Indep to allow for the removal of elyxer
+    from Debian. The build in HTML export support in LyX improved during the
+    last years and is equally usable or even better regarding new LyX file
+    formats.
+  * Add lintian overrides file
+
  -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Mon, 28 Mar 2016 20:54:04 +0200
 
 ngspice (26-1.1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index eb05740..335abe5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,28 @@ Priority: optional
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Gudjon I. Gudjonsson <gudjon at gudjon.org>,
  Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 8), automake, libtool, libxaw7-dev, flex,
- bison, gfortran, libedit-dev, libncurses5-dev,
- texinfo, tcl8.6-dev, tcl8.6, tk8.6-dev, tk8.6, blt-dev
-Build-Depends-Indep: lyx, elyxer, texlive, texlive-latex-extra, texlive-lang-greek,
- texlive-generic-recommended, imagemagick
-Standards-Version: 4.0.1
+Build-Depends: debhelper (>= 8), 
+               automake, 
+               libtool, 
+               libxaw7-dev,
+               flex,
+               bison, 
+               gfortran, 
+               libedit-dev, 
+               libncurses5-dev,
+               texinfo, 
+               tcl8.6-dev, 
+               tcl8.6, 
+               tk8.6-dev, 
+               tk8.6, 
+               blt-dev
+Build-Depends-Indep: lyx, 
+                     texlive, 
+                     texlive-latex-extra, 
+                     texlive-lang-greek,
+                     texlive-generic-recommended, 
+                     imagemagick
+Standards-Version: 4.1.2
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/ngspice.git
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/ngspice.git
 Homepage: http://ngspice.sourceforge.net
@@ -17,7 +33,9 @@ XS-Autobuild: yes
 
 Package: ngspice
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, dpkg (>= 1.15.4) | install-info
+Depends: ${shlibs:Depends}, 
+         ${misc:Depends}, 
+         dpkg (>= 1.15.4) | install-info
 Description: Spice circuit simulator
  NGspice is a mixed-level/mixed-signal circuit simulator.
  Its code is based on three open source software packages:
@@ -28,7 +46,12 @@ Description: Spice circuit simulator
 
 Package: tclspice
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ngspice, blt, tcl8.6, tk8.6
+Depends: ${shlibs:Depends}, 
+         ${misc:Depends}, 
+         ngspice, 
+         blt, 
+         tcl8.6, 
+         tk8.6
 Replaces: tclspice-dev
 Breaks: tclspice-dev
 Description: NGspice library for Tcl
@@ -41,7 +64,8 @@ Description: NGspice library for Tcl
 Package: ngspice-doc
 Section: non-free/doc
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, 
+         ${misc:Depends}
 Description: Documentation for the NGspice circuit simulator
  NGspice is a mixed-level/mixed-signal circuit simulator.
  Its code is based on three open source software packages:
diff --git a/debian/ngspice.lintian-overrides b/debian/ngspice.lintian-overrides
new file mode 100644
index 0000000..9226a32
--- /dev/null
+++ b/debian/ngspice.lintian-overrides
@@ -0,0 +1,2 @@
+# Ngspice contains .cm files and I don't know how to strip them
+unstripped-binary-or-object
diff --git a/debian/patches/03_fix_spelling.patch b/debian/patches/03_fix_spelling.patch
index f8fa73a..b219aaa 100644
--- a/debian/patches/03_fix_spelling.patch
+++ b/debian/patches/03_fix_spelling.patch
@@ -1,7 +1,9 @@
 Fix minor spelling mistakes
---- a/src/spicelib/parser/inpdomod.c
-+++ b/src/spicelib/parser/inpdomod.c
-@@ -162,14 +162,14 @@
+Index: ngspice-27/src/spicelib/parser/inpdomod.c
+===================================================================
+--- ngspice-27.orig/src/spicelib/parser/inpdomod.c
++++ ngspice-27/src/spicelib/parser/inpdomod.c
+@@ -162,14 +162,14 @@ char *INPdomodel(CKTcircuit *ckt, card *
  					type = INPtypelook("MESA");
  					if (type < 0)
  					{
@@ -18,3 +20,121 @@ Fix minor spelling mistakes
  					}
  					break;
  				case 4:
+Index: ngspice-27/src/frontend/inpcom.c
+===================================================================
+--- ngspice-27.orig/src/frontend/inpcom.c
++++ ngspice-27/src/frontend/inpcom.c
+@@ -2935,7 +2935,7 @@ inp_get_func_from_line(struct function_e
+ 
+  Lerror:
+     // fixme, free()
+-    fprintf(stderr, "ERROR: faild to parse .func in: %s\n", orig_line);
++    fprintf(stderr, "ERROR: failed to parse .func in: %s\n", orig_line);
+     controlled_exit(EXIT_FAILURE);
+ }
+ 
+Index: ngspice-27/src/spicelib/devices/bsim3soi_pd/b3soipd.c
+===================================================================
+--- ngspice-27.orig/src/spicelib/devices/bsim3soi_pd/b3soipd.c
++++ ngspice-27/src/spicelib/devices/bsim3soi_pd/b3soipd.c
+@@ -280,7 +280,7 @@ IOP( "toxref", B3SOIPD_MOD_TOXREF, IF_RE
+ IOP( "ebg", B3SOIPD_MOD_EBG, IF_REAL, "effective bandgap in gate current calcula."),
+ IOP( "vevb", B3SOIPD_MOD_VEVB, IF_REAL, "Vaux parameter for valence-band electron tunneling"),
+ IOP( "alphagb1", B3SOIPD_MOD_ALPHAGB1, IF_REAL, "First Vox dependent parameter for gate curent in inversion"),
+-IOP( "betagb1", B3SOIPD_MOD_BETAGB1, IF_REAL, "Second Vox dependent parameter for gate currnt in inversion"),
++IOP( "betagb1", B3SOIPD_MOD_BETAGB1, IF_REAL, "Second Vox dependent parameter for gate current in inversion"),
+ IOP( "vgb1", B3SOIPD_MOD_VGB1, IF_REAL, "Third Vox dependent parameter for gate current in inversion"),
+ IOP( "vecb", B3SOIPD_MOD_VECB, IF_REAL, "Vaux parameter for conduction-band electron tunneling"),
+ IOP( "alphagb2", B3SOIPD_MOD_ALPHAGB2, IF_REAL, "First Vox dependent parameter for gate current in accumulation"),
+Index: ngspice-27/src/spicelib/devices/hisim2/hsm2set.c
+===================================================================
+--- ngspice-27.orig/src/spicelib/devices/hisim2/hsm2set.c
++++ ngspice-27/src/spicelib/devices/hisim2/hsm2set.c
+@@ -172,13 +172,13 @@ int HSM2setup(
+ 
+     if ( model->HSM2_codep_Given ) {
+       if( model->HSM2_codep != 0 && model->HSM2_codep != 1 ) {
+-        printf("warning(HiSIM): Invalid CODEP  (%d) was specified, resetted to 0.\n",model->HSM2_codep);
++        printf("warning(HiSIM): Invalid CODEP  (%d) was specified, reset to 0.\n",model->HSM2_codep);
+         model->HSM2_codep = 0 ;
+       }
+     }
+     if ( model->HSM2_coddlt_Given ) {
+       if( model->HSM2_coddlt != 0 && model->HSM2_coddlt != 1 ) {
+-        printf("warning(HiSIM): Invalid CODDLT (%d) was specified, resetted to 0.\n",model->HSM2_coddlt);
++        printf("warning(HiSIM): Invalid CODDLT (%d) was specified, reset to 0.\n",model->HSM2_coddlt);
+         model->HSM2_coddlt = 0 ;
+       }
+     }
+@@ -777,15 +777,15 @@ int HSM2setup(
+       RANGECHECK(model->HSM2_depleak,    0.0,   10.0,   "DEPLEAK" ) ;
+ 
+       if( model->HSM2_corecip )  {
+-        printf("warning(HiSIM): CORECIP is not supported yet in depletion mode MOSFET, resetted to 0.\n");
++        printf("warning(HiSIM): CORECIP is not supported yet in depletion mode MOSFET, reset to 0.\n");
+         model->HSM2_corecip = 0;
+       }
+       if( model->HSM2_copprv )  {
+-        printf("warning(HiSIM): COPPRV is not supported yet in depletion mode MOSFET, resetted to 0.\n");
++        printf("warning(HiSIM): COPPRV is not supported yet in depletion mode MOSFET, reset to 0.\n");
+         model->HSM2_copprv = 0;
+       }
+       if( model->HSM2_corsrd == 1 )  {
+-        printf("warning(HiSIM): CORSRD=1 is not supported yet in depletion mode MOSFET, resetted to -1.\n");
++        printf("warning(HiSIM): CORSRD=1 is not supported yet in depletion mode MOSFET, reset to -1.\n");
+         model->HSM2_corsrd = -1;
+       }
+       if( model->HSM2_coisti )  {
+Index: ngspice-27/src/spicelib/devices/hisimhv2/hsmhv2set.c
+===================================================================
+--- ngspice-27.orig/src/spicelib/devices/hisimhv2/hsmhv2set.c
++++ ngspice-27/src/spicelib/devices/hisimhv2/hsmhv2set.c
+@@ -145,7 +145,7 @@ int HSMHV2setup(
+         printf("HiSIM_HV(%s): 2.20 is selected for VERSION. (default) \n",model->HSMHV2modName);
+         model->HSMHV2_subversion = 2 ;
+       } else {
+-        printf("warning(HiSIM_HV(%s)): invalid version %s is specified, reseted 2.20 \n",
++        printf("warning(HiSIM_HV(%s)): invalid version %s is specified, reset 2.20 \n",
+         model->HSMHV2modName,model->HSMHV2_version);
+         model->HSMHV2_subversion = 2 ;
+       }
+@@ -188,7 +188,7 @@ int HSMHV2setup(
+     if ( !model->HSMHV2_codep_Given ) model->HSMHV2_codep = 0 ;
+     if ( model->HSMHV2_codep_Given ) {
+       if( model->HSMHV2_codep != 0 && model->HSMHV2_codep != 1 ) {
+-        printf("warning(HiSIM_HV(%s)): Invalid model parameter CODEP  (= %d) was specified, resetted to 0.\n",model->HSMHV2modName,model->HSMHV2_codep);
++        printf("warning(HiSIM_HV(%s)): Invalid model parameter CODEP  (= %d) was specified, reset to 0.\n",model->HSMHV2modName,model->HSMHV2_codep);
+         model->HSMHV2_codep = 0 ;
+       }
+     }
+@@ -196,7 +196,7 @@ int HSMHV2setup(
+     if ( !model->HSMHV2_coddlt_Given ) model->HSMHV2_coddlt = 1 ;
+     if ( model->HSMHV2_coddlt_Given ) {
+       if( model->HSMHV2_coddlt != 0 && model->HSMHV2_coddlt != 1 ) {
+-        printf("warning(HiSIM_HV(%s)): Invalid model parameter CODDLT  (= %d) was specified, resetted to 1.\n",model->HSMHV2modName,model->HSMHV2_coddlt);
++        printf("warning(HiSIM_HV(%s)): Invalid model parameter CODDLT  (= %d) was specified, reset to 1.\n",model->HSMHV2modName,model->HSMHV2_coddlt);
+         model->HSMHV2_coddlt = 1 ;
+       }
+     }
+@@ -1649,7 +1649,7 @@ do { if((here->ptr = SMPmakeElt(matrix,h
+     
+     if( model->HSMHV2_codep == 1 && model->HSMHV2_coerrrep ) {
+       if( model->HSMHV2_copprv == 1 ) {
+-        printf("warning(HiSIM_HV(%s)): COPPRV is not supported yet in Depletion mode mode, resetted to 0.\n",model->HSMHV2modName);
++        printf("warning(HiSIM_HV(%s)): COPPRV is not supported yet in Depletion mode mode, reset to 0.\n",model->HSMHV2modName);
+       }
+       if( model->HSMHV2_coisti == 1 ) { 
+         printf("warning(HiSIM_HV(%s)): STI leak model is not supported yet in Depletion mode model, skipped\n",model->HSMHV2modName);
+Index: ngspice-27/src/spicelib/devices/bsimsoi/b4soi.c
+===================================================================
+--- ngspice-27.orig/src/spicelib/devices/bsimsoi/b4soi.c
++++ ngspice-27/src/spicelib/devices/bsimsoi/b4soi.c
+@@ -490,7 +490,7 @@ IOP( "toxref", B4SOI_MOD_TOXREF, IF_REAL
+ IOP( "ebg", B4SOI_MOD_EBG, IF_REAL, "effective bandgap in gate current calcula."),
+ IOP( "vevb", B4SOI_MOD_VEVB, IF_REAL, "Vaux parameter for valence-band electron tunneling"),
+ IOP( "alphagb1", B4SOI_MOD_ALPHAGB1, IF_REAL, "First Vox dependent parameter for gate curent in inversion"),
+-IOP( "betagb1", B4SOI_MOD_BETAGB1, IF_REAL, "Second Vox dependent parameter for gate currnt in inversion"),
++IOP( "betagb1", B4SOI_MOD_BETAGB1, IF_REAL, "Second Vox dependent parameter for gate current in inversion"),
+ IOP( "vgb1", B4SOI_MOD_VGB1, IF_REAL, "Third Vox dependent parameter for gate current in inversion"),
+ IOP( "vecb", B4SOI_MOD_VECB, IF_REAL, "Vaux parameter for conduction-band electron tunneling"),
+ IOP( "alphagb2", B4SOI_MOD_ALPHAGB2, IF_REAL, "First Vox dependent parameter for gate current in accumulation"),
diff --git a/debian/rules b/debian/rules
index d41ade4..8067d0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -170,6 +170,7 @@ binary-arch: install-arch
 		"$(CURDIR)/debian/tclspice/usr/lib/tcltk/libspice.la"
 	dh_installman -a
 	dh_link -a
+	dh_lintian -a
 	dh_strip -a --exclude=.cm
 	dh_compress -a --exclude=.tcl --exclude=.cir
 	dh_fixperms -a
diff --git a/debian/tclspice.lintian-overrides b/debian/tclspice.lintian-overrides
new file mode 100644
index 0000000..9226a32
--- /dev/null
+++ b/debian/tclspice.lintian-overrides
@@ -0,0 +1,2 @@
+# Ngspice contains .cm files and I don't know how to strip them
+unstripped-binary-or-object

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



More information about the debian-science-commits mailing list