ci: add buildinfo and adjust incoming path

This reverts commit 3f1a71062a.

.drone.yml

@@ -1,23 +0,0 @@
-pipeline:
-  build:
-    image: debian
-    pull: true
-    commands:
-      - apt update && apt install -y make wget
-      - make
-      - ls -la
-      - make install
-      - ls -la
-    when:
-      event: [push, tag]
-
-  package:
-    image: debian
-    pull: true
-    commands:
-      - apt update && apt install -y build-essential
-      - debuild -us -uc
-      - ls -la
-      - cd .. && ls -la
-    when:
-      event: tag

.gitignore

@@ -1,5 +1,5 @@
 *.exe
-/data/
+/build/
 
 # ignore the debian stuff
 debhelper-build-stamp

.woodpecker.yml

@@ -0,0 +1,34 @@
+pipeline:
+  build_deb:
+    image: gitea.mdg-hamburg.de/ci-tools/deb-buildpackage:latest
+    pull: true
+    commands:
+      - make package
+      - ls ..
+      - dpkg -c ../*.deb
+    when:
+      event: [push, tag]
+
+  publish:
+    image: docker.io/plugins/sftp:linux-amd64
+    pull: true
+    settings:
+      host:
+        from_secret: deb_repo_ssh_host
+      port:
+        from_secret: deb_repo_ssh_port
+      username:
+        from_secret: deb_repo_ssh_username
+      password:
+        from_secret: deb_repo_ssh_password
+      files:
+        - ../*.deb
+        - ../*.dsc
+        - ../*.git
+        - ../*.changes
+        - ../*.buildinfo
+      destination_path: /var/www/repository/debian/incoming/input
+    when:
+      event: [tag]
+
+branches: master

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Kevin Dorner
+Copyright (c) 2022 Kevin Dorner
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,42 +1,51 @@
-PKGNAME := mdg-test
+PKG_NAME := mdg-test
-UPSTREAM_VERSION := 3.9.2
+PKG_VERSION := 3.9.2
-PKG_SUB_RELEASE := 1.0
+PKG_OPSI_RELEASE := 1.0
-PKG_FULL_VERSION := $(UPSTREAM_VERSION)-$(PKG_SUB_RELEASE)
+PKG_DEB_RELEASE := 1
 
-SOURCE := https://www.python.org/ftp/python/$(UPSTREAM_VERSION)/python-$(UPSTREAM_VERSION)-amd64.exe
+# sources and checksums can be found on https://www.python.org/downloads/windows/
+SOURCE_FILENAME := python-$(PKG_VERSION)-amd64.exe
+SOURCE := https://www.python.org/ftp/python/$(PKG_VERSION)/$(SOURCE_FILENAME)
 CHECKSUM := efb20aa1b648a2baddd949c142d6eb06
-## Download Link and Checksums can be found on https://www.python.org/downloads/windows/
 
-default: download
+default: fetch-sources patch-fields
 
-all: | clean install
+BUILDDIR := build
+$(BUILDDIR):
+	mkdir -p $(BUILDDIR)/data
 
-download: setversion
+fetch-sources: $(BUILDDIR)
-	[ -d "data" ] || mkdir data
+	curl -o $(BUILDDIR)/data/$(SOURCE_FILENAME) $(SOURCE)
-	wget -nc -P data $(SOURCE)
+	echo "$(CHECKSUM) $(BUILDDIR)/data/$(SOURCE_FILENAME)" | md5sum -c
-	echo "$(CHECKSUM) data/python-$(UPSTREAM_VERSION)-amd64.exe" | md5sum -c && \
-	echo "SUCCESS: Checksums match" || \
-	{ ec=$$?; echo "ERROR: Checksum mismatch" >&2; rm -rf data >&2; exit $$ec; }
 
-data: download
+patch-fields: $(BUILDDIR)
-
+	sed -e "s|@PKG_VERSION@|$(PKG_VERSION)|" \
-install: data
+	-e "s|@PKG_OPSI_RELEASE@|$(PKG_OPSI_RELEASE)|" \
-	install -Dm644 control -t $(DESTDIR)/srv/deploy/install/$(PKGNAME)
+	control.in > $(BUILDDIR)/control
-	install -Dm644 *.ins -t $(DESTDIR)/srv/deploy/install/$(PKGNAME)
-	install -Dm644 logo.png -t $(DESTDIR)/srv/deploy/install/$(PKGNAME)
-	install -Dm644 data/* -t $(DESTDIR)/srv/deploy/install/$(PKGNAME)/data
-	
-uninstall:
-	rm -rf $(DESTDIR)/srv/deploy/install/$(PKGNAME)
 
 clean:
-	rm -rf data
+	rm -rf $(BUILDDIR)
 
-setversion:
+install: $(BUILDDIR)
-	@echo "INFO: Writing version $(PKG_FULL_VERSION) to control file"
+	install -Dm644 $(BUILDDIR)/control -t $(DESTDIR)/srv/deploy/install/$(PKG_NAME)
-	sed -e "s/^version: [0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}$$/version: $(UPSTREAM_VERSION)/" \
+	install -Dm644 $(BUILDDIR)/data/* -t $(DESTDIR)/srv/deploy/install/$(PKG_NAME)/data
-	-e "s/^packageVersion: [0-9]\{1,3\}\.[0-9]\{1,3\}$$/packageVersion: $(PKG_SUB_RELEASE)/" \
+	install -Dm644 *.ins -t $(DESTDIR)/srv/deploy/install/$(PKG_NAME)
-	-i control
+	install -Dm644 logo.png -t $(DESTDIR)/srv/deploy/install/$(PKG_NAME)
+	
+uninstall:
+	rm -rf $(DESTDIR)/srv/deploy/install/$(PKG_NAME)
 
-.PHONY: default all download install uninstall clean setversion
+package:
+	dpkg-buildpackage --unsigned-source --unsigned-changes --no-check-builddeps
 
+# DEB_CHANGELOG_VERSION := $(shell dpkg-parsechangelog -S Version | sed -rne 's|((-*[^-]+)+)(-[^-]+)|\1|p')
+package-check-changelog:
+	@if [ "$(DEB_CHANGELOG_VERSION)" != "$(PKG_FULL_VERSION)" ]; then \
+		echo "Mismatch between debian changelog file and Makefile version"; \
+		echo "Debian changelog version: $(DEB_CHANGELOG_VERSION)"; \
+		echo "Makefile version: $(PKG_FULL_VERSION)"; \
+		exit 1; \
+	fi
+
+
+.PHONY: default fetch-sources patch-fields clean install uninstall package package-check-changelog

README.md

@@ -1,3 +1,4 @@
+![status-badge](https://drone.mdg-hamburg.de/api/badges/kevin.dorner/CI-Test/status.svg)
 # mdg-python
 A better Python for Windows OPSI package aimed to work with IServ
 

control.in

@@ -4,8 +4,8 @@ id: mdg-python
 name: MDG Python
 description: Python für Microsoft Windows mit pip-Unterstützung
 advice: Vereinfachtes Paket mit neuer Python-Version und funktionsfähiger pip-Unterstützung
-version: 3.9.2
+version: @PKG_VERSION@
-packageVersion: 1.0
+packageVersion: @PKG_OPSI_RELEASE@
 setupScript: install.ins
 uninstallScript: remove.ins
 

debian/changelog

@@ -1,4 +1,4 @@
-mdg-test (1.1.1-2.2-1) unstable; urgency=medium
+mdg-test (3.9.2-1.0-1) unstable; urgency=medium
 
   * Initial release. (Closes: #XXXXXX)
 

debian/control

@@ -8,7 +8,7 @@ Vcs-Git: https://gitea.mdg-hamburg.de/MDG-Packages/winst-mdg-python.git
 Vcs-Browser: https://gitea.mdg-hamburg.de/MDG-Packages/winst-mdg-python
 
 
-Package: winst-mdg-python
+Package: mdg-test
 Architecture: all
 Depends: winst-microsoft-windows-10-64
 Provides: winst-python

debian/files

@@ -1,2 +0,0 @@
-mdg-test_1.1.1-2.2-1_amd64.buildinfo misc optional
-winst-mdg-python_1.1.1-2.2-1_all.deb misc optional

debian/source/format

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

install.ins

@@ -53,6 +53,7 @@ endif
 
 [Files_Cleanup]
 ; This ensures all data has been removed
+; Leave previous versions for future removal
 delete -sf "%ProgramFiles64Dir%\python39\"
 
 [WinBatch_Setup]