Browse Source

Packaging cleanup

* Declare compliance with policy 4.7.0
* Rename patches, no changes
* Drop kfreebsd support. Sad to see you go.
* Drop unused symlink debian/vblade-generator
* Reformat files in debian/
Christoph Biedl 8 months ago
parent
commit
f4e05dce24

+ 2 - 3
debian/control

@@ -1,7 +1,7 @@
 Source: vblade
 Maintainer: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Homepage: https://github.com/OpenAoE/vblade
-Standards-Version: 4.5.1
+Standards-Version: 4.7.0
 Vcs-Browser: https://git.in-ulm.de/cbiedl/vblade
 Vcs-Git: https://git.in-ulm.de/cbiedl/vblade.git
 Build-Depends: debhelper-compat (= 13),
@@ -12,8 +12,7 @@ Section: admin
 
 Package: vblade
 Architecture: any
-Pre-Depends:
-    ${misc:Pre-Depends},
+Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends}, ${shlibs:Depends},
     systemd | daemon,
     systemd | sysvinit-utils,

debian/patches/local.hardening-build.patch → debian/patches/debian.hardening-build.patch


debian/patches/local.makefile-additional-commands.patch → debian/patches/debian.makefile-additional-commands.patch


debian/patches/local.vbladed-check-params.patch → debian/patches/debian.vbladed-check-params.patch


debian/patches/improve-init-scripts.patch → debian/patches/for-upstream.improve-init-scripts.patch


+ 4 - 4
debian/patches/series

@@ -2,9 +2,9 @@
 # cherry-picked from upstream
 
 # to be upstreamed
-improve-init-scripts.patch
+for-upstream.improve-init-scripts.patch
 
 # local modification
-local.makefile-additional-commands.patch
-local.vbladed-check-params.patch
-local.hardening-build.patch
+debian.makefile-additional-commands.patch
+debian.vbladed-check-params.patch
+debian.hardening-build.patch

+ 1 - 8
debian/rules

@@ -2,13 +2,6 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
-ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
-	PLATFORM=freebsd
-else
-	PLATFORM=linux
-endif
-
 %:
 	dh $@
 
@@ -19,7 +12,7 @@ override_dh_clean:
 	dh_clean
 
 override_dh_auto_build:
-	dh_auto_build --no-parallel -- PLATFORM=$(PLATFORM)
+	dh_auto_build --no-parallel -- PLATFORM=linux
 
 override_dh_auto_install:
 	$(MAKE) install prefix=debian/vblade/usr

+ 0 - 1
debian/vblade-generator

@@ -1 +0,0 @@
-../contrib/persistence/debian/vblade-generator

+ 2 - 2
debian/vblade.manpages

@@ -1,4 +1,4 @@
 
-vblade.8
-debian/vblade-persist-convert.8
 contrib/persistence/vblade-persistence.5
+debian/vblade-persist-convert.8
+vblade.8