Browse Source

Packaging cleanup

- Update debian/copyright
- Declare compliance with policy 3.9.8
- Switch to source format 3.0 (quilt)
- Bump debhelper compat level to 10
- Enable full hardening build
- Update watch file
Christoph Biedl 8 years ago
parent
commit
b12681fa02
7 changed files with 51 additions and 19 deletions
  1. 1 1
      debian/compat
  2. 8 7
      debian/control
  3. 37 10
      debian/copyright
  4. 3 0
      debian/rules
  5. 1 0
      debian/source/format
  6. 0 0
      debian/u3-tool.docs
  7. 1 1
      debian/watch

+ 1 - 1
debian/compat

@@ -1 +1 @@
-7
+10

+ 8 - 7
debian/control

@@ -1,14 +1,16 @@
 Source: u3-tool
 Source: u3-tool
-Section: utils
-Priority: optional
 Maintainer: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Maintainer: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Build-Depends: debhelper (>= 7.0.50~), libusb-dev, pkg-config
-Standards-Version: 3.8.3
-Homepage: http://u3-tool.sourceforge.net/
+Homepage: https://sourceforge.net/projects/u3-tool/
+Standards-Version: 3.9.8
+Build-Depends: debhelper (>= 10~),
+    libusb-dev,
+    pkg-config,
+Priority: optional
+Section: utils
 
 
 Package: u3-tool
 Package: u3-tool
 Architecture: alpha amd64 arm armel armhf i386 ia64 mipsel kfreebsd-amd64 kfreebsd-i386 hurd-i386
 Architecture: alpha amd64 arm armel armhf i386 ia64 mipsel kfreebsd-amd64 kfreebsd-i386 hurd-i386
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
 Description: tool for controlling the special features of a U3 USB flash disk
 Description: tool for controlling the special features of a U3 USB flash disk
  Tool for controlling USB flash devices that conform to the U3 specifications.
  Tool for controlling USB flash devices that conform to the U3 specifications.
  You can do the following with your U3 flash:
  You can do the following with your U3 flash:
@@ -17,4 +19,3 @@ Description: tool for controlling the special features of a U3 USB flash disk
   * Enable and disable security
   * Enable and disable security
   * Unlock and change the password of secured U3 device
   * Unlock and change the password of secured U3 device
   * Obtain various device information
   * Obtain various device information
-

+ 37 - 10
debian/copyright

@@ -1,25 +1,52 @@
-Format-Specification:
- http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=420
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: u3-tool
 Upstream-Name: u3-tool
-Upstream-Maintainer: Daviedev <daviedev@users.sourceforge.net>
-Upstream-Source: http://sourceforge.net/projects/u3-tool/
+Upstream-Contact: Daviedev <daviedev@users.sourceforge.net>
 
 
 Files: *
 Files: *
 Copyright: © 2007-2009 Daviedev <daviedev@users.sourceforge.net>
 Copyright: © 2007-2009 Daviedev <daviedev@users.sourceforge.net>
 License: GPL-2+
 License: GPL-2+
 
 
-Files: src/md5.{c,h}
+Files:
+ src/md5.c
+ src/md5.h
 Copyright: © 2006-2007 Christophe Devine
 Copyright: © 2006-2007 Christophe Devine
 License: LGPL-2.1
 License: LGPL-2.1
 
 
-Files: debian/*
+Files:
+ debian/*
 Copyright: © 2009 Evgeni Golov <sargentd@die-welt.net>
 Copyright: © 2009 Evgeni Golov <sargentd@die-welt.net>
 License: GPL-2+
 License: GPL-2+
 
 
 License: GPL-2+
 License: GPL-2+
- On Debian systems the full text of the GNU General Public License can be found
- in the `/usr/share/common-licenses/GPL' file.
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
 
 License: LGPL-2.1
 License: LGPL-2.1
- On Debian systems the full text of the GNU Lesser General Public License can
- be found in the `/usr/share/common-licenses/LGPL-2.1' file.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; version 2.1.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License along
+ with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License version 2.1 can be found in ‘/usr/share/common-licenses/LGPL-2.1’.

+ 3 - 0
debian/rules

@@ -1,3 +1,6 @@
 #!/usr/bin/make -f
 #!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 %:
 %:
 	dh $@
 	dh $@

+ 1 - 0
debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/docs → debian/u3-tool.docs


+ 1 - 1
debian/watch

@@ -1,2 +1,2 @@
 version=3
 version=3
-http://sf.net/u3-tool/u3-tool-([\d\.]+)\.tar\.gz
+https://qa.debian.org/watch/sf.php/u3-tool/u3-tool-([\d\.]+)\.tar\.gz