bump version to 7.4-1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

.gitignore

@@ -1,7 +0,0 @@
-/*.build
-/*.buildinfo
-/*.changes
-/*.deb
-/*.dsc
-/*.tar*
-/proxmox-ve-*/

Makefile

@@ -4,48 +4,32 @@ PACKAGE=proxmox-ve
 
 GITVERSION:=$(shell git rev-parse HEAD)
 
-BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION)
-DSC=$(PACKAGE)_$(DEB_VERSION).dsc
+PVE_DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+PVE_HEADERS_DEB=pve-headers_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
 
-PVE_DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb
-PVE_HEADERS_DEB=pve-headers_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb
+BUILD_DIR=build
 
-DEBS=$(PVE_DEB) $(PVE_HEADERS_DEB)
+DEBS=${PVE_DEB} ${PVE_HEADERS_DEB}
 
 all: deb
-deb: $(DEBS)
+deb: ${DEBS}
 
-$(BUILDDIR): debian
-	rm -rf $@ $@.tmp
-	mkdir -p $@.tmp/debian
-	cp -a debian/ $@.tmp/
-	echo "git clone git://git.proxmox.com/git/proxmox-ve.git\\ngit checkout $(GITVERSION)" > $@.tmp/debian/SOURCE
-	mv $@.tmp $@
-
-$(PVE_HEADERS_DEB): $(PVE_DEB)
-$(PVE_DEB): $(BUILDDIR)
-	cd $(BUILDDIR); dpkg-buildpackage -b -uc -us
-	lintian $(DEBS)
-
-dsc: $(DSC)
-	$(MAKE) clean
-	$(MAKE) $(DSC)
-	lintian $(DSC)
-
-$(DSC): $(BUILDDIR)
-	cd $(BUILDDIR); dpkg-buildpackage -S -uc -us
-
-sbuild: $(DSC)
-	sbuild $(DSC)
+${PVE_HEADERS_DEB}: ${PVE_DEB}
+${PVE_DEB}: debian
+	rm -rf ${BUILD_DIR}
+	mkdir -p ${BUILD_DIR}/debian
+	cp -ar debian/* ${BUILD_DIR}/debian/
+	echo "git clone git://git.proxmox.com/git/proxmox-ve.git\\ngit checkout ${GITVERSION}" > ${BUILD_DIR}/debian/SOURCE
+	cd ${BUILD_DIR}; dpkg-buildpackage -b -uc -us
+	lintian ${DEBS}
 
 .PHONY: upload
-upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
-upload: $(DEBS)
-	tar cf - $(DEBS)|ssh repoman@repo.proxmox.com -- upload --product pve --dist $(UPLOAD_DIST)
+upload: ${DEBS}
+	tar cf - ${DEBS}|ssh repoman@repo.proxmox.com -- upload --product pve --dist bullseye --arch ${DEB_BUILD_ARCH}
 
 .PHONY: distclean
 distclean: clean
 
 .PHONY: clean
 clean:
-	rm -rf *~ $(PACKAGE)-[0-9]*/ $(PACKAGE)*.tar.* *.deb *.dsc *.changes *.build *.buildinfo
+	rm -rf *~ ${BUILD_DIR} *.deb *.dsc *.changes *.buildinfo

debian/changelog

@@ -1,54 +1,3 @@
-proxmox-ve (8.3.0) bookworm; urgency=medium
-
-  * bump for Proxmox VE 8.3
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 20 Nov 2024 11:42:06 +0100
-
-proxmox-ve (8.2.0) bookworm; urgency=medium
-
-  * drop postinst/rm scripts that managed the links to the current default
-    kernel for fallback use, this moved to the new separate meta package for
-    default-kernel
-
-  * add systemd-sys to depends to better encode that Proxmox VE only works
-    with systemd as PID1
-
-  * disable the apt hook, that ensures that Proxmox VE is not deinstalled by
-    accident due to some botched repository configuration from the user, when
-    the meta package is actually removed to avoid issues on purge.
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 17 Apr 2024 07:38:30 +0200
-
-proxmox-ve (8.1.0) bookworm; urgency=medium
-
-  * bump for Proxmox VE 8.1
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 23 Nov 2023 09:25:11 +0100
-
-proxmox-ve (8.0.2) bookworm; urgency=medium
-
-  * switch to new Proxmox kernel meta packages
-
-  * make pve-headers transitional to switch to proxmox-default-headers
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 01 Aug 2023 11:39:53 +0200
-
-proxmox-ve (8.0.1) bookworm; urgency=medium
-
-  * switch dependency over to proxmox-kernel-helper package (again)
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 12 Jun 2023 11:10:13 +0200
-
-proxmox-ve (8.0.0) bookworm; urgency=medium
-
-  * re-build for Proxmox VE 8 / Debian 12 Bookworm
-
-  * depene on Linux Kernel 6.2 by default
-
-  * switch to native versioning scheme
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 24 May 2023 20:06:19 +0200
-
 proxmox-ve (7.4-1) bullseye; urgency=medium
 
   * depend on proxmox-kernel-helper

