[X2Go-Commits] x2goclient2.git - master (branch) updated: 8f281453d5c9c589330c4e65e58235d0b0d717fa

X2Go dev team git-admin at x2go.org
Sat Jun 8 00:24:14 CEST 2013


The branch, master has been updated
       via  8f281453d5c9c589330c4e65e58235d0b0d717fa (commit)
      from  48611f11e64cd0a26dbd92483c522b711068d0d1 (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 -----------------------------------------------------------------
commit 8f281453d5c9c589330c4e65e58235d0b0d717fa
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Jun 8 00:23:27 2013 +0200

    add /debian folder, avoid later packaging/file conflicts with x2goclient1

-----------------------------------------------------------------------

Summary of changes:
 Makefile                                          |  119 +++++++++++++++++++++
 debian/changelog                                  |    6 ++
 debian/compat                                     |    1 +
 debian/control                                    |   50 +++++++++
 debian/copyright                                  |   68 ++++++++++++
 debian/menu                                       |    6 ++
 debian/rules                                      |   16 +++
 debian/source/format                              |    1 +
 debian/x2goclient2.dirs                           |    9 ++
 debian/x2goclient2.install                        |    9 ++
 desktop/x2goclient2.desktop                       |   12 +++
 icons/128x128/{x2goclient.png => x2goclient2.png} |  Bin 3502 -> 3502 bytes
 icons/16x16/{x2goclient.png => x2goclient2.png}   |  Bin 518 -> 518 bytes
 icons/32x32/{x2goclient.png => x2goclient2.png}   |  Bin 1212 -> 1212 bytes
 icons/64x64/{x2goclient.png => x2goclient2.png}   |  Bin 1909 -> 1909 bytes
 icons/{x2goclient.xpm => x2goclient2.xpm}         |    0
 resources.qrc                                     |    2 +-
 17 files changed, 298 insertions(+), 1 deletion(-)
 create mode 100755 Makefile
 create mode 100644 debian/changelog
 create mode 100644 debian/compat
 create mode 100644 debian/control
 create mode 100644 debian/copyright
 create mode 100644 debian/menu
 create mode 100755 debian/rules
 create mode 100644 debian/source/format
 create mode 100644 debian/x2goclient2.dirs
 create mode 100644 debian/x2goclient2.install
 create mode 100644 desktop/x2goclient2.desktop
 rename icons/128x128/{x2goclient.png => x2goclient2.png} (100%)
 rename icons/16x16/{x2goclient.png => x2goclient2.png} (100%)
 rename icons/32x32/{x2goclient.png => x2goclient2.png} (100%)
 rename icons/64x64/{x2goclient.png => x2goclient2.png} (100%)
 rename icons/{x2goclient.xpm => x2goclient2.xpm} (100%)

The diff of changes is:
diff --git a/Makefile b/Makefile
new file mode 100755
index 0000000..de096f8
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,119 @@
+#!/usr/bin/make -f
+
+SRC_DIR=$(CURDIR)
+CLIENT_DIR=$(SRC_DIR)/client_build
+CLIENT_BINARY=$(CLIENT_DIR)/x2goclient2
+
+#PLUGIN_DIR=$(SRC_DIR)/plugin_build
+#PLUGIN_BINARY=$(PLUGIN_DIR)/libx2goplugin.so
+
+SHELL=/bin/bash
+
+INSTALL_DIR=install -d -o root -g root -m 755
+INSTALL_FILE=install -o root -g root -m 644
+INSTALL_PROGRAM=install -o root -g root -m 755
+
+RM_FILE=rm -f
+RM_DIR=rmdir -p --ignore-fail-on-non-empty
+
+DESTDIR=
+PREFIX=/usr/local
+BINDIR=$(PREFIX)/bin
+SHAREDIR=$(PREFIX)/share
+MANDIR=$(SHAREDIR)/man
+#MOZPLUGDIR=$(PREFIX)/lib/mozilla/plugins
+
+all: build
+
+#build: build_client build_plugin build_man
+build: build_client
+
+build_client:
+	lrelease x2goclient2.pro
+	mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && qmake-qt4 QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goclient2.pro
+	cd $(CLIENT_DIR) && $(MAKE)
+
+#build_plugin:
+#	lrelease x2goclient.pro
+#	mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin qmake-qt4 QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goclient.pro
+#	cd $(PLUGIN_DIR) && $(MAKE)
+
+#build_man:
+#	${MAKE} -f Makefile.man2html build
+
+#clean: clean_client clean_plugin clean_man
+clean: clean_client
+	find . -maxdepth 2 -name '*.o' -exec rm -vf {} + -type f
+	find . -maxdepth 2 -name 'moc_*.cpp' -exec rm -vf {} + -type f
+	find . -maxdepth 2 -name 'ui_*.h' -exec rm -vf {} + -type f
+	find . -maxdepth 2 -name 'qrc_*.cpp' -exec rm -vf {} + -type f
+	rm -f x2goclient2
+	rm -f x2goclient2.tag
+
+clean_client:
+	rm -fr $(CLIENT_DIR)
+
+#clean_plugin:
+#	rm -fr $(PLUGIN_DIR)
+
+#clean_man:
+#	make -f Makefile.man2html clean
+
+#install: install_client install_plugin install_man
+install: install_client
+
+install_client:
+	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)/
+	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/applications
+	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2goclient2/icons
+	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/128x128/apps
+	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps
+	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps
+	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps
+	$(INSTALL_PROGRAM) $(CLIENT_DIR)/x2goclient2 $(DESTDIR)$(BINDIR)/x2goclient2
+	$(INSTALL_FILE) desktop/x2goclient2.desktop    $(DESTDIR)$(SHAREDIR)/applications/x2goclient2.desktop
+	$(INSTALL_FILE) icons/x2goclient2.xpm          $(DESTDIR)$(SHAREDIR)/x2goclient2/icons/x2goclient2.xpm
+	$(INSTALL_FILE) icons/128x128/x2goclient2.png  $(DESTDIR)$(SHAREDIR)/x2goclient2/icons/x2goclient2.png
+	$(INSTALL_FILE) icons/128x128/x2gosession.png  $(DESTDIR)$(SHAREDIR)/x2goclient2/icons/x2gosession.png
+	$(INSTALL_FILE) icons/128x128/x2goclient2.png  $(DESTDIR)$(SHAREDIR)/icons/hicolor/128x128/apps/x2goclient2.png
+	$(INSTALL_FILE) icons/16x16/x2goclient2.png    $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps/x2goclient2.png
+	$(INSTALL_FILE) icons/64x64/x2goclient2.png    $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps/x2goclient2.png
+	$(INSTALL_FILE) icons/32x32/x2goclient2.png    $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps/x2goclient2.png
+
+#install_plugin:
+#	$(INSTALL_DIR) $(DESTDIR)$(MOZPLUGDIR)/
+#	$(INSTALL_PROGRAM) $(PLUGIN_DIR)/libx2goplugin.so $(DESTDIR)$(MOZPLUGDIR)/libx2goplugin.so
+
+#install_man:
+#	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/
+#$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
+#	$(INSTALL_FILE) man/man1/x2goclient.1    $(DESTDIR)$(MANDIR)/man1/x2goclient.1
+#	gzip -f $(DESTDIR)$(MANDIR)/man1/x2goclient.1
+
+#uninstall: uninstall_client uninstall_plugin uninstall_man
+uninstall: uninstall_client
+
+uninstall_client:
+	$(RM_FILE) $(BINDIR)/x2goclient2
+	$(RM_FILE) $(SHAREDIR)/applications/x2goclient2.desktop
+	$(RM_FILE) $(SHAREDIR)/x2goclient/icons/x2goclient2.png
+	$(RM_FILE) $(SHAREDIR)/x2goclient/icons/x2goclient2.xpm
+	$(RM_FILE) $(SHAREDIR)/x2goclient/icons/x2gosession.png
+	$(RM_FILE) $(SHAREDIR)/icons/hicolor/128x128/apps/x2goclient2.png
+	$(RM_FILE) $(SHAREDIR)/icons/hicolor/16x16/apps/x2goclient2.png
+	$(RM_FILE) $(SHAREDIR)/icons/hicolor/64x64/apps/x2goclient2.png
+	$(RM_FILE) $(SHAREDIR)/icons/hicolor/32x32/apps/x2goclient2.png
+	$(RM_DIR) $(SHAREDIR)/applications
+	$(RM_DIR) $(SHAREDIR)/x2goclient2/icons
+	$(RM_DIR) $(SHAREDIR)/icons/hicolor/128x128/apps
+	$(RM_DIR) $(SHAREDIR)/icons/hicolor/16x16/apps
+	$(RM_DIR) $(SHAREDIR)/icons/hicolor/64x64/apps
+	$(RM_DIR) $(SHAREDIR)/icons/hicolor/32x32/apps
+
+#uninstall_plugin:
+#	$(RM_FILE) $(MOZPLUGDIR)/libx2goplugin.so
+#	$(RM_DIR) $(MOZPLUGDIR)/
+
+#uninstall_man:
+#	$(RM_FILE) $(MANDIR)/man1/x2goclient.1.gz
+#	$(RM_DIR) $(MANDIR)/man1
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..ffa12ba
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,6 @@
+x2goclient2 (0.0.0.1-0~x2go1) UNRELEASED; urgency=low
+
+  * Initial release
+
+ -- Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>  Sat, 08 June 2013 00:00:00 +0200
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..2a66589
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,50 @@
+Source: x2goclient2
+Section: x11
+Priority: extra
+Maintainer: X2Go Developers <x2go-dev at lists.berlios.de>
+Uploaders:
+ Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>,
+ Mike Gabriel <mike.gabriel at das-netzwerkteam.de>,
+Build-Depends:
+ debhelper (>= 7.0.50~),
+ libqt4-dev,
+ libldap2-dev,
+ libssh-dev (>= 0.4.7),
+ libcups2-dev,
+ libx11-dev,
+ libxpm-dev,
+ 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
+
+Package: x2goclient2
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ libssh-4 (>= 0.4.7),
+ openssh-client,
+ nxproxy,
+Recommends:
+ openssh-server,
+ rdesktop | freerdp-x11,
+Suggests:
+ pinentry-x2go,
+Conflicts:
+ x2goclient-gtk,
+Replaces:
+ x2goclient-gtk,
+Description: X2Go Client 2 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
+    - audio support
+    - authentication by smartcard and USB stick
+ .
+ x2goclient2 is a graphical client (Qt4) for the X2Go system.
+ It is a rewrite of the original x2goclient applications.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..f79b3e1
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,68 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: x2goclient2
+Upstream-Contact: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
+Source: http://wiki.x2go.org
+
+Files: *
+Copyright: 2012-2013, Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
+           2005-2012, Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.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.
+
+Files: debian/*
+Copyright: 2013, Mike Gabriel <sunweaver at 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/menu b/debian/menu
new file mode 100644
index 0000000..4c9b587
--- /dev/null
+++ b/debian/menu
@@ -0,0 +1,6 @@
+?package(x2goclient2):\
+	needs="X11"\
+	section="Applications/Network/Communication"\
+	title="X2Go Client 2 (Qt)"\
+	icon="/usr/share/x2goclient/icons/x2goclient2.xpm"\
+	command="/usr/bin/x2goclient2"
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..2bbb30a
--- /dev/null
+++ b/debian/rules
@@ -0,0 +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 $@ --parallel
+
+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:
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..89ae9db
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/debian/x2goclient2.dirs b/debian/x2goclient2.dirs
new file mode 100644
index 0000000..84a23c2
--- /dev/null
+++ b/debian/x2goclient2.dirs
@@ -0,0 +1,9 @@
+usr/bin/
+usr/share/x2goclient2
+usr/share/x2goclient2/icons
+usr/share/icons/hicolor/128x128/apps/
+usr/share/icons/hicolor/16x16/apps/
+usr/share/icons/hicolor/64x64/apps/
+usr/share/icons/hicolor/32x32/apps/
+usr/share/applications/
+
diff --git a/debian/x2goclient2.install b/debian/x2goclient2.install
new file mode 100644
index 0000000..840369e
--- /dev/null
+++ b/debian/x2goclient2.install
@@ -0,0 +1,9 @@
+client_build/x2goclient2       usr/bin
+desktop/x2goclient2.desktop    usr/share/applications/
+icons/x2goclient2.xpm          usr/share/x2goclient/icons/
+icons/128x128/x2goclient2.png     usr/share/x2goclient2/icons/
+icons/128x128/x2gosession.png     usr/share/x2goclient2/icons/
+icons/128x128/x2goclient2.png     usr/share/icons/hicolor/128x128/apps/
+icons/16x16/x2goclient2.png       usr/share/icons/hicolor/16x16/apps/
+icons/64x64/x2goclient2.png       usr/share/icons/hicolor/64x64/apps/
+icons/32x32/x2goclient2.png       usr/share/icons/hicolor/32x32/apps/
diff --git a/desktop/x2goclient2.desktop b/desktop/x2goclient2.desktop
new file mode 100644
index 0000000..d5f5633
--- /dev/null
+++ b/desktop/x2goclient2.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=X2Go Client 2
+Exec=x2goclient2
+Icon=x2goclient2
+StartupWMClass=x2goclient2
+X-Window-Icon=x2goclient2
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
+Terminal=false
+Categories=Qt;KDE;Network;
diff --git a/icons/128x128/x2goclient.png b/icons/128x128/x2goclient2.png
similarity index 100%
rename from icons/128x128/x2goclient.png
rename to icons/128x128/x2goclient2.png
diff --git a/icons/16x16/x2goclient.png b/icons/16x16/x2goclient2.png
similarity index 100%
rename from icons/16x16/x2goclient.png
rename to icons/16x16/x2goclient2.png
diff --git a/icons/32x32/x2goclient.png b/icons/32x32/x2goclient2.png
similarity index 100%
rename from icons/32x32/x2goclient.png
rename to icons/32x32/x2goclient2.png
diff --git a/icons/64x64/x2goclient.png b/icons/64x64/x2goclient2.png
similarity index 100%
rename from icons/64x64/x2goclient.png
rename to icons/64x64/x2goclient2.png
diff --git a/icons/x2goclient.xpm b/icons/x2goclient2.xpm
similarity index 100%
rename from icons/x2goclient.xpm
rename to icons/x2goclient2.xpm
diff --git a/resources.qrc b/resources.qrc
index 18a300e..2c65790 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -53,7 +53,7 @@
        <file>icons/32x32/suspend.png</file>
        <file>icons/32x32/stop.png</file>
        <file>icons/32x32/auth.png</file>
-       <file>icons/32x32/x2goclient.png</file>
+       <file>icons/32x32/x2goclient2.png</file>
        <file>icons/32x32/resolution.png</file>
        <file>icons/32x32/contest.png</file>
        <file>icons/32x32/apps.png</file>


hooks/post-receive
-- 
x2goclient2.git (X2Go Client 2 (rewrite of x2goclient.git))

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 "x2goclient2.git" (X2Go Client 2 (rewrite of x2goclient.git)).




More information about the x2go-commits mailing list