[debian-edu-commits] debian-edu/ 01/01: Remove trailing whitespace from lines in the Makefile and debian/changelog.

Fri Jan 22 21:33:49 UTC 2016

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

pere pushed a commit to branch master
in repository desktop-profiles.

commit a26cc86b2670d93a974b27ab4b73bcb87ffde8b5
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Jan 22 22:33:44 2016 +0100

    Remove trailing whitespace from lines in the Makefile and debian/changelog.
---
 Makefile         |  8 ++++----
 debian/changelog | 32 ++++++++++++++++----------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index 9bfd570..8ac6358 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ dh_installlisting.1: dh_installlisting
 
 pot: po/profile-manager.pot
 	kmdr2po profile-manager.kmdr
-	mkdir -p po/	
+	mkdir -p po/
 	msgmerge po/profile-manager.pot profile-manager.po > po/profile-manager.pot.new
 	mv po/profile-manager.pot.new po/profile-manager.pot && rm profile-manager.po
 	# @i18n strings aren't picked up by kdmr2po at the moment
@@ -49,10 +49,10 @@ zip-tests:
 
 check: zip-tests
 
-clean: 
-	if(ls po/*.mo 2> /dev/null > /dev/null); then rm po/*.mo; fi;  
+clean:
+	if(ls po/*.mo 2> /dev/null > /dev/null); then rm po/*.mo; fi;
 	if(test -e tests.tgz); then rm tests.tgz; fi
 
 distclean: clean
 realclean: distclean
-	if(test -e dh_installlisting.1); then rm dh_installlisting.1; fi;  
+	if(test -e dh_installlisting.1); then rm dh_installlisting.1; fi;
diff --git a/debian/changelog b/debian/changelog
index 4885624..ab53078 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,9 +38,9 @@ desktop-profiles (1.4.17) unstable; urgency=low
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 17 Aug 2013 20:22:44 +0200
 
 desktop-profiles (1.4.16) unstable; urgency=low
- 
+
   [ Bart Cornelis (cobaco) ]
-  * Added Japanese translation by "Hideki Yamane (Closes: #510725) 
+  * Added Japanese translation by "Hideki Yamane (Closes: #510725)
   * Don't forget to 'set -e' in config and postinst scripts, avoids
     lintian warning.
 
@@ -88,10 +88,10 @@ desktop-profiles (1.4.15) unstable; urgency=low
     - KDE docs are now on techbase wiki
     - location of freedesktop docs changed (though old links were redirected)
     - XFCE doc is on different server (though old link was redirected)
-  * Comply with policy version 3.7.3: 
+  * Comply with policy version 3.7.3:
     Change menu entry from Apps/System to Applications/System/Administration
   * Comply with policy version 3.8.0:
-    No changes needed  
+    No changes needed
   * Removed lintian overrides that are no longer necessary as of lintian 1.23.37
   * Add Vcs-Svn and Vcs-Browser fields to debian/control
   * Use proposed machine-parsable format for debian/copyright (as documented
@@ -133,7 +133,7 @@ desktop-profiles (1.4.14) unstable; urgency=low
 desktop-profiles (1.4.13) unstable; urgency=low
 
   * fixed small bug in for_each_requirement function of listingmodule
-    (triggered when a profile had multiple shell-commands as activation 
+    (triggered when a profile had multiple shell-commands as activation
     requirements)
   * Adapted man page to unclude reference to /usr/sbin/path2listing for gconf
   * Updated French translation by Jean-Luc Coulon (Closes: #387015)
@@ -160,8 +160,8 @@ desktop-profiles (1.4.12) unstable; urgency=low
 desktop-profiles (1.4.11) unstable; urgency=low
 
   * Added shell-specific fix for the 'ssh -X' bug for psh shell.
-  * psh version 1.8-6 and zoidberg 0.96-1 modularized their system-wide 
-    on-login file, so we now apply the 'ssh -X' fix automatically for these 
+  * psh version 1.8-6 and zoidberg 0.96-1 modularized their system-wide
+    on-login file, so we now apply the 'ssh -X' fix automatically for these
     two shells.
   * Set debhelper compatibility level to 5
 
@@ -272,15 +272,15 @@ desktop-profiles (1.4.4) unstable; urgency=low
 
 desktop-profiles (1.4.3) unstable; urgency=low
 
-  * Add possibility to use fieldnumbers instead of name when specifying the 
+  * Add possibility to use fieldnumbers instead of name when specifying the
     sort field for list-desktop-profiles
-  * Changed gui-script to use fieldnumbers instead of name (as the latter 
+  * Changed gui-script to use fieldnumbers instead of name (as the latter
     resulted in translated names being passed to list-desktop-profiles,
     which off course doesn't work)
   * Changed packaging to cope with translations of the gui script, and added
-    Dutch translation (start with KDE_LANG=nl from commandline to get the 
+    Dutch translation (start with KDE_LANG=nl from commandline to get the
     Dutch version of the gui)
-  * Played with layouts in the gui-script to make it better cope with the 
+  * Played with layouts in the gui-script to make it better cope with the
     translated strings (still not perfect, so translators will want to check
     their translations in action)
 
@@ -309,8 +309,8 @@ desktop-profiles (1.4.1-1) unstable; urgency=low
       + desktop-profiles man page is partly rewritten to present things in a
         clearer way
       + README referred to no longer existing .deb package for kiosktool from
-        the kalyxo team, now points to the ITP. 
-      + Put a pre precanned .listing file for debian-edu users online, and      
+        the kalyxo team, now points to the ITP.
+      + Put a pre precanned .listing file for debian-edu users online, and
         referred to it in the README
       + Document in README that profile-manager.kmdr script doesn't work with
         the KDE 3.4. kommander package, only with the 3.3 one.
@@ -322,15 +322,15 @@ desktop-profiles (1.4.1-1) unstable; urgency=low
 desktop-profiles (1.4-1) unstable; urgency=low
 
   * Format change in the .listing files: more particularely make profile KIND
-    be the 2nd field instead of the 5th. As pointed out by Matthew McGuire 
-    <gray at shadowglade.net> this makes things more readable. Automatic 
+    be the 2nd field instead of the 5th. As pointed out by Matthew McGuire
+    <gray at shadowglade.net> this makes things more readable. Automatic
     conversion of old .listing files in /etc/desktop-profiles is provided.
 
  -- Bart Cornelis (cobaco) <cobaco at linux.be>  Thu,  3 Feb 2005 17:34:38 +0100
 
 desktop-profiles (1.3-2) unstable; urgency=low
 
-  * Documented in man page that profile name should be unique within each 
+  * Documented in man page that profile name should be unique within each
     .listing file.
 
  -- Bart Cornelis (cobaco) <cobaco at linux.be>  Wed,  2 Feb 2005 10:33:33 +0100

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/upstream/desktop-profiles.git

