From 8fc4cc928dcc55b8fd8a62ddad0b1ef427f0ca17 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 12 Nov 2016 18:56:18 -0800 Subject: [PATCH 1/3] GUACAMOLE-119: Do not include generated sources in source tarball. --- src/protocols/rdp/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am index 433da7b4..0864faec 100644 --- a/src/protocols/rdp/Makefile.am +++ b/src/protocols/rdp/Makefile.am @@ -22,8 +22,10 @@ ACLOCAL_AMFLAGS = -I m4 lib_LTLIBRARIES = libguac-client-rdp.la +nodist_libguac_client_rdp_la_SOURCES = \ + _generated_keymaps.c + libguac_client_rdp_la_SOURCES = \ - _generated_keymaps.c \ audio_input.c \ client.c \ dvc.c \ From cb93d42deadf6af8051d395a9769ffc0fa0fab98 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 12 Nov 2016 19:11:54 -0800 Subject: [PATCH 2/3] GUACAMOLE-119: Add Apache license boilerplate to Doxyfile. --- doc/Doxyfile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/doc/Doxyfile b/doc/Doxyfile index 0e9347ab..d29d2472 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -1,3 +1,21 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# http://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. +# # # Project name / version From 4a29979667aad05fee8e362ef11cda6102d74ca6 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 12 Nov 2016 19:12:36 -0800 Subject: [PATCH 3/3] GUACAMOLE-119: Add Apache license boilerplate to manpage source. --- src/guacd/man/guacd.8 | 18 ++++++++++++++++++ src/guacd/man/guacd.conf.5 | 18 ++++++++++++++++++ src/guacenc/man/guacenc.1 | 18 ++++++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/src/guacd/man/guacd.8 b/src/guacd/man/guacd.8 index 9e7d263a..ba3a441d 100644 --- a/src/guacd/man/guacd.8 +++ b/src/guacd/man/guacd.8 @@ -1,3 +1,21 @@ +.\" +.\" Licensed to the Apache Software Foundation (ASF) under one +.\" or more contributor license agreements. See the NOTICE file +.\" distributed with this work for additional information +.\" regarding copyright ownership. The ASF licenses this file +.\" to you 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 +.\" +.\" http://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. +.\" .TH guacd 8 "25 Aug 2016" "version 0.9.10-incubating" "Guacamole" . .SH NAME diff --git a/src/guacd/man/guacd.conf.5 b/src/guacd/man/guacd.conf.5 index 33e6e1df..65f2cbbe 100644 --- a/src/guacd/man/guacd.conf.5 +++ b/src/guacd/man/guacd.conf.5 @@ -1,3 +1,21 @@ +.\" +.\" Licensed to the Apache Software Foundation (ASF) under one +.\" or more contributor license agreements. See the NOTICE file +.\" distributed with this work for additional information +.\" regarding copyright ownership. The ASF licenses this file +.\" to you 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 +.\" +.\" http://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. +.\" .TH guacd.conf 5 "25 Aug 2016" "version 0.9.10-incubating" "Guacamole" . .SH NAME diff --git a/src/guacenc/man/guacenc.1 b/src/guacenc/man/guacenc.1 index deeb8078..fa4256ac 100644 --- a/src/guacenc/man/guacenc.1 +++ b/src/guacenc/man/guacenc.1 @@ -1,3 +1,21 @@ +.\" +.\" Licensed to the Apache Software Foundation (ASF) under one +.\" or more contributor license agreements. See the NOTICE file +.\" distributed with this work for additional information +.\" regarding copyright ownership. The ASF licenses this file +.\" to you 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 +.\" +.\" http://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. +.\" .TH guacenc 1 "25 Aug 2016" "version 0.9.10-incubating" "Guacamole" . .SH NAME