[debian-edu-commits] debian-edu/ 01/01: Drop all trailing white-spaces from this package.
Mike Gabriel
sunweaver at debian.org
Sat Aug 5 04:30:37 UTC 2017
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository debian-edu.
commit 39590d4a8db2e98337a633dd0f4862a9c934fe39
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sat Aug 5 00:30:32 2017 -0400
Drop all trailing white-spaces from this package.
---
Makefile | 4 ++--
debian/README.source | 6 +++---
debian/changelog | 13 +++++++------
debian/control | 2 +-
debian/control.stub | 2 +-
debian/copyright | 2 +-
desktop-directories/Astronomy.directory | 2 +-
menus/applications-merged/art.menu | 2 +-
menus/applications-merged/astronomy.menu | 2 +-
menus/applications-merged/biology.menu | 2 +-
menus/applications-merged/chemistry.menu | 2 +-
menus/applications-merged/computerscience.menu | 2 +-
menus/applications-merged/construction.menu | 2 +-
menus/applications-merged/economy.menu | 2 +-
menus/applications-merged/electricity.menu | 14 +++++++-------
menus/applications-merged/geography.menu | 2 +-
menus/applications-merged/geology.menu | 2 +-
menus/applications-merged/graphics.menu | 2 +-
menus/applications-merged/history.menu | 2 +-
menus/applications-merged/kids.menu | 4 ++--
menus/applications-merged/languages.menu | 2 +-
menus/applications-merged/literature.menu | 2 +-
menus/applications-merged/math.menu | 4 ++--
menus/applications-merged/miscellaneous.menu | 2 +-
menus/applications-merged/physics.menu | 2 +-
menus/applications-merged/robotics.menu | 2 +-
menus/applications-merged/sports.menu | 2 +-
menus/gnome-applications.menu | 2 +-
28 files changed, 45 insertions(+), 44 deletions(-)
diff --git a/Makefile b/Makefile
index a9c406a..72af73f 100755
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ dist:
make -f debian/rules get-orig-source
# This sed command removes gosa-plugin-netgroups from the list of Recommends and
# adds gosa-plugin-netgroups to Depends (# Closes: #793667)
- # (the implementation is a workaround for the missing feature
+ # (the implementation is a workaround for the missing feature
# in blends-dev tracked as #825172)
sed -i -e '/^ *gosa-plugin-netgroups,$$/d' \
-e '/^Package: education-main-server/{;N;N;N;N;s/\nDepends: [^\n]*/&, gosa-plugin-netgroups,/;}' \
@@ -17,7 +17,7 @@ dist:
# regenerate source tarball after d/control was changed
# (this is a symptom of the above being a workaround and
# why it should be implemented in blends-dev - also
- # compare the following line with the second line of this target…)
+ # compare the following line with the second line of this target…)
make -f debian/rules get-orig-source
# The following sed command does to things:
# workaround #845760: - use (= ${source:Version}) for arch:all depends
diff --git a/debian/README.source b/debian/README.source
index 79225f3..2e53fbf 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -38,7 +38,7 @@ The distribution field in debian/changelog has to have a valid value
Actually, while in development, it should be jessie-test while running
make-dist, then it should be changed back to unstable, then the tarball
has to be recreated(!), then debuild has to be run. The resulting
-binary packages can be uploaded to both the Skolelinux and the Debian
+binary packages can be uploaded to both the Skolelinux and the Debian
main archive.
This is documented in more detail in the documentation shipped by the
@@ -97,7 +97,7 @@ How to add packages to the Debian Edu DVD
-----------------------------------------
Here is a bit longer intro on how to add packages to the Debian Edu DVD.
-This assumes the package which is to be added already exists, either in
+This assumes the package which is to be added already exists, either in
Debian or in the Debian Edu APT repository, and that you have write
access to the debian edu source repository on alioth.debian.org.
@@ -122,7 +122,7 @@ access to the debian edu source repository on alioth.debian.org.
git diff
- 6) Test if the package still builds, as described above in the "Building a new
+ 6) Test if the package still builds, as described above in the "Building a new
version of this package" paragraph.
7) When the change is complete, commit it to Git, with an explanation
diff --git a/debian/changelog b/debian/changelog
index 2a2cb04..a056ac8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ debian-edu (1.925) UNRELEASED; urgency=medium
parseable.
* tasks/*: Don't break Enhances: field into multi-lines. Not supported
by blends-dev.
+ * Drop all trailing white-spaces from this package.
-- Mike Gabriel <sunweaver at debian.org> Fri, 04 Aug 2017 15:47:02 -0400
@@ -126,7 +127,7 @@ debian-edu (1.919) unstable; urgency=medium
* Add avogadro to tasks/chemistry and drop ghemical from it.
* Add education-desktop-mate and education-desktop-xfce with medium priority
- to tasks.ctl.
+ to tasks.ctl.
-- Holger Levsen <holger at debian.org> Tue, 31 Jan 2017 12:02:44 +0100
@@ -429,7 +430,7 @@ debian-edu (1.900) unstable; urgency=medium
debian-edu (1.812) unstable; urgency=high
* Drop education-desktop-sugar meta package, as Jessie will be released
- without sugar. (Closes: #782504)
+ without sugar. (Closes: #782504)
* Add cups-browsed to task-common, to support automatic printer discovery.
(Closes: #779645)
@@ -978,7 +979,7 @@ debian-edu (1.706) unstable; urgency=low
as BTS #705900. It should move back when the bugs is fixed.
* Recommend goplay in the desktop-other task, to make it easy for
users to find educational software in Debian.
- * Adjust to the many versions of celestia. Change astronomy task to
+ * Adjust to the many versions of celestia. Change astronomy task to
depend on celestia-kde | celestia-gnome | celestia-glut | celestia
instead of the dummy package celestia.
* Correct APT source codename in sources.list.wheezy-test, replace
@@ -1038,12 +1039,12 @@ debian-edu (1.704) unstable; urgency=low
* uploaded to the Debian Edu archive as 1.704~svn79605:
[ Wolfgang Schweer ]
- * Replace gdm with gdm3, cause gdm isn't available anymore:
+ * Replace gdm with gdm3, cause gdm isn't available anymore:
- Replace gdm with gdm3 in task files desktop-gnome, desktop-lxde,
and desktop-sugar.
- Replace gdm3 with lightdm in Avoid of task file desktop-lxde.
* Raise gosa-plugin-goto from Suggests to Depends, to be able to have more
- types than just net-devices when adding systems using GOsa². (More
+ types than just net-devices when adding systems using GOsa². (More
changes concerning this issue will take place in d-e-config.)
* Downgrade malted (task language) from Depends to Suggests, cause a
Debian package isn't available.
@@ -1079,7 +1080,7 @@ debian-edu (1.703) unstable; urgency=low
* Update sources.list.squeeze-test to reflect that squeeze is stable
remove references to non-US from sources.list.stable.
* Update debian-edu-tasks.desc and debian/control after running make-dist
- (which distribution set to wheezy-test in debian/changelog) and building
+ (which distribution set to wheezy-test in debian/changelog) and building
the resulting source archive. (This is described in README.source)
-- Holger Levsen <holger at debian.org> Sat, 02 Mar 2013 20:53:01 +0100
diff --git a/debian/control b/debian/control
index c6af414..3c5afcb 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Description: Debian Edu menu reorganization
A package to reorganizate menu branches in order to get a structure
easy to use for teachers and students.
.
- To activate the menu reorganization, a teachers or students group must
+ To activate the menu reorganization, a teachers or students group must
exist in the system and the user has to be a member of one of these two
groups.
diff --git a/debian/control.stub b/debian/control.stub
index 6693ba6..27b9705 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -34,7 +34,7 @@ Description: Debian Edu menu reorganization
A package to reorganizate menu branches in order to get a structure
easy to use for teachers and students.
.
- To activate the menu reorganization, a teachers or students group must
+ To activate the menu reorganization, a teachers or students group must
exist in the system and the user has to be a member of one of these two
groups.
diff --git a/debian/copyright b/debian/copyright
index b48e89f..91295fd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,7 +11,7 @@ Copyright:
For the pixmaps directory:
Copyright 2007 Junta de Extremadura and 2002 and following years
-KDE Artists. All the files are under LGPL. On Debian systems, the
+KDE Artists. All the files are under LGPL. On Debian systems, the
complete text of the LGPL license can be found in the
/usr/share/common-licenses/LGPL file.
diff --git a/desktop-directories/Astronomy.directory b/desktop-directories/Astronomy.directory
index ba5d56e..df57ff5 100644
--- a/desktop-directories/Astronomy.directory
+++ b/desktop-directories/Astronomy.directory
@@ -62,7 +62,7 @@ Name[sl]=Astronomija
Name[sq]=Atronomi
Name[sr]=Астрономија
Name[sv]=Astronomi
-Name[ta]=ஆகாயவெளி
+Name[ta]=ஆகாயவெளி
Name[tg]=Ситорашиносӣ
Name[th]=ดาราศาสตร์
Name[tl]=Astronomy
diff --git a/menus/applications-merged/art.menu b/menus/applications-merged/art.menu
index 3505232..eef7103 100644
--- a/menus/applications-merged/art.menu
+++ b/menus/applications-merged/art.menu
@@ -20,6 +20,6 @@
</Include>
</Menu> <!-- End Art -->
-
+
</Menu> <!-- End Education -->
</Menu> <!-- End Applications -->
diff --git a/menus/applications-merged/astronomy.menu b/menus/applications-merged/astronomy.menu
index cca529d..2acd471 100644
--- a/menus/applications-merged/astronomy.menu
+++ b/menus/applications-merged/astronomy.menu
@@ -16,6 +16,6 @@
</Include>
</Menu> <!-- End Astronomy -->
-
+
</Menu> <!-- End Education -->
</Menu> <!-- End Applications -->
diff --git a/menus/applications-merged/biology.menu b/menus/applications-merged/biology.menu
index 49afaef..adfb018 100644
--- a/menus/applications-merged/biology.menu
+++ b/menus/applications-merged/biology.menu
@@ -16,6 +16,6 @@
</Include>
</Menu> <!-- End Biology -->
-
+
</Menu> <!-- End Education -->
</Menu> <!-- End Applications -->
diff --git a/menus/applications-merged/chemistry.menu b/menus/applications-merged/chemistry.menu
index 16c9d3b..eb91d37 100644
--- a/menus/applications-merged/chemistry.menu
+++ b/menus/applications-merged/chemistry.menu
@@ -24,7 +24,7 @@
<Filename>gperiodic.desktop</Filename>
<Filename>kde-kalzium.desktop</Filename>
</Exclude>
-
+
</Menu> <!-- End Education -->
diff --git a/menus/applications-merged/computerscience.menu b/menus/applications-merged/computerscience.menu
index 66de929..fa0979e 100644
--- a/menus/applications-merged/computerscience.menu
+++ b/menus/applications-merged/computerscience.menu
@@ -16,6 +16,6 @@
</Include>
</Menu> <!-- End ComputerScience -->
-
+
</Menu> <!-- End Education -->
</Menu> <!-- End Applications -->
diff --git a/menus/applications-merged/construction.menu b/menus/applications-merged/construction.menu
index 05c9cdc..e19fa2c 100644
--- a/menus/applications-merged/construction.menu
+++ b/menus/applications-merged/construction.menu
@@ -16,6 +16,6 @@
</Include>
</Menu> <!-- End Construction -->
-
+
</Menu> <!-- End Education -->
</Menu> <!-- End Applications -->
diff --git a/menus/applications-merged/economy.menu b/menus/applications-merged/economy.menu
index c49409a..2fa3a42 100644
--- a/menus/applications-merged/economy.menu
+++ b/menus/applications-merged/economy.menu
@@ -17,7 +17,7 @@
</Include>
</Menu> <!-- End Economy -->
-
+
</Menu> <!-- End Education -->
diff --git a/menus/applications-merged/electricity.menu b/menus/applications-merged/electricity.menu
index 162c47d..20bc541 100644
--- a/menus/applications-merged/electricity.menu
+++ b/menus/applications-merged/electricity.menu
@@ -9,18 +9,18 @@
<Name>Electricity</Name>
<Directory>Electricity.directory</Directory>
<Include>
- <Filename>ksimus.desktop</Filename>
- <Filename>oregano.desktop</Filename>
- <Filename>kde-piklab.desktop</Filename>
- <Filename>qucs.desktop</Filename>
- <Filename>qcad.desktop</Filename>
+ <Filename>ksimus.desktop</Filename>
+ <Filename>oregano.desktop</Filename>
+ <Filename>kde-piklab.desktop</Filename>
+ <Filename>qucs.desktop</Filename>
+ <Filename>qcad.desktop</Filename>
<Or>
<Category>Electronics</Category>
<Category>Electricity</Category>
</Or>
</Include>
</Menu> <!-- End Electricity -->
-
+
</Menu> <!-- End Education -->
<Menu>
@@ -45,7 +45,7 @@
</Menu> <!-- End /usr/share/applnk/Applications -->
-
+
<Exclude>
<Filename>kde-ksimus.desktop</Filename>
</Exclude>
diff --git a/menus/applications-merged/geography.menu b/menus/applications-merged/geography.menu
index 4eb15d3..7fd3f93 100644
--- a/menus/applications-merged/geography.menu
+++ b/menus/applications-merged/geography.menu
@@ -29,6 +29,6 @@
<Exclude>
<Filename>kde-kgeography.desktop</Filename>
<Filename>kde4-marble.desktop</Filename>
- </Exclude>
+ </Exclude>
</Menu> <!-- End Education -->
</Menu> <!-- End Applications -->
diff --git a/menus/applications-merged/geology.menu b/menus/applications-merged/geology.menu
index fe7d452..94b87c0 100644
--- a/menus/applications-merged/geology.menu
+++ b/menus/applications-merged/geology.menu
@@ -16,6 +16,6 @@
</Include>
</Menu> <!-- End Geology -->
-
+
</Menu> <!-- End Education -->
</Menu> <!-- End Applications -->
diff --git a/menus/applications-merged/graphics.menu b/menus/applications-merged/graphics.menu
index fe44ed1..ae036ec 100644
--- a/menus/applications-merged/graphics.menu
+++ b/menus/applications-merged/graphics.menu
@@ -15,6 +15,6 @@
</Include>
</Menu> <!-- End Graphics -->
-
+
</Menu> <!-- End Education -->
</Menu> <!-- End Applications -->
diff --git a/menus/applications-merged/history.menu b/menus/applications-merged/history.menu
index 1d78277..1268724 100644
--- a/menus/applications-merged/history.menu
+++ b/menus/applications-merged/history.menu
@@ -16,6 +16,6 @@
</Include>
</Menu> <!-- End History -->
-
+
</Menu> <!-- End Education -->
</Menu> <!-- End Applications -->
diff --git a/menus/applications-merged/kids.menu b/menus/applications-merged/kids.menu
index c4a7194..0d59380 100644
--- a/menus/applications-merged/kids.menu
+++ b/menus/applications-merged/kids.menu
@@ -23,7 +23,7 @@
</And>
</Include>
</Menu> <!-- End Kids -->
-
+
<Menu>
<Name>Miscellaneous</Name>
<Exclude>
@@ -47,7 +47,7 @@
</Exclude>
-
+
</Menu> <!-- End Education -->
<Menu>
diff --git a/menus/applications-merged/languages.menu b/menus/applications-merged/languages.menu
index 47b3d7a..b7bd868 100644
--- a/menus/applications-merged/languages.menu
+++ b/menus/applications-merged/languages.menu
@@ -19,7 +19,7 @@
</Include>
</Menu> <!-- End Languages -->
-
+
</Menu> <!-- End Education -->
<Menu>
diff --git a/menus/applications-merged/literature.menu b/menus/applications-merged/literature.menu
index 3b0c0fc..fc7c34c 100644
--- a/menus/applications-merged/literature.menu
+++ b/menus/applications-merged/literature.menu
@@ -16,6 +16,6 @@
</Include>
</Menu> <!-- End Literature -->
-
+
</Menu> <!-- End Education -->
</Menu> <!-- End Applications -->
diff --git a/menus/applications-merged/math.menu b/menus/applications-merged/math.menu
index a846bc7..0eff7cc 100644
--- a/menus/applications-merged/math.menu
+++ b/menus/applications-merged/math.menu
@@ -30,14 +30,14 @@
</Menu> <!-- End Accesories -->
<Menu>
-
+
<Name>Games</Name>
<Exclude>
<Filename>MathWar.desktop</Filename>
<Filename>tuxmath.desktop</Filename>
</Exclude>
</Menu> <!-- End Games -->
-
+
<Menu>
<Name>Development</Name>
<Exclude>
diff --git a/menus/applications-merged/miscellaneous.menu b/menus/applications-merged/miscellaneous.menu
index 9d73ac7..787bb06 100644
--- a/menus/applications-merged/miscellaneous.menu
+++ b/menus/applications-merged/miscellaneous.menu
@@ -55,7 +55,7 @@
</Menu> <!-- End Miscellaneous -->
-
+
</Menu> <!-- End Education -->
<Menu>
diff --git a/menus/applications-merged/physics.menu b/menus/applications-merged/physics.menu
index 6970855..27bd68b 100644
--- a/menus/applications-merged/physics.menu
+++ b/menus/applications-merged/physics.menu
@@ -15,6 +15,6 @@
</Include>
</Menu> <!-- End Physics -->
-
+
</Menu> <!-- End Education -->
</Menu> <!-- End Applications -->
diff --git a/menus/applications-merged/robotics.menu b/menus/applications-merged/robotics.menu
index e2b2a53..bb88f64 100644
--- a/menus/applications-merged/robotics.menu
+++ b/menus/applications-merged/robotics.menu
@@ -16,6 +16,6 @@
</Include>
</Menu> <!-- End Robotics -->
-
+
</Menu> <!-- End Education -->
</Menu> <!-- End Applications -->
diff --git a/menus/applications-merged/sports.menu b/menus/applications-merged/sports.menu
index 97119e5..224ab78 100644
--- a/menus/applications-merged/sports.menu
+++ b/menus/applications-merged/sports.menu
@@ -16,6 +16,6 @@
</Include>
</Menu> <!-- End Sports -->
-
+
</Menu> <!-- End Education -->
</Menu> <!-- End Applications -->
diff --git a/menus/gnome-applications.menu b/menus/gnome-applications.menu
index ce337c7..72ecfec 100644
--- a/menus/gnome-applications.menu
+++ b/menus/gnome-applications.menu
@@ -62,7 +62,7 @@
<Filename>eagle.desktop</Filename>
<Filename>kompozer.desktop</Filename>
<Filename>kde-piklab.desktop</Filename>
- </Exclude>
+ </Exclude>
</Menu> <!-- End Development Tools -->
<!-- Education -->
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu.git
More information about the debian-edu-commits
mailing list