Juhuu

This reverts commit 3f1a71062a.

.drone.yml

@@ -15,8 +15,8 @@ pipeline:
     image: debian
     pull: true
     commands:
-      - apt update && apt install -y build-essential
-      - debuild -us -uc
+      - apt update && apt install -y build-essential fakeroot devscripts
+      - make package
       - ls -la
     when:
       event: tag

Makefile

@@ -1,12 +1,16 @@
 PKGNAME := mdg-test
 UPSTREAM_VERSION := 3.9.2
 PKG_SUB_RELEASE := 1.0
-PKG_FULL_VERSION := $(UPSTREAM_VERSION)-$(PKG_SUB_RELEASE)
 
 SOURCE := https://www.python.org/ftp/python/$(UPSTREAM_VERSION)/python-$(UPSTREAM_VERSION)-amd64.exe
 CHECKSUM := efb20aa1b648a2baddd949c142d6eb06
 ## Download Link and Checksums can be found on https://www.python.org/downloads/windows/
 
+#Automatically set variables
+PKG_FULL_VERSION := $(UPSTREAM_VERSION)-$(PKG_SUB_RELEASE)
+DEB_CHANGELOG_VERSION := $(shell dpkg-parsechangelog -S Version | sed -rne 's|((-*[^-]+)+)(-[^-]+)|\1|p')
+DEB_ORIG_FILE := $(PKGNAME)_$(PKG_FULL_VERSION).orig.tar.gz
+
 default: download
 
 all: | clean install
@@ -14,8 +18,8 @@ all: | clean install
 download: setversion
 	[ -d "data" ] || mkdir data
 	wget -nc -P data $(SOURCE)
-	echo "$(CHECKSUM) data/python-$(UPSTREAM_VERSION)-amd64.exe" | \
-	md5sum -c && echo "SUCCESS: Checksums match" || \
+	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
@@ -38,5 +42,18 @@ setversion:
 	-e "s/^packageVersion: [0-9]\{1,3\}\.[0-9]\{1,3\}$$/packageVersion: $(PKG_SUB_RELEASE)/" \
 	-i control
 
-.PHONY: default all download install uninstall clean setversion
+check-before-package:
+	@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
+
+package: check-before-package
+	tar cavzf ../mdg-test_3.9.2-1.0.orig.tar.gz --exclude="debian" --exclude="**/.*" .
+	debuild -us -uc --diff-ignore="\.\S+" -I
+
+
+.PHONY: default all download install uninstall clean setversion check-berfore-package package
 

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