[debian-edu-commits] debian-edu/ 03/05: debian/changelog, debian/man/*.1: White-space cleanup.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository italc.

commit d8c111a82940c947d4eeb0f4a9129372bd7f0327
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Nov 25 17:28:16 2017 +0100

    debian/changelog, debian/man/*.1: White-space cleanup.
---
 debian/README.setup                   |  2 +-
 debian/changelog                      | 21 ++++++++++++++-------
 debian/man/imc.1                      |  2 +-
 debian/man/italc_auth_helper.1        |  2 +-
 debian/patches/1005_gcc47-ftbfs.patch |  4 ++--
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/debian/README.setup b/debian/README.setup
index c078442..4225c4f 100644
--- a/debian/README.setup
+++ b/debian/README.setup
@@ -4,7 +4,7 @@ HOW TO SETUP iTALC (with the example of a Debian Edu network setting)
 ... edited, revied and modified by Mike Gabriel (during DebConf2013)
 
 
-This document attempts at explaining how iTALC could be / is 
+This document attempts at explaining how iTALC could be / is
 pre-configured on a Debian Edu / Skolelinux setup.
 
 The point is that different actions have to be taken on the base of
diff --git a/debian/changelog b/debian/changelog
index cd8ec13..d0322b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+italc (1:3.0.3+dfsg1-2) unstable; urgency=medium
+
+  * debian/control:
+    + Add B-D: qttools5-dev. (Closes: #881090).
+    + Bump Standards-Version: to 4.1.1. No changes needed.
+
+ -- Mike Gabriel <sunweaver at debian.org>  Sat, 25 Nov 2017 17:20:02 +0100
+
 italc (1:3.0.3+dfsg1-1) unstable; urgency=medium
 
   [ Mike Gabriel ]
@@ -434,10 +442,9 @@ italc (1:1.0.9~rc3-1) unstable; urgency=low
 
 italc (1:1.0.8-1) unstable; urgency=low
 
-  * Fix FTBFS by switching from openssl to libssl-dev build-dep. 
+  * Fix FTBFS by switching from openssl to libssl-dev build-dep.
     Thanks to Laurent Bigonville <bigon at bigon.be> (Closes: #477022)
   * Packaging new upstream version.
-  * 
 
  -- Patrick Winnertz <winnie at debian.org>  Tue, 13 May 2008 10:54:16 +0200
 
@@ -450,7 +457,7 @@ italc (1:1.0.7-2) unstable; urgency=low
 
 italc (1:1.0.7-1) unstable; urgency=low
 
-  * New upstrem release. 
+  * New upstrem release.
 
  -- Patrick Winnertz <winnie at debian.org>  Mon, 17 Mar 2008 10:13:42 +0100
 
@@ -486,7 +493,7 @@ italc (1:1.0.2-2) unstable; urgency=low
 italc (1:1.0.2-1) experimental; urgency=low
 
   * Packaging new upstream release
-  * FTBFS Bug on kfreeBSD send to upstream and this is fixed in 
+  * FTBFS Bug on kfreeBSD send to upstream and this is fixed in
     this version now. (Closes: #414096)
 
  -- Patrick Winnertz <patrick.winnertz at skolelinux.org>  Tue, 10 Apr 2007 15:29:41 +0200
@@ -508,10 +515,10 @@ italc (1.0.0.0~rc2-1) experimental; urgency=low
   * Packaging new upstream release
   * Adopting this package from Steffen Joeris with his acceptance
   * Increasing the debhelper level to 5
-  * Adding the build-depends: 
-     - libqt4-dev 
+  * Adding the build-depends:
+     - libqt4-dev
      - zlib1g-dev
-     - libjpeg62-dev 
+     - libjpeg62-dev
      - openssl
   * italc-master now has a dependency against italc-client, since
     the client server (ica ) also have to run on the master.
diff --git a/debian/man/imc.1 b/debian/man/imc.1
index 9c70017..0e112f2 100644
--- a/debian/man/imc.1
+++ b/debian/man/imc.1
@@ -53,7 +53,7 @@ Examples:
 .TP
 .B \-createkeypair <path>
 
-creates a new key pair for the default role (teacher) with the specified "path" as base dir. If "path" is omitted 
+creates a new key pair for the default role (teacher) with the specified "path" as base dir. If "path" is omitted
 the path is taken from the settings file. This is used in conjunction with role. If role is omitted the default
 role is "teacher".
 
diff --git a/debian/man/italc_auth_helper.1 b/debian/man/italc_auth_helper.1
index 02691da..e68d1de 100644
--- a/debian/man/italc_auth_helper.1
+++ b/debian/man/italc_auth_helper.1
@@ -20,7 +20,7 @@ No options present.
 .PP
 .SH SEE ALSO
 .IR ica (1), italc (1), imc (8)
-.PP 
+.PP
 .IR http://italc.sf.net
 .SH AUTHOR
 iTALC has been written by Tobias Doerffel. See AUTHORS for details.
diff --git a/debian/patches/1005_gcc47-ftbfs.patch b/debian/patches/1005_gcc47-ftbfs.patch
index 22f66a7..8e15afb 100644
--- a/debian/patches/1005_gcc47-ftbfs.patch
+++ b/debian/patches/1005_gcc47-ftbfs.patch
@@ -5,8 +5,8 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 @@ -23,6 +23,7 @@
   *
   */
- 
+
 +#include <unistd.h>
  #include <italcconfig.h>
- 
+
  #include <QtCore/QDir>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/italc.git