You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2016/11/13 18:53:06 UTC

[1/4] incubator-guacamole-server git commit: GUACAMOLE-119: Do not include generated sources in source tarball.

Repository: incubator-guacamole-server
Updated Branches:
  refs/heads/master 7c3430ba0 -> 574bec859


GUACAMOLE-119: Do not include generated sources in source tarball.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/8fc4cc92
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/8fc4cc92
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/8fc4cc92

Branch: refs/heads/master
Commit: 8fc4cc928dcc55b8fd8a62ddad0b1ef427f0ca17
Parents: a46ce4c
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Nov 12 18:56:18 2016 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Nov 12 18:56:18 2016 -0800

----------------------------------------------------------------------
 src/protocols/rdp/Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/8fc4cc92/src/protocols/rdp/Makefile.am
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am
index 433da7b..0864fae 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                       \


[3/4] incubator-guacamole-server git commit: GUACAMOLE-119: Add Apache license boilerplate to manpage source.

Posted by jm...@apache.org.
GUACAMOLE-119: Add Apache license boilerplate to manpage source.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/4a299796
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/4a299796
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/4a299796

Branch: refs/heads/master
Commit: 4a29979667aad05fee8e362ef11cda6102d74ca6
Parents: cb93d42
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Nov 12 19:12:36 2016 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Nov 12 19:40:39 2016 -0800

----------------------------------------------------------------------
 src/guacd/man/guacd.8      | 18 ++++++++++++++++++
 src/guacd/man/guacd.conf.5 | 18 ++++++++++++++++++
 src/guacenc/man/guacenc.1  | 18 ++++++++++++++++++
 3 files changed, 54 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4a299796/src/guacd/man/guacd.8
----------------------------------------------------------------------
diff --git a/src/guacd/man/guacd.8 b/src/guacd/man/guacd.8
index 9e7d263..ba3a441 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

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4a299796/src/guacd/man/guacd.conf.5
----------------------------------------------------------------------
diff --git a/src/guacd/man/guacd.conf.5 b/src/guacd/man/guacd.conf.5
index 33e6e1d..65f2cbb 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

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4a299796/src/guacenc/man/guacenc.1
----------------------------------------------------------------------
diff --git a/src/guacenc/man/guacenc.1 b/src/guacenc/man/guacenc.1
index deeb807..fa4256a 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


[4/4] incubator-guacamole-server git commit: GUACAMOLE-119: Merge addition of missing liscense files and exclusion of generated source from source archive.

Posted by jm...@apache.org.
GUACAMOLE-119: Merge addition of missing liscense files and exclusion of generated source from source archive.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/574bec85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/574bec85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/574bec85

Branch: refs/heads/master
Commit: 574bec859a45a4a812ca07dfda53ef7e1f301b99
Parents: 7c3430b 4a29979
Author: James Muehlner <ja...@guac-dev.org>
Authored: Sun Nov 13 10:52:16 2016 -0800
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Sun Nov 13 10:52:16 2016 -0800

----------------------------------------------------------------------
 doc/Doxyfile                  | 18 ++++++++++++++++++
 src/guacd/man/guacd.8         | 18 ++++++++++++++++++
 src/guacd/man/guacd.conf.5    | 18 ++++++++++++++++++
 src/guacenc/man/guacenc.1     | 18 ++++++++++++++++++
 src/protocols/rdp/Makefile.am |  4 +++-
 5 files changed, 75 insertions(+), 1 deletion(-)
----------------------------------------------------------------------



[2/4] incubator-guacamole-server git commit: GUACAMOLE-119: Add Apache license boilerplate to Doxyfile.

Posted by jm...@apache.org.
GUACAMOLE-119: Add Apache license boilerplate to Doxyfile.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/cb93d42d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/cb93d42d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/cb93d42d

Branch: refs/heads/master
Commit: cb93d42deadf6af8051d395a9769ffc0fa0fab98
Parents: 8fc4cc9
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Nov 12 19:11:54 2016 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Nov 12 19:40:39 2016 -0800

----------------------------------------------------------------------
 doc/Doxyfile | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/cb93d42d/doc/Doxyfile
----------------------------------------------------------------------
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 0e9347a..d29d247 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