[debian-edu-commits] debian-edu/ 03/32: debian/patches: Drop 002_use-v4l-videodev2.patch, 004_x2go-nx-noxdamage.patch, 021_man-page-patch-in.patch. Applied upstream.
Mike Gabriel
sunweaver at debian.org
Mon Aug 18 15:09:44 UTC 2014
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to annotated tag debian/1_2.0.2+dfsg1-1
in repository italc.
commit a14ebd36975e2bfaac05476e557810c7d31c58f2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Aug 14 11:24:47 2014 +0200
debian/patches: Drop 002_use-v4l-videodev2.patch, 004_x2go-nx-noxdamage.patch, 021_man-page-patch-in.patch. Applied upstream.
---
debian/patches/002_use-v4l-videodev2.patch | 15 ---
debian/patches/004_x2go-nx-noxdamage.patch | 13 ---
debian/patches/021_man-page-patch-in.patch | 154 -----------------------------
debian/patches/series | 3 -
4 files changed, 185 deletions(-)
diff --git a/debian/patches/002_use-v4l-videodev2.patch b/debian/patches/002_use-v4l-videodev2.patch
deleted file mode 100644
index b4a6cae..0000000
--- a/debian/patches/002_use-v4l-videodev2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Search V4L2 Linux header and pass it through to x11vnc
- Also check for V4L2 Linux kernel header file.
-Forwarded: not-yet
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Last-Update: 2012-05-18
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -93,6 +93,7 @@
- CHECK_INCLUDE_FILES(linux/input.h ITALC_HAVE_LINUX_INPUT_H)
- CHECK_INCLUDE_FILES(linux/uinput.h ITALC_HAVE_LINUX_UINPUT_H)
- CHECK_INCLUDE_FILES(linux/videodev.h ITALC_HAVE_LINUX_VIDEODEV_H)
-+CHECK_INCLUDE_FILES(linux/videodev2.h ITALC_HAVE_LINUX_VIDEODEV2_H)
-
- IF(NOT ITALC_BUILD_WIN32)
- FIND_PACKAGE(PAM REQUIRED)
diff --git a/debian/patches/004_x2go-nx-noxdamage.patch b/debian/patches/004_x2go-nx-noxdamage.patch
deleted file mode 100644
index f69ead7..0000000
--- a/debian/patches/004_x2go-nx-noxdamage.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Add -noxdamage for X2Go sessions
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
---- a/ica/src/ItalcVncServer.cpp
-+++ b/ica/src/ItalcVncServer.cpp
-@@ -251,7 +251,7 @@
- // workaround for x11vnc when running in an NX session
- foreach( const QString &s, QProcess::systemEnvironment() )
- {
-- if( s.startsWith( "NXSESSIONID=" ) )
-+ if( s.startsWith( "NXSESSIONID=" ) || s.startsWith( "X2GO_SESSION=" ) )
- {
- cmdline << "-noxdamage";
- }
diff --git a/debian/patches/021_man-page-patch-in.patch b/debian/patches/021_man-page-patch-in.patch
deleted file mode 100644
index f484a4e..0000000
--- a/debian/patches/021_man-page-patch-in.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-Description: Update ica man page to the executables' status in iTALC 2.0.0.
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
---- a/ica/ica.1
-+++ b/ica/ica.1
-@@ -2,7 +2,7 @@
- .\" First parameter, NAME, should be all caps
- .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
- .\" other parameters are allowed: see man(7), man(1)
--.TH ICA 1 "April 30, 2007"
-+.TH ICA 1 "May 18, 2012"
- .\" Please adjust this date whenever revising the manpage.
- .\"
- .\" Some roff macros, for reference:
-@@ -29,42 +29,73 @@
- .\" \fI<whatever>\fP escape sequences to invode bold face and italics,
- .\" respectively.
- .B ICA
--is the software which needs to run on clients in order to access them using iTALC master application. It provides a VNC-server and a service-daemon which is neccessary for taking control over the client.
-+is the software which needs to run on clients in order to access them using iTALC master application. It provides a VNC\-server and a service\-daemon which is necessary for taking control over the client.
-
--.SH OPTIONS
-+.SH iTALC OPTIONS
- .IP "\fB\-role\fP \fIrole\fP
- .IP
--Set role under which ICA should run where \fIrole\fP has to be "teacher", "admin", "supporter" or "other". This is mainly used in combination with the \fB-createkeypair\fP option.
--.IP "\fB\-ivsport\fP \fIport\fP
-+Set role under which ICA should run where \fIrole\fP has to be "teacher", "admin", "supporter" or "other".
-+.IP "\fB\-port\fP \fIport\fP
- .IP
--Set port at which the iTALC-VNC-server should listen. Default: 11100
--.
--.IP "\fB\-isdport\fP \fIport\fP
--.IP
--Set port at which the iTALC-service-daemon should listen. Default: 11200
--.
--.IP \fB-noshm\fR
-+Set port at which the iTALC\-VNC\-server should listen. Default: 11100
-+.PP
-+The \fB\-createkeypair\fP option has been moved to the iTALC Management Console \fBimc\fP since iTALC 2.0.0.
-+
-+.SH X11VNC OPTIONS
-+.IP \fB\-noshm\fR
- .IP
--Do not use the MIT-SHM extension for the polling.
-+Do not use the MIT\-SHM extension for the polling.
- Remote displays can be polled this way: be careful this
- can use large amounts of network bandwidth. This is
- also of use if the local machine has a limited number
--of shm segments and \fB-onetile\fR is not sufficient.
-+of shm segments and \fB\-onetile\fR is not sufficient.
- .PP
--\fB-onetile\fR
-+\fB\-onetile\fR
- .IP
- Do not use the new copy_tiles() framebuffer mechanism,
- just use 1 shm tile for polling. Limits shm segments
- used to 3.
--.
--.IP "\fB\-createkeypair\fP \fI[private-key-file] [public-key-file]\fP
-+.PP
-+\fB\-nosel\fR
-+.IP
-+ Do not manage exchange of X selection/cutbuffer between VNC viewers and the X server at all.
-+.PP
-+\fB\-nosetclipboard\fR
-+.IP
-+Do not set the CLIPBOARD selection for changes received from VNC clients.
-+.PP
-+\fB\-solid\fR \fI[color]\fR
- .IP
--Create a new key pair for authentication between master and client. Until specified with \fB-role\fP the key-pair will be created for role "other". The keys either will be saved under given file-names or the default ones according to the selected role (/etc/italc/keys/private/<role>/key and /etc/italc/keys/public/<role>/key).
-+To improve performance, when VNC clients are connected try to change the desktop background to a solid color. The [color] is optional: the
-+default color is "cyan4". For a different one specify the X color (rgb.txt name, e.g. "darkblue" or numerical "#RRGGBB").
-+.IP
-+Currently this option only works on GNOME, KDE3, CDE, XFCE, and classic X (i.e. with the background image on the root window). The "gconftool\-2",
-+"dcop" and "xfconf\-query" external commands are run for GNOME, KDE, and XFCE respectively.
-+(There is no color selection for XFCE.) Other desktops won't work, (send us the corresponding commands if you find them).
-+.IP
-+
-+.PP
-+\fB\-xrandr\fR \fI[mode]\fR
-+.IP
-+If the display supports the XRANDR (X Resize, Rotate and Reflection) extension, and you expect XRANDR events to occur to the display while
-+x11vnc is running, this options indicates x11vnc should try to respond to them (as opposed to simply crashing by assuming the old screen
-+size). See the xrandr(1) manpage and run ´xrandr \-q' for more info. [mode] is optional and described below.
-+.IP
-+Since watching for XRANDR events and trapping errors increases polling overhead, only use this option if XRANDR changes are expected. For
-+example on a rotatable screen PDA or laptop, or using a XRANDR\-aware Desktop where you resize often. It is best to be viewing with a
-+vncviewer that supports the NewFBSize encoding, since it knows how to react to screen size changes. Otherwise, LibVNCServer tries to do so
-+something reasonable for viewers that cannot do this (portions of the screen may be clipped, unused, etc).
-+.IP
-+"mode" defaults to "resize", which means create a new, resized, framebuffer and hope all viewers can cope with the change. "newfbsize"
-+means first disconnect all viewers that do not support the NewFBSize VNC encoding, and then resize the framebuffer. "exit" means disconnect
-+all viewer clients, and then terminate x11vnc.
-+.PP
- .SH SEE ALSO
--.IR italc (1),
-+.IR italc (1), imc (8), italc_auth_helper (1)
-+.PP
- .IR http://italc.sf.net/
-
- .SH AUTHOR
--iTALC was written by Tobias Doerffel. See AUTHORS for details.
-+iTALC has been written by Tobias Doerffel. See AUTHORS for details.
- .PP
--This manual page was written by Tobias Doerffel <tobydox /at/ users /dot/ sf /dot/ net>, for the Debian project (but may be used by others).
-+This manual page has been written by Tobias Doerffel and updated by Mike Gabriel. It was originally written for the Debian project (but may be used by others).
---- a/ima/italc.1
-+++ b/ima/italc.1
-@@ -2,34 +2,31 @@
- .\" First parameter, NAME, should be all caps
- .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
- .\" other parameters are allowed: see man(7), man(1)
--.TH ITALC 1 "February 1, 2008"
-+.TH ITALC 1 "May 18, 2012"
- .SH NAME
- italc \- iTALC Master Application
- .SH SYNOPSIS
- .B italc
- .SH DESCRIPTION
- .B iTALC
--is the actual software to control iTALC-clients. Using it's GUI you can remote-control, lock, shutdown/reboot computers as well as show a demo, send text-messages to users and much more.
-+is the actual software to control iTALC\-clients. Using it's GUI you can remote\-control, lock, shutdown/reboot computers as well as show a demo, send text\-messages to users and much more.
- .
- .SH OPTIONS
- .IP "\fB\-rctrl\fP \fIhost:[port]\fP
- .IP
--Directly remote-control the specified host. You can omit port if the server is running at the default-port (11100).
-+Directly remote\-control the specified host. You can omit port if the server is running at the default\-port (11100).
- .
--.IP "\fB\-isdport\fP \fIport\fP
-+.IP "\fB\-screen\fP \fI<screen\-number>\fP
- .IP
--Set port to which iTALC should connect in order to contact the local iTALC-service-daemon. Default: 11200
--.
--.IP "\fB\-isdhost\fP \fIip\fP
--.IP
--Set the host to which iTALC should connect in order to contact the local iTALC-service-daemon. Default: localhost
-+Place the remote control window on another screen if running on a multi\-headed workstation.
- .
- .PP
- .SH SEE ALSO
--.IR ica (1),
-+.IR ica (1), imc (8), italc_auth_helper(1)
-+.PP
- .IR http://italc.sf.net
- .SH AUTHOR
--iTALC was written by Tobias Doerffel. See AUTHORS for details.
-+iTALC has been written by Tobias Doerffel. See AUTHORS for details.
- .PP
--This manual page was written by Steffen Joeris <steffen.joeris at skolelinux.de>
--and Tobias Doerffel <tobydox /at/ users /dot/ sf /dot/ net>, for the Debian project (but may be used by others).
-+This manual page has been written by Steffen Joeris
-+and Tobias Doerffel and updated by Mike Gabriel. It was originally written for the Debian project (but may be used by others).
diff --git a/debian/patches/series b/debian/patches/series
index c3b0ec6..0c54176 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,5 @@
001_set-static-libdir-and-rpath-for-cmake.patch
-002_use-v4l-videodev2.patch
003_rename-plugin-dir.patch
-004_x2go-nx-noxdamage.patch
005_gcc47-ftbfs.patch
006_inject-buildtype-from-outside.patch
-021_man-page-patch-in.patch
031_fix-spelling-errors.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/italc.git
More information about the debian-edu-commits
mailing list