# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1457880379 -7200
# Node ID 61a9d2de0e3eb66947b3bc01ce0e6203cf800dcd
# Parent  33b08a8b7fb169e2c11c617b27d3e542cd74970e
New home page. SF is used as mirror.

diff -r 33b08a8b7fb1 -r 61a9d2de0e3e CHANGES.rst
--- a/CHANGES.rst	Sun Mar 13 15:51:35 2016 +0200
+++ b/CHANGES.rst	Sun Mar 13 16:46:19 2016 +0200
@@ -12,6 +12,11 @@
 
 .. include:: VERSION.rst
 
+v0.7, 2016-03-13
+================
+
+ * New home page. SF is used as mirror.
+
 v0.6, 2015-10-13.
 =================
 
diff -r 33b08a8b7fb1 -r 61a9d2de0e3e HACKING.rst
--- a/HACKING.rst	Sun Mar 13 15:51:35 2016 +0200
+++ b/HACKING.rst	Sun Mar 13 16:46:19 2016 +0200
@@ -23,25 +23,26 @@
 Getting sources (VCS).
 ======================
 
-To clone repository run::
+Cloning repository::
 
+  $ hg clone http://hg.defun.work/gadict gadict
   $ hg clone http://hg.code.sf.net/p/gadict/code gadict-hg
 
-To push to repository you must have write permission and do::
-
-  $ hg push ssh://$USER@hg.code.sf.net/p/gadict/code
+Pushing changes::
 
-or::
-
-  $ hg clone https://$USER@hg.code.sf.net/p/gadict/code
+  $ hg push ssh://$USER@hg.defun.work/gadict
+  $ hg push ssh://$USER@hg.code.sf.net/p/gadict/code
+  $ hg push https://$USER:$PASS@hg.code.sf.net/p/gadict/code
 
 Browsing sources.
 =================
 
+  http://hg.defun.work/gadict
+    hgweb at home page.
   http://hg.code.sf.net/p/gadict/code
-                hgweb interface for official repository.
+    hgweb at old home page (but supported as mirror).
   https://sourceforge.net/p/gadict/code/
-                Sourceforge Allure interface for official repository.
+    Sourceforge Allure interface (not primary, a mirror).
 
 Dictionary source file format.
 ==============================
@@ -55,13 +56,12 @@
  * Headwords was preceded by 5 or more underscore characters ``_`` and a blank
    line.
  * All text until the next headword is considered the definition.
- * Any leading ``@`` characters are stripped out, but the file is
-   otherwise unchanged.
+ * Any leading ``@`` characters are stripped out, but the file is otherwise
+   unchanged.
 
 For convenience also used such assumptions:
 
- * Headwords was separated by ``;<SPACE>`` (and all was placed on single
-   line).
+ * Headwords was separated by ``;<SPACE>`` (and all was placed on single line).
  * UTF-8 encoding was used.
  * Lines started with ``#`` striped out (comment syntax).
  * First line with ``ABOUT:`` used as description of dictionary.
diff -r 33b08a8b7fb1 -r 61a9d2de0e3e Makefile
--- a/Makefile	Sun Mar 13 15:51:35 2016 +0200
+++ b/Makefile	Sun Mar 13 16:46:19 2016 +0200
@@ -157,12 +157,36 @@
 ################################################################
 # Deploy targets.
 
-ifeq '' '$(SF_USER)'
-  SF_USER := gavenkoa
-endif
+.PHONY: deploy
+deploy: deploy2defun deploy2sf
+
+
+DEFUN_USER ?= user
+DEFUN_HG_SRV ?= hg.defun.work
+DEFUN_HG_DIR ?= /srv/hg/gadict
+DEFUN_WWW_SRV ?= defun.work
+DEFUN_WWW_DIR ?= /srv/www/gadict
+
+.PHONY: deploy2defun
+deploy2defun: deploy2defun-src deploy2defun-www
 
-.PHONY: deploy
-deploy: deploy2sf
+.PHONY: deploy2defun-src
+deploy2defun-src:
+	hg push ssh://$(DEFUN_USER)@$(DEFUN_HG_SRV)/$(DEFUN_HG_DIR) || [ $$? = 1 ]
+
+.PHONY: deploy2defun-www
+deploy2defun-www: $(RST_HTML_FILES)
+	( \
+echo 'cd $(DEFUN_WWW_DIR)'; \
+for f in $(RST_HTML_FILES); do \
+  echo "put $$f"; \
+  echo "chmod 644 $$f"; \
+done; \
+echo 'quit'; \
+) | sftp -b - $(DEFUN_USER)@$(DEFUN_WWW_SRV)
+
+
+SF_USER ?= gavenkoa
 
 # First time you deploy to SourceForge (sf) you need manually login to:
 #   $ sftp $(SF_USER),$(pkgname)@web.sourceforge.net
@@ -170,15 +194,15 @@
 # Next time any action fully automated.
 
 .PHONY: deploy2sf
-deploy2sf: deploy2sf-src deploy2sf-doc deploy2sf-voa deploy2sf-release
+deploy2sf: deploy2sf-src deploy2sf-www deploy2sf-voa deploy2sf-release
 
 .PHONY: deploy2sf-src
 deploy2sf-src:
 	hg push ssh://$(SF_USER)@hg.code.sf.net/p/$(pkgname)/code || [ $$? = 1 ]
 
 # Will be accessed via http://$(pkgname).sourceforge.net
-.PHONY: deploy2sf-doc
-deploy2sf-doc: deploy-check $(RST_HTML_FILES)
+.PHONY: deploy2sf-www
+deploy2sf-www: deploy-check $(RST_HTML_FILES)
 	( echo 'cd htdocs'; \
 for f in $(RST_HTML_FILES); do \
   echo "put $$f"; \