news and changelog updates, roll minor version, revert license

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,38 @@
+2022-01-05  Dirk Eddelbuettel  <[email protected]>
+
+	* DESCRIPTION (Version, Date): Roll minor version
+
+	* README.md: Add Bryan to Authors here too
+	* inst/NEWS.md: Updated
+
+	* DESCRIPTION: Rever back to just GPL (>= 2)
+	* LICENSE: Idem
+
+2022-01-04  Bryan W. Lewis <[email protected]>
+
+	* man/redisMonitorChannels.Rd: Improved minimal example
+	* man/listen.Rd: Idem
+
+2022-01-03  Bryan W. Lewis <[email protected]>
+
+	* R/pubsub.R: Simplified yet improved direct pub/sub support
+	* src/Redis.cpp: Idem
+	* man/redisMonitorChannels.Rd: Idem
+	* man/listen.Rd: Idem
+
+	* src/init.c: Removed now unneeded more direct import from rredis
+	* src/libsock.c: Idem
+	* R/internal.R: Idem
+	* R/rredis-misc.R: Idem
+	* man/redisAuth.Rd: Idem
+	* man/redisClose.Rd: Idem
+	* man/redisCmd.Rd: Idem
+	* man/redisConnect.Rd: Idem
+	* man/redisPublish.Rd: Idem
+	* man/redisSubscribe.Rd: Idem
+	* man/redisUnsubscribe.Rd: Idem
+	* man/redisZAdd.Rd: Idem
+
 2021-12-31  Dirk Eddelbuettel  <[email protected]>
 
 	* src/libsock.c (_OPEN_FD, _SOCK_NAGLE): Register as symbols, but use

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: RcppRedis
 Type: Package
 Title: 'Rcpp' Bindings for 'Redis' using the 'hiredis' Library
-Version: 0.1.11.1
-Date: 2021-12-30
+Version: 0.1.11.2
+Date: 2022-01-05
 Author: Dirk Eddelbuettel and Bryan W. Lewis
 Maintainer: Dirk Eddelbuettel <[email protected]>
 Description: Connection to the 'Redis' key/value store using the
@@ -15,7 +15,7 @@ SystemRequirements: An available hiredis library (eg via package
  preferred but otherwise built on demand.
 URL: https://github.com/eddelbuettel/rcppredis, https://dirk.eddelbuettel.com/code/rcpp.redis.html
 BugReports: https://github.com/eddelbuettel/rcppredis/issues
-License: GPL-2 | GPL-3 | Apache License (>= 2)
+License: GPL (>= 2)
 Imports: methods, Rcpp (>= 0.11.0), RApiSerialize
 LinkingTo: Rcpp, RApiSerialize
 Suggests: RcppMsgPack, rredis, tinytest

LICENSE

@@ -1,49 +1,4 @@
 
-The RcppRedis package is released under the GNU GPL, Version 2 or later.
-
-This covers all files in the package, as well as the package
-aggregation, with the exception of the files listed explicitly below
-which were already licensed under the Apache License, Version 2.0, and
-continue to be licensed under the Apache License, Version 2.0.
-
-The files
-
-  R/pubsub.R
-  R/internal.R
-  R/rredis-misc.R: Idem
-  src/libsock.c
-  man/redisPublish.Rd
-  man/redisSubscribe.Rd
-  man/redisUnsubscribe.Rd
-  man/redisMonitorChannels.Rd
-  man/redisCmd.Rd
-  man/redisAuth.Rd
-  man/redisClose.Rd
-  man/redisConnect.Rd
-  man/redisZAdd.Rd
-  tests/pubsub.R
-
-are included from the rredis package, and have been licensed under the
-Apache License, Version 2, and remain under the Apache License.
-
-
-The typical Apache License, Version 2.0, statement follows.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-      https://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-
-The full text of the GNU GPL, Version 2, follows.
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 

README.md

@@ -52,10 +52,10 @@ This package was derived from an initial fork of an earlier attempt named
 ways. William Pleasant provided some early patches. Whit Armstrong and
 Russell Pierce contributed extensions.
 
-### Author
+### Authors
 
-Dirk Eddelbuettel, based on earlier work by Wush Wu and with contributions by
-William Pleasant, Russell Pierce and Whit Armstrong.
+Dirk Eddelbuettel and Bryan W. Lewis, based on earlier work by Wush Wu and
+with contributions by William Pleasant, Russell Pierce and Whit Armstrong.
 
 ### License
 

inst/NEWS.Rd

@@ -7,10 +7,8 @@
   \itemize{
     \item Two simple C++11 feature remove needs for \pkg{BH} and \code{lexical_cast()}
     (Dirk in \ghpr{45} addressing \ghit{44})
-    \item Redis pub/sub is now supported by importing the R functions
-    and C underpinning from \pkg{rredis} (Dirk in \ghpr{43})
-    \item Bryan Lewis is now a coauthor; the imported functions remain
-    licenced under the Apache License 2.0.
+    \item Redis pub/sub is now supported (Dirk in \ghpr{43}, Bryan in \ghpr{46})
+    \item Bryan Lewis is now a coauthor
   }
 }