From cfcff8eb00e2ecc50e08d2745797f1b5047aed86 Mon Sep 17 00:00:00 2001 From: Daniel Ruiz de Alegría Date: Tue, 23 Jun 2020 21:24:58 +0200 Subject: Improve packaging scripts --- Makefile | 36 ++++++++++---------------------- deb/flat-remix/debian/changelog | 5 ----- deb/flat-remix/debian/changelog-template | 4 ---- deb/flat-remix/debian/compat | 1 - deb/flat-remix/debian/control | 22 ------------------- deb/flat-remix/debian/rules | 5 ----- debian/changelog | 4 ++++ debian/changelog-template | 4 ++++ debian/control | 22 +++++++++++++++++++ debian/rules | 5 +++++ 10 files changed, 46 insertions(+), 62 deletions(-) delete mode 100644 deb/flat-remix/debian/changelog delete mode 100644 deb/flat-remix/debian/changelog-template delete mode 100644 deb/flat-remix/debian/compat delete mode 100644 deb/flat-remix/debian/control delete mode 100755 deb/flat-remix/debian/rules create mode 100644 debian/changelog create mode 100644 debian/changelog-template create mode 100644 debian/control create mode 100755 debian/rules 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 +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 Thu, 26 Dec 2019 11:27:55 +0100 diff --git a/deb/flat-remix/debian/changelog-template b/deb/flat-remix/debian/changelog-template deleted file mode 100644 index de76f3f6a..000000000 --- a/deb/flat-remix/debian/changelog-template +++ /dev/null @@ -1,4 +0,0 @@ -flat-remix ({}) eoan; urgency=low - - * Release {} - 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/deb/flat-remix/debian/control b/deb/flat-remix/debian/control deleted file mode 100644 index b1771456e..000000000 --- a/deb/flat-remix/debian/control +++ /dev/null @@ -1,22 +0,0 @@ -Source: flat-remix -Section: misc -Priority: optional -Maintainer: Daniel Ruiz de Alegría -Build-Depends: debhelper (>= 9) -Homepage: https://drasite.com/flat-remix - -Package: flat-remix -Architecture: any -Description: Flat Remix ICON theme - Flat remix is a pretty simple icon theme inspired on material design following a modern design using "flat" colors with high contrasts and sharp borders. - . - Themes: - • Flat Remix: main theme - • Flat Remix Dark: for dark interfaces - • Flat Remix Light: for light interfaces - . - Folder variants: - • Blue Folders - • Green Folders - • Red Folders - • Yellow Folders diff --git a/deb/flat-remix/debian/rules b/deb/flat-remix/debian/rules deleted file mode 100755 index abde6ef22..000000000 --- a/deb/flat-remix/debian/rules +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/make -f - -%: - dh $@ - 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/debian/changelog-template b/debian/changelog-template new file mode 100644 index 000000000..de76f3f6a --- /dev/null +++ b/debian/changelog-template @@ -0,0 +1,4 @@ +flat-remix ({}) eoan; urgency=low + + * Release {} + diff --git a/debian/control b/debian/control new file mode 100644 index 000000000..9f989a11f --- /dev/null +++ b/debian/control @@ -0,0 +1,22 @@ +Source: flat-remix +Section: misc +Priority: optional +Maintainer: Daniel Ruiz de Alegría +Build-Depends: debhelper-compat (= 9) +Homepage: https://drasite.com/flat-remix + +Package: flat-remix +Architecture: any +Description: Flat Remix ICON theme + Flat remix is a pretty simple icon theme inspired on material design following a modern design using "flat" colors with high contrasts and sharp borders. + . + Themes: + • Flat Remix: main theme + • Flat Remix Dark: for dark interfaces + • Flat Remix Light: for light interfaces + . + Folder variants: + • Blue Folders + • Green Folders + • Red Folders + • Yellow Folders diff --git a/debian/rules b/debian/rules new file mode 100755 index 000000000..abde6ef22 --- /dev/null +++ b/debian/rules @@ -0,0 +1,5 @@ +#!/usr/bin/make -f + +%: + dh $@ + -- cgit v1.2.3