Run of lintian-fixes for gpsim

Try this locally (using the lintian-brush package):

debcheckout gpsim
cd gpsim
lintian-brush

Merge these changes:

git pull https://janitor.debian.net/git/gpsim lintian-fixes/main

Summary

Diff

diff --git a/debian/changelog b/debian/changelog
index ac499aa..ff01d4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gpsim (0.31.0-3) UNRELEASED; urgency=medium
+
+  * Trim trailing whitespace.
+  * Strip unusual field spacing from debian/control.
+  * Bump debhelper from old 11 to 12.
+  * Set debhelper-compat version in Build-Depends.
+  * Rely on pre-initialized dpkg-architecture variables.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Fri, 01 May 2020 22:05:14 +0000
+
 gpsim (0.31.0-2) unstable; urgency=medium
 
   * adopted Sl√°vek Banko's patch, thanks! Closes: #939338
@@ -101,7 +111,7 @@ gpsim (0.26.1-1.1) unstable; urgency=low
 
 gpsim (0.26.1-1) unstable; urgency=low
 
-  * upgraded to the newest upstream version. 
+  * upgraded to the newest upstream version.
     Closes: #646211
   * added chrysn's watch file. Closes: #646789
   * bumped Standards-Version to 3.9.2
@@ -119,7 +129,7 @@ gpsim (0.24-6) unstable; urgency=low
 
 gpsim (0.24-5) unstable; urgency=low
 
-  * patched the file configure.ac to add "-ldl" in X_LDFLAGS.Removed 
+  * patched the file configure.ac to add "-ldl" in X_LDFLAGS.Removed
     "-warn-once" from AM_LDFLAGS as binutils-gold does not know this flag.
     Closes: 554740
 
@@ -134,9 +144,9 @@ gpsim (0.24-4) unstable; urgency=low
 
 gpsim (0.24-3) unstable; urgency=low
 
-  * modified the configuration to remove the dependency on 
+  * modified the configuration to remove the dependency on
     libgtk+extra-x11-3.0-0. As a result, there is no more gui interface
-    for gpsim. However, the libraries featured by this build are 
+    for gpsim. However, the libraries featured by this build are
     sufficient for ktechlab, which provides a graphic interface.
 
  -- Georges Khaznadar <georgesk@ofset.org>  Mon, 15 Feb 2010 00:42:53 +0100
@@ -184,7 +194,7 @@ gpsim (0.22.0-5) unstable; urgency=medium
   * Remove some empty dirs under /usr/share/doc/gpsim/examples/
   * Remove code, which automatically adds the library extension to the
     file, in order to let people load the libraries without the
