Browse Source

Packaging cleanup

- Update debian/copyright
- Declare compliance with policy 3.9.8
- Refresh patch queue, add missing DEP-3 headers
- Bump debhelper compat level to 10
- Update package description
- Update VCS-* header
Christoph Biedl 4 years ago
parent
commit
01216477ff

+ 1 - 1
debian/compat

@@ -1 +1 @@
-9
+10

+ 10 - 9
debian/control

@@ -1,17 +1,18 @@
 Source: vblade
-Section: admin
-Priority: optional
 Maintainer: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9)
-Homepage: http://aoetools.sf.net
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/vblade.git
-Vcs-Git: git://anonscm.debian.org/collab-maint/vblade.git
+Homepage: https://github.com/OpenAoE/vblade
+Standards-Version: 3.9.8
+Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/vblade.git
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/vblade.git
+Build-Depends: debhelper (>= 10~),
+Priority: optional
+Section: admin
 
 Package: vblade
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: vblade-persist
+Depends: ${misc:Depends}, ${shlibs:Depends},
+Recommends:
+    vblade-persist,
 Description: virtual AoE blade emulator
  The vblade is the virtual EtherDrive (R) blade, a program that makes a
  seekable file available over an ethernet local area network (LAN) via

+ 6 - 5
debian/copyright

@@ -1,15 +1,16 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: vblade
-Source: http://sourceforge.net/projects/aoetools/files/vblade/
+Source: https://github.com/OpenAoE/vblade
 
 Files: *
 Copyright: 2005-2008 Ed Cashin <ecashin@coraid.com>
 License: GPL-2
 
-Files: debian/*
+Files:
+ debian/*
 Copyright:
-    2005-2015 David Martínez Moreno <ender@debian.org>
-    2016 Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+ 2005-2015 David Martínez Moreno <ender@debian.org>
+ 2016 Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 License: GPL-2
 
 License: GPL-2

+ 0 - 17
debian/patches/02_additional_cleaning.patch

@@ -1,17 +0,0 @@
-02_additional_cleaning.patch: Changes added for remaining files after 'clean' target.
-Index: vblade-20/makefile
-===================================================================
---- vblade-20.orig/makefile
-+++ vblade-20/makefile
-@@ -36,8 +36,11 @@ config.h : config/config.h.in makefile
- 
- clean :
- 	rm -f $O vblade
-+	rm -f config.h
- 
- install : vblade vbladed
-+	install -d ${sbindir}/
- 	install vblade ${sbindir}/
- 	install vbladed ${sbindir}/
-+	install -d ${mandir}/man8/
- 	install vblade.8 ${mandir}/man8/

+ 3 - 5
debian/patches/hardening_ldflags.patch

@@ -4,11 +4,9 @@ Author: David Martínez Moreno <ender@debian.org>
 Forwarded: no
 Last-Update: 2015-07-29
 
-Index: vblade/makefile
-===================================================================
---- vblade.orig/makefile
-+++ vblade/makefile
-@@ -13,19 +13,19 @@ CFLAGS += -Wall -g -O2
+--- a/makefile
++++ b/makefile
+@@ -13,19 +13,19 @@
  CC = gcc
  
  vblade: $O

+ 18 - 0
debian/patches/makefile-additional-cleaning.patch

@@ -0,0 +1,18 @@
+Subject: Changes added for remaining files after 'clean' target.
+Author: David Martínez Moreno <ender@debian.org> (presumably)
+Date: 2007-04-08
+
+--- a/makefile
++++ b/makefile
+@@ -36,8 +36,11 @@
+ 
+ clean :
+ 	rm -f $O vblade
++	rm -f config.h
+ 
+ install : vblade vbladed
++	install -d ${sbindir}/
+ 	install vblade ${sbindir}/
+ 	install vbladed ${sbindir}/
++	install -d ${mandir}/man8/
+ 	install vblade.8 ${mandir}/man8/

+ 8 - 6
debian/patches/01_no_hyphen_in_manpages.patch

@@ -1,9 +1,11 @@
-Added fixes for typical confusion hyphen <-> minus sign.
-Index: vblade/vblade.8
-===================================================================
---- vblade.orig/vblade.8
-+++ vblade/vblade.8
-@@ -35,39 +35,39 @@ The name of the regular file or block de
+Description: Added fixes for typical confusion hyphen <-> minus sign.
+Author: David Martínez Moreno <ender@debian.org> (presumably)
+Date: 2007-04-08
+Last-Update: 2015-07-29
+
+--- a/vblade.8
++++ b/vblade.8
+@@ -35,39 +35,39 @@
  .SS Options
  .TP
  \fB-b\fP

+ 4 - 4
debian/patches/series

@@ -1,4 +1,4 @@
-01_no_hyphen_in_manpages.patch
-02_additional_cleaning.patch
-03_vblade_usage.patch
-hardening_ldflags.patch
+manpage-escape-dash.patch
+makefile-additional-cleaning.patch
+vblade-check-params.patch
+hardening-build.patch

+ 8 - 6
debian/patches/03_vblade_usage.patch

@@ -1,9 +1,11 @@
-03_vblade_usage.patch: Used for avoiding calling vbladed without arguments,
-			and while at it, add the usage command line.
-Index: vblade/vbladed
-===================================================================
---- vblade.orig/vbladed
-+++ vblade/vbladed
+Subject: Used for avoiding calling vbladed without arguments,
+ and while at it, add the usage command line.
+Author: David Martínez Moreno <ender@debian.org>
+Date: 2005-10-28
+Last-Update: 2007-04-08
+
+--- a/vbladed
++++ b/vbladed
 @@ -3,4 +3,14 @@
  # output is directed to syslogd
  #

+ 2 - 5
debian/rules

@@ -1,13 +1,10 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
-
 DEB_BUILD_ARCH_OS  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
-  PLATFORM=freebsd
+	PLATFORM=freebsd
 else
-  PLATFORM=linux
+	PLATFORM=linux
 endif
 
 %:

+ 0 - 1
debian/vblade.dirs

@@ -1 +0,0 @@
-usr/sbin

+ 2 - 2
debian/vblade.install

@@ -1,2 +1,2 @@
-vblade      /usr/sbin
-vbladed     /usr/sbin
+vblade      usr/sbin/
+vbladed     usr/sbin/

+ 1 - 1
debian/vblade.links

@@ -1 +1 @@
-/usr/share/man/man8/vblade.8  /usr/share/man/man8/vbladed.8
+usr/share/man/man8/vblade.8 usr/share/man/man8/vbladed.8

+ 3 - 2
debian/watch

@@ -1,2 +1,3 @@
-version=3
-http://sf.net/aoetools/vblade-(.+)\.tar\.gz
+version=4
+https://github.com/OpenAoE/vblade/releases \
+    /OpenAoE/vblade/archive/[^/]+([0-9][.0-9]*)\.tar\.gz