[geany/geany-themes] 5b930a: Change THEMES_VERSION to match next Geany version

Matthew Brush git-noreply at xxxxx
Tue Jun 18 10:31:17 UTC 2013


Branch:      refs/heads/master
Author:      Matthew Brush <mbrush at codebrainz.ca>
Committer:   Matthew Brush <mbrush at codebrainz.ca>
Date:        Tue, 18 Jun 2013 10:31:17 UTC
Commit:      5b930a3bbd0289b6a29bff0656819efd4e8197d9
             https://github.com/geany/geany-themes/commit/5b930a3bbd0289b6a29bff0656819efd4e8197d9

Log Message:
-----------
Change THEMES_VERSION to match next Geany version

* Remove naive/stupid version mismatch tests on Geany version
* Reformat indentation a bit in Makefile


Modified Paths:
--------------
    Makefile

Modified: Makefile
18 files changed, 7 insertions(+), 11 deletions(-)
===================================================================
@@ -2,27 +2,23 @@
 # Makefile for geany-themes development
 #
 
-THEMES				= $(wildcard colorschemes/*.conf)
-COLORSCHEME_DIR		= ${HOME}/.config/geany/colorschemes
-UNINSTALL_THEMES	= $(addprefix $(COLORSCHEME_DIR)/, $(notdir $(THEMES)))
-GEANY_VERSION		= $(shell pkg-config --modversion geany 2>/dev/null)
-THEMES_VERSION		= 1.22.2
-MISMATCH_MESSAGE	= Warning: Possible wrong version of Geany installed
-ARCHIVE_NAME		= geany-themes-$(THEMES_VERSION).tar.bz2
-ARCHIVE_TEMP_DIR	= geany-themes-$(THEMES_VERSION)
+THEMES           = $(wildcard colorschemes/*.conf)
+COLORSCHEME_DIR  = ${HOME}/.config/geany/colorschemes
+UNINSTALL_THEMES = $(addprefix $(COLORSCHEME_DIR)/, $(notdir $(THEMES)))
+THEMES_VERSION   = 1.24
+MISMATCH_MESSAGE = Warning: Possible wrong version of Geany installed
+ARCHIVE_NAME     = geany-themes-$(THEMES_VERSION).tar.bz2
+ARCHIVE_TEMP_DIR = geany-themes-$(THEMES_VERSION)
 
 # dummy rule to handle default case, doesn't do anything useful
 all:
-	@test "$(GEANY_VERSION)" = "$(THEMES_VERSION)" || echo "$(MISMATCH_MESSAGE)"
 	@echo "Nothing to do, use \`make install' instead."
 
 install:
-	@test "$(GEANY_VERSION)" = "$(THEMES_VERSION)" || echo "$(MISMATCH_MESSAGE)"
 	mkdir -p $(COLORSCHEME_DIR)
 	install -m 0644 $(THEMES) "$(COLORSCHEME_DIR)"
 
 uninstall:
-	@test "$(GEANY_VERSION)" = "$(THEMES_VERSION)" || echo "** $(MISMATCH_MESSAGE)"
 	# NOTE: leave straggling directory ~/.config/geany/colorschemes this is for
 	# safety in case there's other stuff in there.
 	rm -f $(UNINSTALL_THEMES)



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Commits mailing list