-    gpsim-dev package installed and document library loading in 
+    gpsim-dev package installed and document library loading in
     README.Debian (Closes: #475473)
 
  -- Steffen Joeris <white@debian.org>  Sun, 01 Jun 2008 09:30:49 +0000
@@ -239,7 +249,7 @@ gpsim (0.22.0~rc3-1) unstable; urgency=medium
    - Mainly a bugfix release
     Many thanks to the author Scott Dattalo for taking care of Debian
     release cycle and special thanks to Eamon Skelton for power testing
-   - Fix for the gui problem which was introduced with last upstream 
+   - Fix for the gui problem which was introduced with last upstream
      version
   * Drop the patches as they are now all included in upstream
   * Drop dpatch from build-depends and modify debian/rules file
@@ -256,7 +266,7 @@ gpsim (0.21.11-2) unstable; urgency=low
   * Include patch from upstream cvs to handle high level language
     debugging and more better pic support (30-picfix.dpatch)
   * Add lintian override for soname missmatch
-  
+
   * Upload sponsored by Morten Werner Olsen.
 
  -- Steffen Joeris <steffen.joeris@skolelinux.de>  Thu, 28 Sep 2006 18:20:03 +1000
@@ -272,7 +282,7 @@ gpsim (0.21.11-1) unstable; urgency=medium
   * Bump debhelper level to 5 and create debian/compat file
   * Add build-depends against dpatch
   * Change from dh_movefiles to dh_install
-  * Acknowledge several NMUs 
+  * Acknowledge several NMUs
   (Closes: #376445, #244126, #346347, #244126, #265766, #334155, #293660, #264351)
 
  -- Steffen Joeris <steffen.joeris@skolelinux.de>  Sun, 17 Sep 2006 00:32:18 +1000
@@ -352,7 +362,7 @@ gpsim (0.20.14-1) unstable; urgency=low
 
   * New upstream version (See README.Debian for 20.15 info)
   * Corrected return value in CCPRH::get()  (Closes: Bug#114453)
-  * Builds on ia64  (Closes: Bug#114460) 
+  * Builds on ia64  (Closes: Bug#114460)
     NOTE: new warnings forwarded to upstream
   * Correct description text  (Closes: Bug#124697)
   * Add automatic update of config.sub, config.guess (per autotools-dev doc)
@@ -361,7 +371,7 @@ gpsim (0.20.14-1) unstable; urgency=low
 
 gpsim (0.20.9-3.2) unstable; urgency=low
 
-  * Port NMU for hppa support (closes: Bug#120112) 
+  * Port NMU for hppa support (closes: Bug#120112)
 
  -- Randolph Chung <tausq@debian.org>  Thu, 17 Jan 2002 21:51:19 -0800
 
@@ -463,5 +473,3 @@ gpsim (0.20.1-1) unstable; urgency=low
   * Initial release.
 
  -- Joop Stakenborg <pa3aba@debian.org>  Sun,  6 Aug 2000 12:14:50 +0200
-
-
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 000dc37..7d61945 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: gpsim
 Section: electronics
 Priority: optional
 Maintainer: Georges Khaznadar <georgesk@debian.org>
-Build-Depends: debhelper (>= 11), libreadline-dev, libncurses5-dev,
+Build-Depends: debhelper-compat (= 12), libreadline-dev, libncurses5-dev,
  libpopt-dev, libglib2.0-dev, libtool, flex, automake, autotools-dev,
  libtool-bin, bison, chrpath, gputils, quilt, libgtkextra-dev, libgtk2.0-dev
 Standards-Version: 4.1.4
-Vcs-Browser:https://salsa.debian.org/georgesk/gpsim
+Vcs-Browser: https://salsa.debian.org/georgesk/gpsim
 Vcs-Git: https://salsa.debian.org/georgesk/gpsim.git
 
 Package: gpsim
@@ -17,19 +17,19 @@ Suggests: gpsim-led, gpsim-logic, gpsim-lcd, gpsim-doc
 Description: Simulator for Microchip's PIC microcontrollers
  Gpsim is a full-featured software simulator for Microchip PIC microcontrollers.
  .
- Gpsim has been designed to be as accurate as possible. Accuracy includes the 
- entire PIC - from the core to the I/O pins and including ALL of the internal 
+ Gpsim has been designed to be as accurate as possible. Accuracy includes the
+ entire PIC - from the core to the I/O pins and including ALL of the internal
  peripherals. Thus it's possible to create stimuli and tie them to the I/O pins
- and test the PIC the same PIC the same way you would in the real world. 
+ and test the PIC the same PIC the same way you would in the real world.
  .
- Gpsim has been designed to be as fast as possible. Real time simulation speeds 
+ Gpsim has been designed to be as fast as possible. Real time simulation speeds
  of 20Mhz PICs are possible.
  .
- Gpsim has been designed to be as useful as possible. The standard simulation 
- paradigm including breakpoints, single stepping, disassembling, memory inspect 
- & change, have been implemented. In addition, gpsim supports many debugging 
- features that are only available with in-circuit emulators. For example, a 
- continuous trace buffer tracks every action of the simulator. Also, it's 
+ Gpsim has been designed to be as useful as possible. The standard simulation
+ paradigm including breakpoints, single stepping, disassembling, memory inspect
+ & change, have been implemented. In addition, gpsim supports many debugging
+ features that are only available with in-circuit emulators. For example, a
+ continuous trace buffer tracks every action of the simulator. Also, it's
  possible to set read and write break points on values (e.g. break if a specific
  value is read from or written to a register).
 
diff --git a/debian/rules b/debian/rules
index 5a921a1..b61d851 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,7 @@
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+include /usr/share/dpkg/architecture.mk
 
 
 # GUI_SWITCH = --disable-gui

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in second set of .debs but not in first

-rw-r--r--  root/root   /usr/lib/debug/.dwz/x86_64-linux-gnu/gpsim.debug
-rw-r--r--  root/root   /usr/share/doc/gpsim/examples/instructions_12bit/instructions_12bit.asm
-rw-r--r--  root/root   /usr/share/doc/gpsim/examples/instructions_14bit/branching.asm
-rw-r--r--  root/root   /usr/share/doc/gpsim/examples/instructions_14bit/instructions_14bit.asm
-rw-r--r--  root/root   /usr/share/doc/gpsim/examples/instructions_16bit/instructions_16bit.asm

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/share/doc/gpsim/examples/instructions_12bit/instructions_12bit.asm.gz
-rw-r--r--  root/root   /usr/share/doc/gpsim/examples/instructions_14bit/branching.asm.gz
-rw-r--r--  root/root   /usr/share/doc/gpsim/examples/instructions_14bit/instructions_14bit.asm.gz
-rw-r--r--  root/root   /usr/share/doc/gpsim/examples/instructions_16bit/instructions_16bit.asm.gz

No differences were encountered between the control files of package gpsim

No differences were encountered between the control files of package gpsim-dbgsym

No differences were encountered between the control files of package gpsim-dev

Full worker log Full build log