[debian-edu-commits] debian-edu/italc.git (#127) - master (branch) updated: debian/1_2.0.0-4-9-g20202f2
Mike Gabriel
sunweaver at alioth.debian.org
Mon Aug 12 12:47:18 UTC 2013
The branch, master has been updated
via 20202f2d0f18785d9819388cd572250af0582e0d (commit)
from 64d2a1a4a538015e8507c0a8bc53515d48505c26 (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 20202f2d0f18785d9819388cd572250af0582e0d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Aug 12 14:33:45 2013 +0200
Update patches, drop patch 011_qt-signals.patch (applied by upstream).
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
debian/copyright | 1 -
debian/patches/002_use-v4l-videodev2.patch | 2 +-
debian/patches/003_rename-plugin-dir.patch | 4 +-
.../006_inject-buildtype-from-outside.patch | 6 +-
debian/patches/011_qt-signals.patch | 94 --------------------
debian/patches/031_fix-spelling-errors.patch | 84 ++++++++---------
debian/patches/series | 1 -
8 files changed, 50 insertions(+), 143 deletions(-)
delete mode 100644 debian/patches/011_qt-signals.patch
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 7c93490..0f1aba1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ italc (1:2.0.1-1) UNRELEASED; urgency=low
+ Silence lintian about a false-positive spelling error report.
* /debian/copyright:
+ Update and review and explicitly add OpenSSL exception.
+ * Update patches, drop patch 011_qt-signals.patch (applied by upstream).
-- Mike Gabriel <sunweaver at debian.org> Mon, 12 Aug 2013 12:10:34 +0200
diff --git a/debian/copyright b/debian/copyright
index 9a7b421..19de788 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -653,4 +653,3 @@ License: BSD-3
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.
-
diff --git a/debian/patches/002_use-v4l-videodev2.patch b/debian/patches/002_use-v4l-videodev2.patch
index 3a0f908..b4a6cae 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
-@@ -92,6 +92,7 @@
+@@ -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)
diff --git a/debian/patches/003_rename-plugin-dir.patch b/debian/patches/003_rename-plugin-dir.patch
index 6fb7127..e3f650e 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
-@@ -221,7 +221,7 @@
+@@ -223,7 +223,7 @@
SET(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} -lcrypto)
ENDIF(ITALC_BUILD_WIN32)
@@ -14,4 +14,4 @@ Last-Update: 2012-05-18
+ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/plugins/"')
ADD_DEFINITIONS(-DLIBVNCSERVER_HAVE_LIBZ)
ADD_DEFINITIONS(-DLIBVNCSERVER_HAVE_LIBJPEG)
-
+ IF(PNG_FOUND)
diff --git a/debian/patches/006_inject-buildtype-from-outside.patch b/debian/patches/006_inject-buildtype-from-outside.patch
index 685136f..d815aaa 100644
--- a/debian/patches/006_inject-buildtype-from-outside.patch
+++ b/debian/patches/006_inject-buildtype-from-outside.patch
@@ -2,7 +2,7 @@ Description: Pass-through of the CPU type, fix build on non-x86(_64) architectur
Author: Mike Gabriel <sunweaver at debian.org>
--- a/imc/src/MainWindow.cpp
+++ b/imc/src/MainWindow.cpp
-@@ -534,14 +534,13 @@
+@@ -534,16 +534,13 @@
#endif
@@ -10,6 +10,8 @@ Author: Mike Gabriel <sunweaver at debian.org>
- const QString buildType = "x86";
-#elif defined( ITALC_HOST_X86_64 )
- const QString buildType = "x86_64";
+-#else
+- const QString buildType = "unknown";
-#endif
+// see http://www.guyrutenberg.com/2008/12/20/expanding-macros-into-string-constants-in-c/ for what the below two lines do...
+#define STR_EXPAND(tok) #tok
@@ -33,4 +35,4 @@ Author: Mike Gabriel <sunweaver at debian.org>
-
#cmakedefine ITALC_HAVE_ARPA_INET_H 1
#cmakedefine ITALC_HAVE_FCNTL_H 1
- #cmakedefine ITALC_HAVE_LIMITS_H 1
+ #cmakedefine ITALC_HAVE_FCNTL_H 1
diff --git a/debian/patches/011_qt-signals.patch b/debian/patches/011_qt-signals.patch
deleted file mode 100644
index 65e8c62..0000000
--- a/debian/patches/011_qt-signals.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Description: QT signals patch
- - add two QT signals that are emitted when new user information or state
- flags are received
- - add Qt signal stateChanged to get notified when the state of the
- VNC connection changes
-Forwarded: not-yet
-Author: Andreas Büsching <buesching at univention.de>
-Last-Update: 2012-03-21
-diff -Naur italc-2.0.0.orig/lib/include/ItalcCoreConnection.h italc-2.0.0/lib/include/ItalcCoreConnection.h
---- italc-2.0.0.orig/lib/include/ItalcCoreConnection.h 2011-08-03 23:18:00.000000000 +0200
-+++ italc-2.0.0/lib/include/ItalcCoreConnection.h 2012-03-21 09:01:14.000000000 +0100
-@@ -106,6 +106,9 @@
-
- void reportSlaveStateFlags();
-
-+signals:
-+ void receivedUserInfo( const QString &, const QString & );
-+ void receivedSlaveStateFlags( const int );
-
- private slots:
- void initNewClient( rfbClient *client );
-diff -Naur italc-2.0.0.orig/lib/include/ItalcVncConnection.h italc-2.0.0/lib/include/ItalcVncConnection.h
---- italc-2.0.0.orig/lib/include/ItalcVncConnection.h 2011-08-03 23:18:00.000000000 +0200
-+++ italc-2.0.0/lib/include/ItalcVncConnection.h 2012-03-21 09:02:45.000000000 +0100
-@@ -190,6 +190,7 @@
- void passwordRequest();
- void outputErrorMessage( const QString &message );
- void connected();
-+ void stateChanged( const int );
-
-
- public slots:
-diff -Naur italc-2.0.0.orig/lib/src/ItalcCoreConnection.cpp italc-2.0.0/lib/src/ItalcCoreConnection.cpp
---- italc-2.0.0.orig/lib/src/ItalcCoreConnection.cpp 2011-08-03 23:18:00.000000000 +0200
-+++ italc-2.0.0/lib/src/ItalcCoreConnection.cpp 2012-03-21 09:01:14.000000000 +0100
-@@ -132,10 +132,12 @@
- {
- m_user = m.arg( "username" );
- m_userHomeDir = m.arg( "homedir" );
-+ emit receivedUserInfo( m_user, m_userHomeDir );
- }
- else if( m.cmd() == ItalcCore::ReportSlaveStateFlags )
- {
- m_slaveStateFlags = m.arg( "slavestateflags" ).toInt();
-+ emit receivedSlaveStateFlags( m_slaveStateFlags );
- }
- // TODO: plugin hook
- else
-diff -Naur italc-2.0.0.orig/lib/src/ItalcVncConnection.cpp italc-2.0.0/lib/src/ItalcVncConnection.cpp
---- italc-2.0.0.orig/lib/src/ItalcVncConnection.cpp 2011-08-03 23:18:00.000000000 +0200
-+++ italc-2.0.0/lib/src/ItalcVncConnection.cpp 2012-03-21 09:04:43.000000000 +0100
-@@ -513,6 +513,7 @@
- void ItalcVncConnection::run()
- {
- m_state = Disconnected;
-+ emit stateChanged( m_state );
- m_stopped = false;
-
- rfbClientLog = hookOutputHandler;
-@@ -569,6 +570,7 @@
- emit connected();
-
- m_state = Connected;
-+ emit stateChanged( m_state );
- if( m_framebufferUpdateInterval < 0 )
- {
- rfbClientSetClientData( m_cl, (void *) 0x555, (void *) 1 );
-@@ -581,15 +583,18 @@
- if( argc < 0 )
- {
- m_state = HostUnreachable;
-+ emit stateChanged( m_state );
- }
- else if( argc > 0 )
- {
- m_state = AuthenticationFailed;
-+ emit stateChanged( m_state );
- }
- else
- {
- // failed for an unknown reason
- m_state = ConnectionFailed;
-+ emit stateChanged( m_state );
- }
-
- // do not sleep when already requested to stop
-@@ -691,6 +696,7 @@
- }
-
- m_state = Disconnected;
-+ emit stateChanged( m_state );
- }
-
-
diff --git a/debian/patches/031_fix-spelling-errors.patch b/debian/patches/031_fix-spelling-errors.patch
index 728ad05..4fbb4a6 100644
--- a/debian/patches/031_fix-spelling-errors.patch
+++ b/debian/patches/031_fix-spelling-errors.patch
@@ -134,7 +134,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
QSysInfo::windowsVersion() == QSysInfo::WV_WINDOWS7 ) )
--- a/ica/x11/ChangeLog
+++ b/ica/x11/ChangeLog
-@@ -5515,7 +5515,7 @@
+@@ -6603,7 +6603,7 @@
2003-08-03 dscho <dscho>
* rfb/rfbproto.h: forgot to change WORDS_BIGENDIAN to
@@ -143,7 +143,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
2003-08-02 dscho <dscho>
-@@ -6358,7 +6358,7 @@
+@@ -7446,7 +7446,7 @@
2001-10-15 dscho <dscho>
@@ -152,7 +152,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
2001-10-13 dscho <dscho>
-@@ -6609,7 +6609,7 @@
+@@ -7697,7 +7697,7 @@
2001-09-25 dscho <dscho>
@@ -174,7 +174,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
"earlier and so you cannot "
--- a/imc/src/ImcCore.cpp
+++ b/imc/src/ImcCore.cpp
-@@ -57,7 +57,7 @@
+@@ -58,7 +58,7 @@
// merge configuration
*ItalcCore::config += c;
@@ -523,44 +523,10 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
<translation>Manager usług nie odpowiada (masz odpowiednie uprawnienia?) - usługa '%1' nie została zatrzymana.</translation>
</message>
</context>
---- a/lib/resources/pt_br.ts
-+++ b/lib/resources/pt_br.ts
-@@ -104,7 +104,7 @@
- <translation>Exportar para um arquivo texto</translation>
- </message>
- <message>
-- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
-+ <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes necessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
- <translation>Use este botão para exportar esta lista de computadores e nomes de usuários para um arquivo texto. Você pode usar este arquivo mais tarde para recolher os arquivos dos usuários depois que um exame terminou. As vezes isso é necessário, pois alguns usuários podem ter terminado o exame mais cedo e ter feito logoff do computador impedindo o professor de recolher seus arquivos no final do exame.</translation>
- </message>
- <message>
-@@ -1482,7 +1482,7 @@
- <translation>Não foi possível registrar o serviço '%1'.</translation>
- </message>
- <message>
-- <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not registered.</source>
-+ <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not registered.</source>
- <translation>O Gerenciador de Controle de Servicos não pôde ser contatado (você tem os direitos necessários?!) - o serviço '%1' não foi registrado.</translation>
- </message>
- <message>
-@@ -1518,11 +1518,11 @@
- <translation>O serviço '%1' não pôde ser encontrado.</translation>
- </message>
- <message>
-- <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not unregistered.</source>
-+ <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not unregistered.</source>
- <translation>O Gerenciador de Controle de Servicos não pôde ser contatado (você tem os direitos necessários?!) - o serviço '%1' não foi registrado.</translation>
- </message>
- <message>
-- <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not stopped.</source>
-+ <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not stopped.</source>
- <translation>O Gerenciador de Controle de Servicos não pôde ser contatado (você tem os direitos necessários?!) - o serviço '%1' não foi parado.</translation>
- </message>
- </context>
--- a/lib/resources/ru.ts
+++ b/lib/resources/ru.ts
-@@ -104,7 +104,7 @@
- <translation type="unfinished"></translation>
+@@ -100,7 +100,7 @@
+ <translation type="unfinished">Экспортировать в текстовый файл</translation>
</message>
<message>
- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
@@ -568,7 +534,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
<translation type="unfinished">Используйте эту кнопку для экспорта этого списока компьютеров и пользователей в текстовый файл. Вы можете использовать этот файл позже для сбора файлов после завершения экзамена. Иногда это необходимо, потому что некоторые пользователи могли завершить работу и выполнить выход раньше и поэтому вы не сможете собрать их файлы в конце экзамена.</translation>
</message>
<message>
-@@ -1478,7 +1478,7 @@
+@@ -1487,7 +1487,7 @@
<translation>Не удалось зарегистрировать службу '%1'.</translation>
</message>
<message>
@@ -577,7 +543,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
<translation>Невозможно связаться с Service Control Manager (может у Вас недостаточно прав?!) - служба '%1' не зарегистрирована.</translation>
</message>
<message>
-@@ -1514,11 +1514,11 @@
+@@ -1523,11 +1523,11 @@
<translation>Службу '%1' нельзя найти.</translation>
</message>
<message>
@@ -840,3 +806,37 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
const int fbw = sSize.isValid() ? sSize.width() :
m_vncConn.framebufferSize().width();
if( fbw < width() )
+--- a/lib/resources/pt_br.ts
++++ b/lib/resources/pt_br.ts
+@@ -102,7 +102,7 @@
+ <translation>Exportar para um arquivo texto</translation>
+ </message>
+ <message>
+- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
++ <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes necessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
+ <translation>Use este botão para exportar esta lista de computadores e nomes de usuários para um arquivo texto. Você pode usar este arquivo mais tarde para recolher os arquivos dos usuários depois que um exame terminou. As vezes isso é necessário, porque alguns usuários podem ter terminado o exame mais cedo e ter feito logoff do computador e por isso impedindo você de recolher seus arquivos no final do exame.</translation>
+ </message>
+ <message>
+@@ -1489,7 +1489,7 @@
+ <translation>Não foi possível registrar o serviço '%1'.</translation>
+ </message>
+ <message>
+- <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not registered.</source>
++ <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not registered.</source>
+ <translation>O Gerenciador de Controle de Servicos não pode ser contatado (você tem os direitos necessários?!) - o serviço '%1' não foi registrado.</translation>
+ </message>
+ <message>
+@@ -1525,11 +1525,11 @@
+ <translation>O serviço '%1' não pode ser encontrado.</translation>
+ </message>
+ <message>
+- <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not unregistered.</source>
++ <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not unregistered.</source>
+ <translation>O Gerenciador de Controle de Servicos não pode ser contatado (você tem os direitos necessários?!) - o serviço '%1' não foi registrado.</translation>
+ </message>
+ <message>
+- <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not stopped.</source>
++ <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not stopped.</source>
+ <translation>O Gerenciador de Controle de Servicos não pode ser contatado (você tem os direitos necessários?!) - o serviço '%1' não foi parado.</translation>
+ </message>
+ </context>
diff --git a/debian/patches/series b/debian/patches/series
index 8cf2acb..c3b0ec6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,5 @@
004_x2go-nx-noxdamage.patch
005_gcc47-ftbfs.patch
006_inject-buildtype-from-outside.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