Skip to content

Commit

Permalink
Release 2.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Edwin Fine committed May 8, 2017
1 parent 35e21e4 commit 066d6c4
Show file tree
Hide file tree
Showing 7 changed files with 74 additions and 59 deletions.
18 changes: 17 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,20 @@ endif

all: vsn compile

# PKG_VERSION is based on the value in debian/changelog.
# Example: "2.0.3"
# This is what should be used for documentation versions.
#
# DCH_VERSION is the version that adds a timestamp and `git describe`
# value to the PKG_VERSION.
# Example: "2.0.3~rc3+0~20170420142017.108+jessie"
#
# This should be used to version scpf in the packaging system. That is,
# it should be the output of `dpkg -l scpf` once it is installed. The
# reason this numbering scheme is used is that it is Debian-compliant,
# and compares correctly when used with `dpkg --compare-versions`, so
# upgrades will be done correctly even if the base version numbers don't
# change.
include pkg.mk

ifeq ($(wildcard APP_VERSION),APP_VERSION)
Expand Down Expand Up @@ -69,6 +83,7 @@ profiles:
'{ok,C}=file:consult("rebar.config"),Ps=[P||{P,_}<-proplists:get_value(profiles,C)],io:format("Profiles: ~p~n",[Ps]),init:stop().'

info:
@echo PKG_VERSION=$(PKG_VERSION)
@echo APP_VERSION=$(APP_VERSION)
@echo MARKDOWN_PGM=$(call get_prog,MARKDOWN_PGM)
@echo DCH_COMMENT=$(DCH_COMMENT)
Expand Down Expand Up @@ -118,7 +133,8 @@ doc/man/scpf.1: doc/man/README doc/man/scpf.1.template
pandoc -t man -s \
--data-dir=$(CURDIR) \
--template doc/man/scpf.1.template \
--variable version="scpf $(APP_VERSION)" \
--variable version="scpf $(PKG_VERSION)" \
--variable date="$(shell date -u)" \
-o $@

clean: $(REBAR) docclean
Expand Down
4 changes: 2 additions & 2 deletions debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scpf (2.0.3~rc3) unstable; urgency=medium
scpf (2.0.3) stable; urgency=medium

* Version 2.0.3

Expand All @@ -18,7 +18,7 @@ scpf (2.0.3~rc3) unstable; urgency=medium
- Various other small improvements
* Fix recovery when connection is broken.

-- Edwin Fine <[email protected]> Thu, 20 Apr 2017 09:54:36 -0400
-- Edwin Fine <[email protected]> Sat, 22 Apr 2017 15:53:18 -0400

scpf (2.0.2) unstable; urgency=medium

Expand Down
100 changes: 50 additions & 50 deletions doc/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Copyright (c) 2016 Silent Circle

__Version:__ Apr 20 2017 10:04:32
__Version:__ 2.0.3+0~20170508160002.0.g35e21e4

__Authors:__ Edwin Fine ([`[email protected]`](mailto:[email protected])).

