84d95cbde27d — Duncan Ross Palmer 1 year, 2 months ago
Merge down default, with .hgsub fixes
5 files changed, 17 insertions(+), 4 deletions(-)

M .hgsub
M .hgsubstate
M .hgtags
M configure.ac
M debian/changelog
M .hgsub +2 -2
@@ 1,5 1,5 @@ 
 build-scripts = build-scripts
 
 [subpaths]
-ssh://hg@bitbucket.org/2E0EOL/libhoratio/build-scripts = ssh://hg@bitbucket.org/2E0EOL/build-scripts
-https://bitbucket.org/2E0EOL/libhoratio/build-scripts = https://bitbucket.org/2E0EOL/build-scripts
+ssh://hg@hg.sr.ht/~m6kvm/libhoratio/build-scripts = ssh://hg@hg.sr.ht/~m6kvm/build-scripts
+https://hg.sr.ht/~m6kvm/libhoratio/build-scripts = https://hg.sr.ht/~m6kvm/build-scripts

          
M .hgsubstate +1 -1
@@ 1,1 1,1 @@ 
-f9b54491b0a576fd79ba2d89f7eda4b8948c7533 build-scripts
+0000000000000000000000000000000000000000 build-scripts

          
M .hgtags +1 -0
@@ 15,3 15,4 @@ b6f442e3839f6eb95dd88720935e94422e7aa5ba
 ee8a4267295606c15c04b81e162cc69909555f43 dpcrtlmm-1.3.0
 6d874be0b03b63c117d5e29fc7361ba5d4d084bc dpcrtlmm-1.3.1
 5a774b1af37b517473a4fe121c9bbabc64135a82 libhoratio-2.0.0
+b0b91d638c35d218d303e09d1df2ac7e96d27ba8 libhoratio-2.0.1

          
M configure.ac +1 -1
@@ 33,7 33,7 @@ 
 #
 
 AC_PREREQ(2.59)
-AC_INIT([horatio],[2.0.1])
+AC_INIT([horatio],[2.0.2])
 AM_SILENT_RULES([yes])
 AC_CONFIG_SRCDIR([lib/horatio.c])
 AM_CONFIG_HEADER([config.h])

          
M debian/changelog +12 -0
@@ 1,3 1,15 @@ 
+libhoratio (2.0.2) stable; urgency=low
+
+  * 8d1d3fa884c7 (stable): Merged in f/201602-dynamic-version (pull request #9)
+  * 1eca97d7639d (stable): Fix build problem with mkverh.sh not being executable
+  * 9436c686d77f (stable): Missing inclusions of hversion.h
+  * c55d53ab5a30 (stable): Cherry pick and modify 33a46e4870ad from develop
+  * a927a697c9ae (stable): Merged default release (2.0.1) into stable
+  * 1c8a1c22d59c (stable): Start work on reducing number of deprecated calls warnings
+  * 86cc2e33e480 (stable): Make counters for all deprecated function calls
+
+ -- David Duncan Ross Palmer <palmer@overchat.org>  Mon, 14 Mar 2016 19:34:33 +0000
+
 libhoratio (2.0.1) stable; urgency=low
 
   * b49a666ee8b2 (default): Merge rel/2.0 (2.0.0 tag) into default release branch