debian/compat

@@ -0,0 +1 @@
+12

debian/control

@@ -2,24 +2,31 @@ Source: proxmox-ve
 Section: admin
 Priority: optional
 Maintainer: Proxmox Support Team <support@proxmox.com>
-Build-Depends: debhelper-compat (= 13), lintian,
-Standards-Version: 4.6.2
+Build-Depends: debhelper (>=12~),
+               lintian
+Standards-Version: 4.5.1
 Homepage: https://www.proxmox.com
 
 Package: proxmox-ve
 Architecture: all
-Provides: proxmox-virtual-environment,
+Provides: proxmox-virtual-environment
+Conflicts: proxmox-ve-3.10.0,
+           proxmox-virtual-environment,
+           pve-kernel
+Replaces: proxmox-ve-3.10.0,
+          proxmox-virtual-environment,
+          pve-kernel
 Depends: apt,
          openssh-client,
          openssh-server,
          proxmox-archive-keyring,
-         proxmox-default-kernel,
-         proxmox-kernel-helper (>= 8.0.3),
-         pve-manager (>= 8.0.4),
+         proxmox-kernel-helper,
+         pve-kernel-5.15,
+         pve-manager,
          pve-qemu-kvm,
          qemu-server,
-         systemd-sysv,
-         ${misc:Depends},
+         spiceterm,
+         vncterm
 Description: Proxmox Virtual Environment
  The Proxmox Virtual Environment is an easy to use Open Source
  virtualization platform for running Virtual Appliances and Virtual
@@ -28,8 +35,7 @@ Description: Proxmox Virtual Environment
 
 Package: pve-headers
 Architecture: all
-Depends: proxmox-default-headers, ${misc:Depends},
-Section: oldlibs
-Description: Default Proxmox Kernel Headers (transitional package)
- This is a dummy transitional package to transition to proxmox-default-headers.
- It can be safely removed.
+Depends: pve-headers-5.15
+Description: Default Proxmox VE Kernel Headers
+ This is a metapackage which will install the kernel headers for the
+ current default kernel.

debian/copyright

@@ -1,4 +1,4 @@
-Copyright (C) 2016 - 2024 Proxmox Server Solutions GmbH <support@proxmox.com>
+Copyright (C) 2016 - 2023 Proxmox Server Solutions GmbH <support@proxmox.com>
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Affero General Public License as

debian/postinst

@@ -0,0 +1,17 @@
+#! /bin/sh
+
+# Abort if any command returns an error value
+set -e
+
+case "$1" in
+  configure)
+    # setup kernel links for installation CD (rescue boot)
+    mkdir -p /boot/pve || true
+    ln -sf /boot/pve/vmlinuz-5.15 /boot/pve/vmlinuz || true
+    ln -sf /boot/pve/initrd.img-5.15 /boot/pve/initrd.img || true
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

debian/postrm

@@ -0,0 +1,20 @@
+#! /bin/sh
+
+# Abort if any command returns an error value
+set -e
+
+case "$1" in
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+	# remove kernel symlinks
+	rm -f /boot/pve/vmlinuz || true
+	rm -f /boot/pve/initrd.img || true
+	rmdir --ignore-fail-on-non-empty /boot/pve/ || true
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#

debian/proxmox-ve.postrm

@@ -1,35 +0,0 @@
-#! /bin/sh
-set -e
-
-hook=/etc/apt/apt.conf.d/10pveapthook
-
-case "$1" in
-    purge)
-        rm -f $hook.disabled
-        ;;
-
-    remove)
-        if test -f $hook; then
-            mv $hook $hook.disabled
-        fi
-        ;;
-
-    abort-install)
-        if test "x$2" != "x" && test -f $hook
-        then
-            mv $hook $hook.disabled
-        fi
-        ;;
-
-    upgrade|failed-upgrade|abort-upgrade|disappear)
-        ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-
-esac
-
-#DEBHELPER#
-
-exit 0

debian/proxmox-ve.preinst

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-hook=/etc/apt/apt.conf.d/10pveapthook
-if test -f $hook.disabled
-then
-    mv $hook.disabled $hook
-fi
-
-#DEBHELPER#
-
-exit 0

debian/rules

@@ -4,5 +4,25 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-%:
-	dh $@
+
+install:
+	dh_install
+	dh_installdocs
+	dh_lintian
+	dh_installchangelogs
+	dh_installman
+	dh_strip_nondeterminism
+	dh_compress
+	dh_fixperms
+
+binary: install
+	dh_strip
+	dh_makeshlibs
+	dh_shlibdeps
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+.PHONY: build clean
+build clean:

debian/source/format

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