Expand Down Expand Up @@ -1079,53 +1079,53 @@ function url(tag) { var o=document.getElementById(tag); return o ? o.href : '#'+


<table width="100%" border="0" summary="list of modules">
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/apns_cert.md" class="module">apns_cert</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/apns_erlv3_app.md" class="module">apns_erlv3_app</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/apns_erlv3_session.md" class="module">apns_erlv3_session</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/apns_erlv3_session_sup.md" class="module">apns_erlv3_session_sup</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/apns_json.md" class="module">apns_json</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/apns_jwt.md" class="module">apns_jwt</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/apns_lib.md" class="module">apns_lib</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/apns_lib_http2.md" class="module">apns_lib_http2</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/apns_recs.md" class="module">apns_recs</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/apns_types.md" class="module">apns_types</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/gcm_erl.md" class="module">gcm_erl</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/gcm_erl_app.md" class="module">gcm_erl_app</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/gcm_erl_session.md" class="module">gcm_erl_session</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/gcm_erl_session_sup.md" class="module">gcm_erl_session_sup</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/gcm_erl_util.md" class="module">gcm_erl_util</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/gcm_json.md" class="module">gcm_json</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/gcm_req_sched.md" class="module">gcm_req_sched</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_config.md" class="module">sc_config</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_priority_queue.md" class="module">sc_priority_queue</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push.md" class="module">sc_push</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_app.md" class="module">sc_push_app</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_lib.md" class="module">sc_push_lib</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_lib_app.md" class="module">sc_push_lib_app</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_lib_sup.md" class="module">sc_push_lib_sup</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_reg_api.md" class="module">sc_push_reg_api</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_reg_db.md" class="module">sc_push_reg_db</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_reg_resource.md" class="module">sc_push_reg_resource</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_reg_wm_device.md" class="module">sc_push_reg_wm_device</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_reg_wm_service.md" class="module">sc_push_reg_wm_service</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_reg_wm_tag.md" class="module">sc_push_reg_wm_tag</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_req_mgr.md" class="module">sc_push_req_mgr</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_sup.md" class="module">sc_push_sup</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_svc_apnsv3.md" class="module">sc_push_svc_apnsv3</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_svc_gcm.md" class="module">sc_push_svc_gcm</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_svc_null.md" class="module">sc_push_svc_null</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_svc_null_srv.md" class="module">sc_push_svc_null_srv</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_top.md" class="module">sc_push_top</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_wm_common.md" class="module">sc_push_wm_common</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_wm_helper.md" class="module">sc_push_wm_helper</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_wm_send_device.md" class="module">sc_push_wm_send_device</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_wm_send_svc_appid_tok.md" class="module">sc_push_wm_send_svc_appid_tok</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_wm_send_svc_tok.md" class="module">sc_push_wm_send_svc_tok</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_wm_send_tag.md" class="module">sc_push_wm_send_tag</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_wm_sup.md" class="module">sc_push_wm_sup</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_push_wm_version.md" class="module">sc_push_wm_version</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_types.md" class="module">sc_types</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_util.md" class="module">sc_util</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_util_app.md" class="module">sc_util_app</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/fix/use-chatterbox-ets-tables/doc/sc_util_srv.md" class="module">sc_util_srv</a></td></tr></table>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/apns_cert.md" class="module">apns_cert</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/apns_erlv3_app.md" class="module">apns_erlv3_app</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/apns_erlv3_session.md" class="module">apns_erlv3_session</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/apns_erlv3_session_sup.md" class="module">apns_erlv3_session_sup</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/apns_json.md" class="module">apns_json</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/apns_jwt.md" class="module">apns_jwt</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/apns_lib.md" class="module">apns_lib</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/apns_lib_http2.md" class="module">apns_lib_http2</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/apns_recs.md" class="module">apns_recs</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/apns_types.md" class="module">apns_types</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/gcm_erl.md" class="module">gcm_erl</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/gcm_erl_app.md" class="module">gcm_erl_app</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/gcm_erl_session.md" class="module">gcm_erl_session</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/gcm_erl_session_sup.md" class="module">gcm_erl_session_sup</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/gcm_erl_util.md" class="module">gcm_erl_util</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/gcm_json.md" class="module">gcm_json</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/gcm_req_sched.md" class="module">gcm_req_sched</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_config.md" class="module">sc_config</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_priority_queue.md" class="module">sc_priority_queue</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push.md" class="module">sc_push</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_app.md" class="module">sc_push_app</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_lib.md" class="module">sc_push_lib</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_lib_app.md" class="module">sc_push_lib_app</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_lib_sup.md" class="module">sc_push_lib_sup</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_reg_api.md" class="module">sc_push_reg_api</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_reg_db.md" class="module">sc_push_reg_db</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_reg_resource.md" class="module">sc_push_reg_resource</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_reg_wm_device.md" class="module">sc_push_reg_wm_device</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_reg_wm_service.md" class="module">sc_push_reg_wm_service</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_reg_wm_tag.md" class="module">sc_push_reg_wm_tag</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_req_mgr.md" class="module">sc_push_req_mgr</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_sup.md" class="module">sc_push_sup</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_svc_apnsv3.md" class="module">sc_push_svc_apnsv3</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_svc_gcm.md" class="module">sc_push_svc_gcm</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_svc_null.md" class="module">sc_push_svc_null</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_svc_null_srv.md" class="module">sc_push_svc_null_srv</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_top.md" class="module">sc_push_top</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_wm_common.md" class="module">sc_push_wm_common</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_wm_helper.md" class="module">sc_push_wm_helper</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_wm_send_device.md" class="module">sc_push_wm_send_device</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_wm_send_svc_appid_tok.md" class="module">sc_push_wm_send_svc_appid_tok</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_wm_send_svc_tok.md" class="module">sc_push_wm_send_svc_tok</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_wm_send_tag.md" class="module">sc_push_wm_send_tag</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_wm_sup.md" class="module">sc_push_wm_sup</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_push_wm_version.md" class="module">sc_push_wm_version</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_types.md" class="module">sc_types</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_util.md" class="module">sc_util</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_util_app.md" class="module">sc_util_app</a></td></tr>
<tr><td><a href="http://github.com/SilentCircle/scpf/blob/master/doc/sc_util_srv.md" class="module">sc_util_srv</a></td></tr></table>

2 changes: 1 addition & 1 deletion doc/man/README
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
% SCPF User's Guide
% Edwin Fine
% July 11, 2016
% Mon May 8 15:03:55 UTC 2017

Synopsis
========
Expand Down
2 changes: 1 addition & 1 deletion doc/man/scpf.1
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH SCPF 1 "July 11, 2016" "scpf 2.0.3~rc3+0~20170420140423.0.g7a41b4a"
.TH SCPF 1 "Mon May 8 16:05:10 UTC 2017" "scpf 2.0.3"
.SH NAME
scpf - general push service provider written in Erlang.
.SH Synopsis
Expand Down
5 changes: 2 additions & 3 deletions rebar.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,11 @@
{apns_erl, ".*",
{git, "https://github.com/SilentCircle/apns_erl.git", {branch, "master"}}},
{apns_erlv3, ".*",
{git, "https://github.com/SilentCircle/apns_erlv3.git", {branch, "fix/use-chatterbox-ets-tables"}}},
{git, "https://github.com/SilentCircle/apns_erlv3.git", {branch, "master"}}},
{gcm_erl, ".*",
{git, "https://github.com/SilentCircle/gcm_erl.git", {branch, "master"}}},
{chatterbox, ".*",
%{git, "https://github.com/joedevivo/chatterbox.git", {branch, "master"}}},
{git, "https://github.com/SilentCircle/chatterbox.git", {branch, "feature/use-ets-tables"}}},
{git, "https://github.com/SilentCircle/chatterbox.git", {branch, "silentcircle/master"}}},
{edown, ".*",
{git, "https://github.com/uwiger/edown.git", {branch, "master"}}},
{goldrush, ".*",
Expand Down
2 changes: 1 addition & 1 deletion rebar.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
0},
{<<"chatterbox">>,
{git,"https://github.com/SilentCircle/chatterbox.git",
{ref,"747baae55b5d7a9958779d0ebf9ae85f83e57130"}},
{ref,"b035b14342e6c58bf7695612e3749473244f63c7"}},
0},
{<<"edown">>,
{git,"https://github.com/uwiger/edown.git",
Expand Down

0 comments on commit 066d6c4

Please sign in to comment.