Improve packaging scripts

7 files changed, 16 insertions, 32 deletions

diff --git a/Makefile b/Makefile
index e1b4dc389..1688e4b25 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,8 @@
-# GNU make is required to run this file. To install on *BSD, run:
-#   gmake PREFIX=/usr/local install
-
-PREFIX ?= /usr
-IGNORE ?=
-THEMES ?= $(patsubst %/index.theme,%,$(wildcard ./*/index.theme))
 PKGNAME = flat-remix
 MAINTAINER = Daniel Ruiz de Alegría <daniel@drasite.com>
+PREFIX ?= /usr
+THEMES ?= $(patsubst %/index.theme,%,$(wildcard ./*/index.theme))
 
-# excludes IGNORE from THEMES list
-THEMES := $(filter-out $(IGNORE), $(THEMES))
 
 all:
 
@@ -57,7 +51,7 @@ release: _get_version
 	$(MAKE) generate_changelog VERSION=$(VERSION)
 	$(MAKE) aur_release VERSION=$(VERSION)
 	$(MAKE) copr_release VERSION=$(VERSION)
-	$(MAKE) launchpad_release
+	$(MAKE) launchpad_release VERSION=$(VERSION)
 	git tag -f $(VERSION)
 	git push origin --tags
 	$(MAKE) dist
@@ -77,17 +71,14 @@ copr_release: _get_version _get_tag
 	git push origin master
 
 launchpad_release: _get_version
-	cp -a Flat-Remix* Makefile deb/$(PKGNAME)
-	sed "s/{}/$(VERSION)/g" -i deb/$(PKGNAME)/debian/changelog-template
-	cd deb/$(PKGNAME)/debian/ && echo " -- $(MAINTAINER)  $$(date -R)" | cat changelog-template - > changelog
-	cd deb/$(PKGNAME) && debuild -S -d
-	dput ppa deb/$(PKGNAME)_$(VERSION)_source.changes
-	git checkout deb
-	git clean -df deb
-
-undo_release: _get_tag
-	-git tag -d $(TAG)
-	-git push --delete origin $(TAG)
+	rm -rf /tmp/$(PKGNAME)
+	mkdir -p /tmp/$(PKGNAME)/$(PKGNAME)_$(VERSION)
+	cp -a * /tmp/$(PKGNAME)/$(PKGNAME)_$(VERSION)
+	cd /tmp/$(PKGNAME)/$(PKGNAME)_$(VERSION) ; \
+	sed "s/{}/$(VERSION)/g" -i debian/changelog ; \
+	echo " -- $(MAINTAINER)  $$(date -R)" >> debian/changelog ; \
+	debuild -S -d ; \
+	dput ppa /tmp/$(PKGNAME)/$(PKGNAME)_$(VERSION)_source.changes
 
 generate_changelog: _get_version _get_tag
 	git checkout $(TAG) CHANGELOG
@@ -101,8 +92,3 @@ generate_changelog: _get_version _get_tag
 	git push origin HEAD
 
 .PHONY: all install $(THEMES) uninstall _get_version _get_tag dist release aur_release copr_release launchpad_release undo_release generate_changelog
-
-# .BEGIN is ignored by GNU make so we can use it as a guard
-.BEGIN:
-	@head -3 Makefile
-	@false
diff --git a/deb/flat-remix/debian/changelog b/deb/flat-remix/debian/changelog
deleted file mode 100644
index 6fe052c2f..000000000
--- a/deb/flat-remix/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-flat-remix (20191226) eoan; urgency=low
-
-  * Release 20191226
-
- -- Daniel Ruiz de Alegría <daniel@drasite.com>  Thu, 26 Dec 2019 11:27:55 +0100
diff --git a/deb/flat-remix/debian/compat b/deb/flat-remix/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/deb/flat-remix/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000000000..a0ea26783
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,4 @@
+flat-remix ({}) focal; urgency=low
+
+  * Release {}
+
diff --git a/deb/flat-remix/debian/changelog-template b/debian/changelog-template
index de76f3f6a..de76f3f6a 100644
--- a/deb/flat-remix/debian/changelog-template
+++ b/debian/changelog-template
diff --git a/deb/flat-remix/debian/control b/debian/control
index b1771456e..9f989a11f 100644
--- a/deb/flat-remix/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: flat-remix
 Section: misc
 Priority: optional
 Maintainer: Daniel Ruiz de Alegría <daniel@drasite.com>
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper-compat (= 9)
 Homepage: https://drasite.com/flat-remix
 
 Package: flat-remix
diff --git a/deb/flat-remix/debian/rules b/debian/rules
index abde6ef22..abde6ef22 100755
--- a/deb/flat-remix/debian/rules
+++ b/debian/rules