The branch, build-baikal has been updated via 4f361e1f3d30ab853f8eb2461959dccac6efb732 (commit) from fe4408b12c982b81c56c52f37230865f4e9f41ea (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/control | 44 +++++------ debian/copyright | 148 +++++++++++++++++++++++++++++------- debian/rules | 20 ++--- debian/x2goclient.docs | 4 +- debian/x2goclient.install | 12 +-- debian/x2goclient.manpages | 1 - debian/x2goplugin-provider.dirs | 3 +- debian/x2goplugin-provider.docs | 1 + debian/x2goplugin-provider.install | 2 +- debian/x2goplugin-provider.links | 3 +- debian/x2goplugin.docs | 1 + 11 files changed, 166 insertions(+), 73 deletions(-) create mode 100644 debian/x2goplugin-provider.docs create mode 100644 debian/x2goplugin.docs The diff of changes is: diff --git a/debian/control b/debian/control index a2edf56..266f13a 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: x2goclient Section: x11 -Priority: optional +Priority: extra Maintainer: X2Go Developers <x2go-dev@lists.berlios.de> Uploaders: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, @@ -13,9 +13,8 @@ Build-Depends: libcups2-dev, libx11-dev, libxpm-dev, - doxygen, - man2html-base | man2html -Standards-Version: 3.9.3 + man2html-base | man2html, +Standards-Version: 3.9.4 Homepage: http://code.x2go.org/releases/source/x2goclient Vcs-Git: git://code.x2go.org/x2goclient.git Vcs-Browser: http://code.x2go.org/gitweb?p=x2goclient.git;a=summary @@ -27,28 +26,28 @@ Depends: ${misc:Depends}, libssh-4 (>= 0.4.7), openssh-client, - nxproxy + nxproxy, Recommends: openssh-server, - rdesktop | freerdp-x11 + rdesktop | freerdp-x11, Suggests: - pinentry-x2go + pinentry-x2go, Conflicts: - x2goclient-gtk + x2goclient-gtk, Replaces: - x2goclient-gtk + x2goclient-gtk, Description: X2Go Client application (Qt4) X2Go is a serverbased computing environment with - session resuming - low bandwidth support - LDAP support - - client side mass storage mounting support - - client side printing support + - client-side mass storage mounting support + - client-side printing support - audio support - authentication by smartcard and USB stick . x2goclient is a graphical client (Qt4) for the X2Go system. - You can use it to connect to running sessions and start new sessions. + You can use it to connect to running sessions and start new sessions. Package: x2goplugin Architecture: any @@ -56,41 +55,42 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, openssh-client, - nxproxy + nxproxy, Recommends: openssh-server, - rdesktop | freerdp-x11 + rdesktop | freerdp-x11, Suggests: - pinentry-x2go + pinentry-x2go, Description: X2Go Client (Qt4) as browser plugin X2Go is a serverbased computing environment with - session resuming - low bandwidth support - LDAP support - - client side mass storage mounting support - - client side printing support + - client-side mass storage mounting support + - client-side printing support - audio support - authentication by smartcard and USB stick . x2goclient is a graphical client (qt4) for the X2Go system. - You can use it to connect to running sessions and start new sessions. + You can use it to connect to running sessions and start new sessions. . - This package provides x2goclient as Mozilla plugin. + This package provides x2goclient as QtBrowser-based Mozilla plugin. Package: x2goplugin-provider Architecture: all Depends: ${misc:Depends}, - x2goplugin, Recommends: httpd | apache2, +Suggests: + x2goplugin, Description: Provide X2Go Plugin via Apache webserver X2Go is a serverbased computing environment with - session resuming - low bandwidth support - LDAP support - - client side mass storage mounting support - - client side printing support + - client-side mass storage mounting support + - client-side printing support - audio support - authentication by smartcard and USB stick . diff --git a/debian/copyright b/debian/copyright index 06180fc..b647261 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,31 +1,125 @@ -Upstream Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: x2goclient +Upstream-Contact: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +Source: http://wiki.x2go.org -Copyright (C) 2005-2012 X2Go Project - http://wiki.x2go.org +Files: * +Copyright: 2005-2012, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + 2005-2012, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> + 2005-2012, obviously nice - http://www.obviouslynice.de +License: GPL-2+ + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later + version. + . + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU General Public License for more + details. + . + You should have received a copy of the GNU General Public + License along with this package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. +Comment: + Quoting from README.OpenSSL-Exception... + . + * In addition, as a special exception, the copyright holders give + * permission to link the code of portions of this program with the + * OpenSSL library under certain conditions as described in each + * individual source file, and distribute linked combinations + * including the two. + * You must obey the GNU General Public License in all respects + * for all of the code used other than OpenSSL. If you modify + * file(s) with this exception, you may extend this exception to your + * version of the file(s), but you are not obligated to do so. If you + * do not wish to do so, delete this exception statement from your + * version. If you delete this exception statement from all source + * files in the program, then also delete it here. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. +Files: qtbrowserplugin-2.4_1-opensource/src/* +Copyright: 2009, Nokia Corporation and/or its subsidiary(-ies). +License: BSD-3-clause + Contact: Nokia Corporation (qt-info@nokia.com) + . + This file is part of a Qt Solutions component. + . + You may use this file under the terms of the BSD license as follows: + . + "Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor + the names of its contributors may be used to endorse or promote + products derived from this software without specific prior written + permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the -Free Software Foundation, Inc., -51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -Copyright (C) 2005-2012 Oleksandr Shneyder -oleksandr.shneyder@obviously-nice.de - -Copyright (C) 2005-2012 Heinz-Markus Graesing -heinz-m.graesing@obviously-nice.de - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. - -The Debian packaging is (C) 2005-2012 , Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> and -is licensed under the GPL, see above. +Files: Makefile.docupload +Copyright: 2010-2012, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +License: GPL-3 + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, version 3 of the License. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + . + On Debian systems, the full text of the GNU General Public + License version 3 can be found in the file + `/usr/share/common-licenses/GPL-3'. +Files: debian/* +Copyright: 2007, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + 2011-2012, Reinhard Tartler <siretart@tauware.de> + 2011-2013, Mike Gabriel <sunweaver@debian.org> +License: GPL-2+ + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later + version. + . + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU General Public License for more + details. + . + You should have received a copy of the GNU General Public + License along with this package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. diff --git a/debian/rules b/debian/rules index d82f357..2bbb30a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,16 +1,16 @@ #!/usr/bin/make -f +export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) +export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) +export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) +export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) + %: - dh $@ + dh $@ --parallel -override_dh_auto_build: - dh_auto_build - mkdir -p .build_doxygen/doxygen/html - mkdir -p .build_doxygen/man - doxygen +override_dh_auto_clean: + dh_auto_clean + # clean stray .qm files that are not handled by clean rule in upstream Makefile + rm -Rf x2goclient_*.qm override_dh_auto_install: - -override_dh_auto_clean: - rm -Rfv .build_doxygen - dh_auto_clean \ No newline at end of file diff --git a/debian/x2goclient.docs b/debian/x2goclient.docs index a742ef4..c52b905 100644 --- a/debian/x2goclient.docs +++ b/debian/x2goclient.docs @@ -1,4 +1,2 @@ -AUTHORS HOWTO.GPGCARD -.build_man2html/html -.build_doxygen/doxygen +debian/upstream/changelog diff --git a/debian/x2goclient.install b/debian/x2goclient.install index 8006f97..8a9b052 100644 --- a/debian/x2goclient.install +++ b/debian/x2goclient.install @@ -1,9 +1,9 @@ client_build/x2goclient usr/bin desktop/x2goclient.desktop usr/share/applications/ icons/x2goclient.xpm usr/share/x2goclient/icons/ -icons/128x128/x2goclient.png usr/share/x2goclient/icons/ -icons/128x128/x2gosession.png usr/share/x2goclient/icons/ -icons/128x128/x2goclient.png usr/share/icons/hicolor/128x128/apps/ -icons/16x16/x2goclient.png usr/share/icons/hicolor/16x16/apps/ -icons/64x64/x2goclient.png usr/share/icons/hicolor/64x64/apps/ -icons/32x32/x2goclient.png usr/share/icons/hicolor/32x32/apps/ +icons/128x128/x2goclient.png usr/share/x2goclient/icons/ +icons/128x128/x2gosession.png usr/share/x2goclient/icons/ +icons/128x128/x2goclient.png usr/share/icons/hicolor/128x128/apps/ +icons/16x16/x2goclient.png usr/share/icons/hicolor/16x16/apps/ +icons/64x64/x2goclient.png usr/share/icons/hicolor/64x64/apps/ +icons/32x32/x2goclient.png usr/share/icons/hicolor/32x32/apps/ diff --git a/debian/x2goclient.manpages b/debian/x2goclient.manpages index 50640ce..49fb64e 100644 --- a/debian/x2goclient.manpages +++ b/debian/x2goclient.manpages @@ -1,2 +1 @@ man/man1/x2goclient.1 -#.build_doxygen/man/man3/*.3 \ No newline at end of file diff --git a/debian/x2goplugin-provider.dirs b/debian/x2goplugin-provider.dirs index 9a0e712..b8f6dbe 100644 --- a/debian/x2goplugin-provider.dirs +++ b/debian/x2goplugin-provider.dirs @@ -1,3 +1,2 @@ -usr/share/x2go/plugin -etc/x2go +etc/x2go/plugin-provider etc/apache2/conf.d diff --git a/debian/x2goplugin-provider.docs b/debian/x2goplugin-provider.docs new file mode 100644 index 0000000..90699c6 --- /dev/null +++ b/debian/x2goplugin-provider.docs @@ -0,0 +1 @@ +debian/upstream/changelog diff --git a/debian/x2goplugin-provider.install b/debian/x2goplugin-provider.install index 84520e2..8e79131 100644 --- a/debian/x2goplugin-provider.install +++ b/debian/x2goplugin-provider.install @@ -1,2 +1,2 @@ provider/etc/x2goplugin-apache.conf etc/x2go/ -provider/share/x2goplugin.html usr/share/x2go/plugin/ +provider/share/x2goplugin.html etc/x2go/plugin-provider/ diff --git a/debian/x2goplugin-provider.links b/debian/x2goplugin-provider.links index 4ef7bf3..c4b78d5 100644 --- a/debian/x2goplugin-provider.links +++ b/debian/x2goplugin-provider.links @@ -1 +1,2 @@ -etc/x2go/x2goplugin-apache.conf etc/apache2/conf.d/x2goplugin.conf \ No newline at end of file +etc/x2go/x2goplugin-apache.conf etc/apache2/conf.d/x2goplugin.conf +etc/x2go/plugin-provider/x2goplugin.html usr/share/x2go/plugin/x2goplugin.html diff --git a/debian/x2goplugin.docs b/debian/x2goplugin.docs new file mode 100644 index 0000000..90699c6 --- /dev/null +++ b/debian/x2goplugin.docs @@ -0,0 +1 @@ +debian/upstream/changelog hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).