Merge pull request #100 from Bandie/master

0.3.1 should be mentioned here
2018-12-04 19:52:35 +01:00 · 2018-12-04 19:51:09 +01:00 · 2018-12-03 22:57:30 +01:00 · 2018-12-03 22:55:38 +01:00 · 2018-12-03 22:35:04 +01:00 · 2018-12-03 22:32:32 +01:00
4 changed files with 5 additions and 6 deletions
--- a/3
+++ b/3
@ -1,9 +1,10 @@
-## [0.3.0]
+## [0.3.1]
 - pam_panic_config, a configuration generator
 - Translations for pam_panic_config
 - Timeouts when typing wrong passwords
 - Strict mode: Choose if you want to be locked out if the configuration is corrupt
 - Added translations: nl, pl
+- Build fix coming with this new release

 ## [0.2.5]
 - MBR support
--- a/configure.ac
+++ b/configure.ac
@ -1,6 +1,6 @@
 AC_INIT(
    [pam_panic],
-    [0.3.0],
+    [0.3.1],
    [https://github.com/pampanic/pam_panic/issues],
    [pam_panic])
 AC_CONFIG_AUX_DIR([build-aux])
--- a/src/pam_panic_config/Makefile.am
+++ b/src/pam_panic_config/Makefile.am
@ -2,7 +2,6 @@ SUBDIRS = applications icons/48x48 icons/64x64 icons/scalable
 bin_SCRIPTS = pam_panic_config

 %: %.prebuild.sh
-	make clean-local
 	{ sldr=$$(echo "$(SECUREDIR)" | $(SED) 's/\//\\\//g'); bdr=$$(echo "$(bindir)" | $(SED) 's/\//\\\//g'); version=$$(echo $(VERSION)); $(SED) "s/__SECURELIBDIR__/$$sldr/;s/__PAMPANICPW__/$$bdr\/pam_panic_pw/;s/__VERSION__/$$version/" $< > $@ ; }
 	chmod +x $@

--- a/src/pam_panic_config/icons/scalable/Makefile.am
+++ b/src/pam_panic_config/icons/scalable/Makefile.am
@ -1,6 +1,5 @@
 appicondir=$(datadir)/icons/hicolor/scalable/apps
 appicon_DATA=pampanic.svg
-pixmapsdir=$(datadir)/pixmaps

-install-exec-hook:
-	test -L $(pixmapsdir)/pampanic.svg && echo "Symlink exists" || { $(MKDIR_P) $(pixmapsdir) ; $(LN_S) $(appicondir)/pampanic.svg $(pixmapsdir)/pampanic.svg ; }
+pixmapdir=$(datadir)/pixmaps
+pixmap_DATA=pampanic.svg
Author	SHA1	Message	Date
Bandie	d8ac2428ff	Merge pull request #100 from Bandie/master 0.3.1 should be mentioned here	2018-12-04 19:52:35 +01:00
Bandie	88d48a15fd	0.3.1 should be mentioned here	2018-12-04 19:51:09 +01:00
Bandie	1ed20bc64d	Merge pull request #99 from Bandie/master autoconf, you are so great.	2018-12-03 22:57:30 +01:00
Bandie	7acdf617db	autoconf, you are so great.	2018-12-03 22:55:38 +01:00
Bandie	25e4fd6e8b	Merge pull request #98 from Bandie/master Missing prefix	2018-12-03 22:35:04 +01:00
Bandie	3b27a4c5a5	Missing prefix	2018-12-03 22:32:32 +01:00
Bandie	d6bf4530e2	Merge pull request #97 from Bandie/master Static install for icons since launchpad is making it hard	2018-12-03 22:14:00 +01:00
Bandie	b35e6d57ea	Static install for icons since launchpad is making it hard	2018-12-03 22:10:09 +01:00