Fixed a number of lintians

5 files changed, 30 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index 36c25c0..d3c62f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xcircuit (3.9.73+dfsg.1-1) UNRELEASED; urgency=medium
 
-  * 
+  * New upstream release
+  * Adopted into the Debian Electronics team
 
- -- Ruben Undheim <ruben.undheim@gmail.com>  Sat, 20 Oct 2018 17:56:22 +0200
+ -- Ruben Undheim <rubund@debian.org>  Sat, 20 Oct 2018 17:56:22 +0200
 
 xcircuit (3.8.78.dfsg-1) unstable; urgency=medium
 
@@ -193,7 +194,7 @@ xcircuit (3.6.135.dfsg-1) unstable; urgency=high
     + Added watch file.
     + Removed deprecated build-deps (x-dev, xutils), added x11proto-core-dev
       instead.
-    + Fixed debian/rules so that config.sub and config.guess differences 
+    + Fixed debian/rules so that config.sub and config.guess differences
       aren't shipped.
   * Made debian/copyright a machine parsable file.
 
@@ -213,7 +214,7 @@ xcircuit (3.6.130.dfsg-1) unstable; urgency=low
       installed, and menus work as expected (Closes: #102640).
     + Fix the configure target so that it finds tcl correctly. This fixes
       some of the reported segfaults (Closes: #418631, #441893).
-  * Added debian/patches/fix_lib_files.dpatch, to be able to 
+  * Added debian/patches/fix_lib_files.dpatch, to be able to
     correctly install the files in /usr/share and /usr/lib.
   * Added debian/patches/fix_tk_version.dpatch, to allow the use of
     tcl/tk 8.5.2, which didn't work.
@@ -228,13 +229,13 @@ xcircuit (3.6.78.dfsg-1) unstable; urgency=low
   * New maintainer (Closes: #401609).
   * Migrated from cdbs to debhelper.
   * Repackaged original sources due to licensing problems of the asg module.
-  * Added extra menu entry for Apps/Technical (Closes: #128764) 
+  * Added extra menu entry for Apps/Technical (Closes: #128764)
 
  -- Margarita Manterola <marga@debian.org>  Wed,  6 Dec 2006 11:11:48 -0300
 
 xcircuit (3.6.24-1) unstable; urgency=low
 
-  * QA Upload 
+  * QA Upload
   * New Upstream Version (Closes: #266080, #262321)
   * Update debian/copyright
   * debian/{menu, install}:
@@ -355,7 +356,7 @@ xcircuit (2.5.5rev0-1) unstable; urgency=low
 
 xcircuit (2.5.3rev0-1) unstable; urgency=low
 
-  * New upstream release. 
+  * New upstream release.
 
  -- David Z Maze <dmaze@debian.org>  Sat,  5 Jan 2002 19:37:48 -0500
 
@@ -485,7 +486,7 @@ xcircuit (2.0b1-1) unstable; urgency=low
 
 xcircuit (2.0a11-1) unstable; urgency=low
 
-  * new upstream source: 
+  * new upstream source:
   *                 closes: #34966, #37019, #41834
 
  -- Dale Scheetz <dwarf@polaris.net>  Tue,  9 Nov 1999 18:33:45 -0500
diff --git a/debian/compat b/debian/compat
index ec63514..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11
diff --git a/debian/control b/debian/control
index 13a1d01..dd2d5e0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,22 @@
 Source: xcircuit
 Section: electronics
 Priority: extra
-Maintainer: Margarita Manterola <marga@debian.org>
-Uploaders: Roland Stigge <stigge@antcom.de>
-Build-Depends: libx11-dev, libxpm-dev, libxt-dev, x11proto-core-dev, m4, debhelper (>= 9), tcl-dev (>= 8.6.0+6), tk-dev (>= 8.6.0+6), autotools-dev, dpkg-dev (>= 1.16.0), chrpath, dh-autoreconf
-Standards-Version: 3.9.6
+Maintainer: Debian Electronics Team <pkg-electronics-devel@lists.alioth.debian.org>
+Uploaders: Ruben Undheim <rubund@debian.org>
+Build-Depends: debhelper (>= 11),
+               libx11-dev,
+               libxpm-dev,
+               libxt-dev,
+               x11proto-core-dev,
+               tcl-dev (>= 8.6.0+6),
+               tk-dev (>= 8.6.0+6),
+               chrpath
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/electronics-team/xcircuit
+Vcs-Git: https://salsa.debian.org/electronics-team/xcircuit.git
 Homepage: http://opencircuitdesign.com/xcircuit/
 
 Package: xcircuit
-Section: electronics
 Priority: optional
 Architecture: any
 Depends: wish, ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/copyright b/debian/copyright
index 2c6b75c..b7e470f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,6 +8,8 @@ Files-Excluded: asg
                 Xw/Makefile.in
                 spiceparser/Makefile
                 spiceparser/Makefile.in
+                config.status
+                spiceparser/example
 
 Files: *
 Copyright: 
diff --git a/debian/rules b/debian/rules
index 577e2fc..f76c26b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %: