[debian-edu-commits] [Git][debian-edu/debian-edu][master] 11 commits: Clean up various tasks files from packages that have been removed from testing
WolfgangSchweer
gitlab at salsa.debian.org
Mon Jan 20 13:06:39 GMT 2020
WolfgangSchweer pushed to branch master at Debian Edu / debian-edu
Commits:
7705ed38 by Wolfgang Schweer at 2020-01-20T12:42:12+01:00
Clean up various tasks files from packages that have been removed from testing
and unstable.
- tasks/desktop-other: gimp-ufraw, gtk-recordmydesktop
- tasks/development: drpython
- tasks/misc: goplay
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
8004283e by Wolfgang Schweer at 2020-01-20T13:38:48+01:00
tasks/video: Replace openshot with openshot-qt.
(openshot-qt is the followup package, but hasn't migrated yet.)
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
d6735542 by Wolfgang Schweer at 2020-01-20T13:42:09+01:00
tasks/thin-client: Add some more recommends
Also recommend autofs, p910nd and xpdf to be able to access mass storage
devices and printers attached to thin clients.
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
86e4241b by Wolfgang Schweer at 2020-01-20T13:46:31+01:00
Update after running 'make dist'.
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
a725da99 by Wolfgang Schweer at 2020-01-20T13:48:01+01:00
Add changelog entries for last commits.
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
e45447c2 by Wolfgang Schweer at 2020-01-20T13:48:45+01:00
Trim trailing whitespace.
Fixes: lintian: file-contains-trailing-whitespace
See-also: https://lintian.debian.org/tags/file-contains-trailing-whitespace.html
- - - - -
cba62401 by Wolfgang Schweer at 2020-01-20T13:48:45+01:00
Use correct machine-readable copyright file URI.
Fixes: lintian: out-of-date-copyright-format
See-also: https://lintian.debian.org/tags/out-of-date-copyright-format.html
- - - - -
751f8a0c by Wolfgang Schweer at 2020-01-20T13:48:46+01:00
Remove duplicate line from changelog.
- - - - -
fee6e7ef by Wolfgang Schweer at 2020-01-20T13:50:16+01:00
Use secure URI in Homepage field.
Fixes: lintian: homepage-field-uses-insecure-uri
See-also: https://lintian.debian.org/tags/homepage-field-uses-insecure-uri.html
- - - - -
42872dfc by Wolfgang Schweer at 2020-01-20T13:50:17+01:00
Use canonical URL in Vcs-Git.
Fixes: lintian: vcs-field-not-canonical
See-also: https://lintian.debian.org/tags/vcs-field-not-canonical.html
- - - - -
89d6c9d3 by Wolfgang Schweer at 2020-01-20T13:59:48+01:00
debian/control and debian/control.stub: Update/adjust after running
'lintian-brush' and afterwards running 'make dist'.
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
9 changed files:
- debian/changelog
- debian/control
- debian/control.stub
- debian/copyright
- tasks/desktop-other
- tasks/development
- tasks/misc
- tasks/thin-client
- tasks/video
Changes:
=====================================
debian/changelog
=====================================
@@ -1,7 +1,24 @@
debian-edu (2.11.8) UNRELEASED; urgency=medium
+ [ Holger Levsen ]
* debian/control: Update after running 'make dist'.
+ [ Wolfgang Schweer ]
+ * Clean up various tasks files from packages that have been removed from
+ testing and unstable.
+ - tasks/desktop-other: gimp-ufraw, gtk-recordmydesktop
+ - tasks/development: drpython
+ - tasks/misc: goplay
+ * tasks/video:
+ - Replace openshot with openshot-qt.
+ * tasks/thin-client:
+ - Also recommend autofs, p910nd and xpdf to be able to access mass storage
+ devices and printers attached to thin clients.
+ * Trim trailing whitespace.
+ * Use correct machine-readable copyright file URI.
+ * Use secure URI in Homepage field.
+ * Use canonical URL in Vcs-Git.
+
-- Holger Levsen <holger at debian.org> Tue, 14 Jan 2020 15:12:16 +0100
debian-edu (2.11.7) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -11,9 +11,9 @@ Uploaders: Petter Reinholdtsen <pere at debian.org>,
Build-Depends: debhelper-compat (= 12), blends-dev
Standards-Version: 4.4.1
Rules-Requires-Root: no
-Vcs-Git: https://salsa.debian.org/debian-edu/debian-edu
+Vcs-Git: https://salsa.debian.org/debian-edu/debian-edu.git
Vcs-Browser: https://salsa.debian.org/debian-edu/debian-edu
-Homepage: http://www.skolelinux.org
+Homepage: https://www.skolelinux.org
XS-Comment: This is a specific package which contains a tasksel helper. It doesn't make sense to put it in tasks.
Package: education-tasks
@@ -349,10 +349,8 @@ Suggests: auctex,
fonts-arphic-uming,
fonts-mlym,
gettext,
- gimp-ufraw,
gnuplot,
gosa-desktop,
- gtk-recordmydesktop,
gv,
im-config,
jxplorer,
@@ -478,8 +476,7 @@ Recommends: anjuta,
subversion,
thonny,
umbrello
-Suggests: drpython,
- swi-prolog,
+Suggests: swi-prolog,
swi-prolog-doc,
tcl8.6-dev,
tk8.6-dev
@@ -813,7 +810,6 @@ Recommends: education-menus,
tilp2,
vym
Suggests: freeplane,
- goplay,
jclic
Description: Debian Edu miscellaneous applications for education
This metapackage depends on miscellaneous applications that can be useful
@@ -1053,15 +1049,18 @@ Section: metapackages
Architecture: any
Depends: ${misc:Depends},
education-tasks (= ${binary:Version})
-Recommends: console-setup,
+Recommends: autofs,
+ console-setup,
dbus-user-session,
initramfs-tools,
locales,
ltsp,
openssh-server,
+ p910nd,
pulseaudio,
x2goclient,
xinit,
+ xpdf,
xserver-xorg-core,
xserver-xorg-input-all,
xserver-xorg-video-all
@@ -1080,7 +1079,7 @@ Recommends: ffmpeg,
stopmotion
Suggests: kino,
libdvdcss2,
- openshot,
+ openshot-qt,
pitivi,
xine-ui
Description: Debian Edu video applications
=====================================
debian/control.stub
=====================================
@@ -10,9 +10,9 @@ Uploaders: Petter Reinholdtsen <pere at debian.org>,
Build-Depends: debhelper-compat (= 12), blends-dev
Standards-Version: 4.4.1
Rules-Requires-Root: no
-Vcs-Git: https://salsa.debian.org/debian-edu/debian-edu
+Vcs-Git: https://salsa.debian.org/debian-edu/debian-edu.git
Vcs-Browser: https://salsa.debian.org/debian-edu/debian-edu
-Homepage: http://www.skolelinux.org
+Homepage: https://www.skolelinux.org
XS-Comment: This is a specific package which contains a tasksel helper. It doesn't make sense to put it in tasks.
Package: education-tasks
@@ -36,4 +36,3 @@ Depends: ${misc:Depends}
Description: Debian Edu menu reorganization
A package to reorganize menu branches in order to get a structure
easy to use for teachers and students.
-
=====================================
debian/copyright
=====================================
@@ -1,4 +1,4 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Debian Edu (Pure Blend Metapackages and others)
Upstream-Contact: Debian Edu Team <debian-edu at lists.debian.org>
Source: https://salsa.debian.org/debian-edu/debian-edu
=====================================
tasks/desktop-other
=====================================
@@ -33,10 +33,6 @@ Recommends:
Recommends:
gimp,
gimp-data-extras,
- gimp-ufraw,
-
-Recommends:
- gtk-recordmydesktop,
Recommends:
standardskriver,
=====================================
tasks/development
=====================================
@@ -57,7 +57,6 @@ Recommends:
thonny
Recommends:
- drpython,
python3-easygui,
Recommends:
=====================================
tasks/misc
=====================================
@@ -30,6 +30,3 @@ Recommends:
Recommends:
planner,
-Recommends:
- goplay,
-
=====================================
tasks/thin-client
=====================================
@@ -7,16 +7,19 @@ Description: Debian Edu LTSP thin client packages
all LTSP thin client chroots in the Debian Edu Blend.
Recommends:
+ autofs,
console-setup,
dbus-user-session,
initramfs-tools,
locales,
ltsp,
openssh-server,
+ p910nd,
pulseaudio,
+ x2goclient,
+ xinit,
+ xpdf,
xserver-xorg-core,
xserver-xorg-input-all,
xserver-xorg-video-all,
- xinit,
- x2goclient,
NeedConfig: yes - preseeding and scripting
=====================================
tasks/video
=====================================
@@ -14,7 +14,7 @@ Recommends:
gstreamer1.0-plugins-ugly,
Recommends:
- openshot,
+ openshot-qt,
kdenlive,
stopmotion,
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/001b2e2fbe1811af796333f7573b4bd941d605eb...89d6c9d33e12efad40c1b9f34814d8750b1f1fb9
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/001b2e2fbe1811af796333f7573b4bd941d605eb...89d6c9d33e12efad40c1b9f34814d8750b1f1fb9
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20200120/a77e0a56/attachment-0001.html>
More information about the debian-edu-commits
mailing list