[debian-edu-commits] debian-edu/italc.git (#84) - master (branch) updated: debian/1_2.0.0-1-6-g483e105
Mike Gabriel
sunweaver at alioth.debian.org
Mon May 13 09:37:44 UTC 2013
The branch, master has been updated
via 483e105be7a46b6b142910f3d6c1c89f2cd63759 (commit)
from 7e58ba4832af51573ec9c47ac4443cf5bd2cc670 (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 483e105be7a46b6b142910f3d6c1c89f2cd63759
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon May 13 11:33:38 2013 +0200
Update patches / fix lintian issues:
+ Fix spelling-error-in-binary usr/bin/italc neccessary necessary.
+ Fix spelling-error-in-binary usr/lib/italc/libItalcCore.so neccessary
necessary.
+ Fix spelling-error-in-manpage usr/share/man/man1/ica.1.gz neccessary
necessary.
+ Fix hyphen-used-as-minus-sign usr/share/man/man1/ica.1.gz.
+ Fix hyphen-used-as-minus-sign usr/share/man/man1/imc.1.gz.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 8 ++++
debian/patches/002_use-v4l-videodev2.patch | 2 +-
debian/patches/003_rename-plugin-dir.patch | 2 +-
debian/patches/021_man-page-patch-in.patch | 60 +++++++++++++++++++---------
debian/patches/series | 1 +
5 files changed, 52 insertions(+), 21 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index ad9a52d..9344702 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,14 @@ italc (1:2.0.0-3) UNRELEASED; urgency=low
+ Fix duplicate-in-relation-field in source build-depends: libxrandr-dev,
libxrandr-dev.
+ Fix unneeded-build-dep-on-quilt.
+ + Fix spelling-error-in-binary usr/bin/italc neccessary necessary.
+ + Fix spelling-error-in-binary usr/lib/italc/libItalcCore.so neccessary
+ necessary.
+ + Fix spelling-error-in-manpage usr/share/man/man1/ica.1.gz neccessary
+ necessary.
+ + Fix hyphen-used-as-minus-sign usr/share/man/man1/ica.1.gz.
+ + Fix hyphen-used-as-minus-sign usr/share/man/man1/imc.1.gz.
+ * Update patches.
-- Mike Gabriel <sunweaver at debian.org> Mon, 13 May 2013 10:17:38 +0200
diff --git a/debian/patches/002_use-v4l-videodev2.patch b/debian/patches/002_use-v4l-videodev2.patch
index e0ef4ac..3a0f908 100644
--- a/debian/patches/002_use-v4l-videodev2.patch
+++ b/debian/patches/002_use-v4l-videodev2.patch
@@ -5,7 +5,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Last-Update: 2012-05-18
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -80,6 +80,7 @@
+@@ -92,6 +92,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)
diff --git a/debian/patches/003_rename-plugin-dir.patch b/debian/patches/003_rename-plugin-dir.patch
index a980676..6fb7127 100644
--- a/debian/patches/003_rename-plugin-dir.patch
+++ b/debian/patches/003_rename-plugin-dir.patch
@@ -6,7 +6,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Last-Update: 2012-05-18
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -209,7 +209,7 @@
+@@ -221,7 +221,7 @@
SET(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} -lcrypto)
ENDIF(ITALC_BUILD_WIN32)
diff --git a/debian/patches/021_man-page-patch-in.patch b/debian/patches/021_man-page-patch-in.patch
index dba9002..f484a4e 100644
--- a/debian/patches/021_man-page-patch-in.patch
+++ b/debian/patches/021_man-page-patch-in.patch
@@ -11,9 +11,12 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
-@@ -31,18 +31,17 @@
+@@ -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 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
@@ -24,54 +27,65 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+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
+-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 \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 MIT-SHM extension for the polling.
-@@ -56,15 +55,47 @@
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
++\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
++\fB\-nosetclipboard\fR
+.IP
+Do not set the CLIPBOARD selection for changes received from VNC clients.
+.PP
-+\fB-solid\fR \fI[color]\fR
++\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.
++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
++\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.
++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
++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
@@ -93,7 +107,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+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,7 +2,7 @@
+@@ -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)
@@ -102,19 +116,27 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
.SH NAME
italc \- iTALC Master Application
.SH SYNOPSIS
-@@ -16,20 +16,17 @@
+ .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).
++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 "\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.
++Place the remote control window on another screen if running on a multi\-headed workstation.
.
.PP
.SH SEE ALSO
diff --git a/debian/patches/series b/debian/patches/series
index 040cec1..f87f4c9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
005_gcc47-ftbfs.patch
011_qt-signals.patch
021_man-page-patch-in.patch
+031_fix-spelling-errors.patch
hooks/post-receive
--
italc.git (Debian package italc)
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 "italc.git" (Debian package italc).
More information about the debian-edu-commits
mailing list