[debian-edu-commits] [Git][debian-edu/debian-edu][master] 7 commits: Fix desktop-directories/Music.directory
WolfgangSchweer
gitlab at salsa.debian.org
Mon Oct 1 19:26:56 BST 2018
WolfgangSchweer pushed to branch master at Debian Edu / debian-edu
Commits:
d5e76e59 by Wolfgang Schweer at 2018-10-01T18:03:51Z
Fix desktop-directories/Music.directory
Replace NAME with Name to let the translated directory names take effect.
- - - - -
89b746e0 by Wolfgang Schweer at 2018-10-01T18:06:02Z
Drop no longer available 'manpages-fr-extra' from tasks/tasks/lang-fr.
- - - - -
df5a3acb by Wolfgang Schweer at 2018-10-01T18:11:14Z
Rework debian/edu-tasksel-setup
Install task 'standard' (system utilities); only a few packages (doc-debian,
debian-faq, python3-gtkspellcheck, telnet) will be installed in addition on a
main server, which doesn't harm (like testing has shown).
It should ensure our configuration is put on top of a stock Debian system
with nothing missing. Also, maintaining tasks files should be a bit less
work this way.
- - - - -
60404be7 by Wolfgang Schweer at 2018-10-01T18:15:46Z
Cleanup from packages already installed via task 'standard'.
tasks/common
tasks/desktop-other
tasks/development
tasks/lang-he-desktop
tasks/language
tasks/main-server
- - - - -
c65660e5 by Wolfgang Schweer at 2018-10-01T18:23:05Z
Remove debian/education-desktop-{lxqt|mate|xfce}.lintian-overrides
It seems that these overrides are no longer needed; thanks lintian.
- - - - -
fbe6545f by Wolfgang Schweer at 2018-10-01T18:25:30Z
Updated after running 'make dist'.
- - - - -
ff4eb5c5 by Wolfgang Schweer at 2018-10-01T18:25:54Z
Document last commits in debian/changelog.
- - - - -
14 changed files:
- debian/changelog
- debian/control
- debian/edu-tasksel-setup
- − debian/education-desktop-lxqt.lintian-overrides
- − debian/education-desktop-mate.lintian-overrides
- − debian/education-desktop-xfce.lintian-overrides
- desktop-directories/Music.directory
- tasks/common
- tasks/desktop-other
- tasks/development
- tasks/lang-fr
- tasks/lang-he-desktop
- tasks/language
- tasks/main-server
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,28 @@
+debian-edu (2.10.37) UNRELEASED; urgency=medium
+
+ * Rework debian/edu-tasksel-setup:
+ - Install task 'standard' (system utilities); only a few packages
+ (doc-debian, debian-faq, python3-gtkspellcheck, telnet) will be installed
+ in addition on a main server, which doesn't harm (like testing has shown).
+ It should ensure our configuration is put on top of a stock Debian system
+ with nothing missing. Also, maintaining tasks files should be a bit less
+ work this way.
+ * Cleanup from packages already installed via task 'standard':
+ - tasks/common
+ - tasks/desktop-other
+ - tasks/development
+ - tasks/lang-he-desktop
+ - tasks/language
+ - tasks/main-server
+ * Fix desktop-directories/Music.directory: Replace NAME with Name to let the
+ translated directory names take effect.
+ * Drop no longer available 'manpages-fr-extra' from tasks/tasks/lang-fr.
+ * Remove debian/education-desktop-{lxqt|mate|xfce}.lintian-overrides:
+ - It seems that these overrides are no longer needed; thanks lintian.
+ * Updated after running 'make dist'.
+
+ -- Wolfgang Schweer <wschweer at arcor.de> Sun, 30 Sep 2018 21:48:12 +0200
+
debian-edu (2.10.36) unstable; urgency=medium
[ Wolfgang Schweer ]
=====================================
debian/control
=====================================
@@ -89,10 +89,7 @@ Section: metapackages
Architecture: any
Depends: ${misc:Depends},
education-tasks (= ${source:Version})
-Recommends: apt-listchanges,
- bash-completion,
- bc,
- bind9-host,
+Recommends: bc,
cifs-utils,
command-not-found,
convmv,
@@ -116,7 +113,6 @@ Recommends: apt-listchanges,
fping,
gdebi-core | gdebi,
hddtemp,
- hdparm,
hpijs-ppds,
hplip,
htop,
@@ -131,8 +127,6 @@ Recommends: apt-listchanges,
libwww-perl,
lshw,
lsscsi,
- man-db,
- manpages,
mc,
memtest86+,
mlocate,
@@ -144,7 +138,6 @@ Recommends: apt-listchanges,
nullidentd | ident-server,
openbsd-inetd,
openprinting-ppds,
- openssh-client,
pciutils,
printer-driver-gutenprint,
printer-driver-hpcups,
@@ -154,8 +147,6 @@ Recommends: apt-listchanges,
procinfo,
procmail,
psmisc,
- python3-reportbug,
- reportbug,
resolvconf,
rsync,
rsyslog,
@@ -165,9 +156,7 @@ Recommends: apt-listchanges,
sysfsutils,
tcpdump,
tcptraceroute,
- traceroute,
- vim,
- wget
+ vim
Suggests: apticron | cron-apt,
cpqarrayd,
debian-goodies,
@@ -423,7 +412,6 @@ Depends: ${misc:Depends},
education-tasks (= ${source:Version})
Recommends: alsa-utils,
avahi-daemon,
- bzip2,
cheese,
chromium,
chromium-ublock-origin,
@@ -463,7 +451,6 @@ Recommends: alsa-utils,
gimp-help-ru,
gimp-help-sv,
gimp-ufraw,
- gir1.2-vte-2.91,
gnupg,
gnupg-agent,
gsfonts-x11,
@@ -610,7 +597,6 @@ Suggests: auctex,
texlive-latex-recommended,
texlive-latex-recommended-doc,
texworks,
- wget,
wine,
xfonts-100dpi-transcoded,
xfonts-75dpi-transcoded,
@@ -682,7 +668,6 @@ Recommends: anjuta,
codeblocks,
ddd,
drpython,
- eclipse,
education-menus,
fp-compiler,
fp-docs,
@@ -705,14 +690,14 @@ Recommends: anjuta,
kturtle,
lazarus,
python-easygui,
- python3,
python3-pyqt5,
python3-tk,
sqlite3,
squeak-vm,
subversion,
umbrello
-Suggests: eclipse-cdt,
+Suggests: eclipse,
+ eclipse-cdt,
gambas3,
swi-prolog,
swi-prolog-doc,
@@ -853,7 +838,6 @@ Depends: ${misc:Depends},
education-tasks (= ${source:Version})
Recommends: debian-edu-doc-fr,
myspell-fr
-Suggests: manpages-fr-extra
Description: Debian Edu localizations for French installs
This subtask depends on various French packages to install when the French
language is selected during installation.
@@ -877,7 +861,6 @@ Depends: ${misc:Depends},
education-tasks (= ${source:Version})
Recommends: culmus,
firefox-esr-l10n-he,
- libfribidi0,
libreoffice-l10n-he,
thunderbird-l10n-he
Description: Debian Edu Desktop enhancements for Hebrew installs
@@ -1002,8 +985,7 @@ Section: metapackages
Architecture: any
Depends: ${misc:Depends},
education-tasks (= ${source:Version})
-Recommends: aspell,
- dict,
+Recommends: dict,
education-menus,
festival,
fonts-linex,
@@ -1147,7 +1129,6 @@ Recommends: apache2,
nagios-nrpe-plugin,
nfs-kernel-server,
ntp,
- openssl,
pxelinux,
samba,
samba-common-bin,
=====================================
debian/edu-tasksel-setup
=====================================
@@ -15,19 +15,10 @@ setup_tasksel_overrides() {
dpkg-divert --package debian-edu-install --rename --quiet \
--add /usr/lib/tasksel/tests/desktop
ln -sf ./desktop.edu /usr/lib/tasksel/tests/desktop
-
- # And for the standard system task too
- sed -e 's/^case/# Do not install standard system task - added by debian-edu-install\nexit 3\n\n&/' \
- < /usr/lib/tasksel/tests/new-install \
- > /usr/lib/tasksel/tests/new-install.edu
- chmod 755 /usr/lib/tasksel/tests/new-install.edu
- dpkg-divert --package debian-edu-install --rename --quiet \
- --add /usr/lib/tasksel/tests/new-install
- ln -sf ./new-install.edu /usr/lib/tasksel/tests/new-install
}
remove_tasksel_overrides() {
- for test in desktop new-install ; do
+ for test in desktop ; do
file=/usr/lib/tasksel/tests/$test
if [ -x $file.edu ] ; then
rm $file
=====================================
debian/education-desktop-lxqt.lintian-overrides deleted
=====================================
@@ -1 +0,0 @@
-education-desktop-lxqt binary: depends-on-metapackage recommends: xorg
=====================================
debian/education-desktop-mate.lintian-overrides deleted
=====================================
@@ -1 +0,0 @@
-education-desktop-mate binary: depends-on-metapackage recommends: xorg
=====================================
debian/education-desktop-xfce.lintian-overrides deleted
=====================================
@@ -1 +0,0 @@
-education-desktop-xfce binary: depends-on-metapackage recommends: xorg
=====================================
desktop-directories/Music.directory
=====================================
@@ -3,74 +3,74 @@ Encoding=UTF-8
Type=Directory
Icon=edu-music
Name=Music
-NAME[af]=Musiek
-NAME[an]=Mosica
-NAME[ar]=الموسيقى
-NAME[ast]=Música
-NAME[as]=সংগীত
-NAME[be at latin]=Muzyka
-NAME[be]=Музыка
-NAME[bg]=Музика
-NAME[br]=Sonerezh
-NAME[ca]=Música
-NAME[crh]=Musıqi
-NAME[cs]=Hudba
-NAME[da]=Musik
-NAME[de]=Musik
-NAME[el]=Μουσική
-NAME[eo]=Muziko
-NAME[es]=Música
-NAME[et]=Muusika
-NAME[eu]=Musika
-NAME[fa]=موسیقی
-NAME[fi]=Musiikki
-NAME[fr]=Musique
-NAME[ga]=Ceol
-NAME[gl]=Música
-NAME[gu]=સંગીત
-NAME[he]=מוסיקה
-NAME[hi]=संगीत
-NAME[hr]=Glazba
-NAME[hu]=Zenék
-NAME[ia]=Musica
-NAME[id]=Musik
-NAME[is]=Tónlist
-NAME[it]=Musica
-NAME[ja]=音楽
-NAME[kk]=Музыка
-NAME[kn]=ಸಂಗೀತ
-NAME[ko]=음악
-NAME[ku]=Muzîk
-NAME[ky]=Музыка
-NAME[lt]=Muzika
-NAME[lv]=Mūzika
-NAME[mk]=Музика
-NAME[ml]=സംഗീതം
-NAME[mr]=संगीत
-NAME[nb]=Musikk
-NAME[nds]=Musik
-NAME[nl]=Muziek
-NAME[nn]=Musikk
-NAME[or]=ସଙ୍ଗୀତ
-NAME[pa]=ਸੰਗੀਤ
-NAME[pl]=Muzyka
-NAME[ps]=ټنګټکور
-NAME[pt_BR]=Música
-NAME[pt]=Música
-NAME[ro]=Muzică
-NAME[ru]=Музыка
-NAME[sk]=Hudba
-NAME[sl]=Glasba
-NAME[sq]=Muzikë
-NAME[sr at Latn]=Muzika
-NAME[sr]=Музика
-NAME[sv]=Musik
-NAME[ta]=இசை
-NAME[te]=సంగీతం
-NAME[th]=ดนตรี
-NAME[tr]=Müzik
-NAME[uk]=Музика
-NAME[vi]=Nhạc
-NAME[zh_CN]=音乐
-NAME[zh_HK]=音樂
-NAME[zh_TW]=音樂
+Name[af]=Musiek
+Name[an]=Mosica
+Name[ar]=الموسيقى
+Name[ast]=Música
+Name[as]=সংগীত
+Name[be at latin]=Muzyka
+Name[be]=Музыка
+Name[bg]=Музика
+Name[br]=Sonerezh
+Name[ca]=Música
+Name[crh]=Musıqi
+Name[cs]=Hudba
+Name[da]=Musik
+Name[de]=Musik
+Name[el]=Μουσική
+Name[eo]=Muziko
+Name[es]=Música
+Name[et]=Muusika
+Name[eu]=Musika
+Name[fa]=موسیقی
+Name[fi]=Musiikki
+Name[fr]=Musique
+Name[ga]=Ceol
+Name[gl]=Música
+Name[gu]=સંગીત
+Name[he]=מוסיקה
+Name[hi]=संगीत
+Name[hr]=Glazba
+Name[hu]=Zenék
+Name[ia]=Musica
+Name[id]=Musik
+Name[is]=Tónlist
+Name[it]=Musica
+Name[ja]=音楽
+Name[kk]=Музыка
+Name[kn]=ಸಂಗೀತ
+Name[ko]=음악
+Name[ku]=Muzîk
+Name[ky]=Музыка
+Name[lt]=Muzika
+Name[lv]=Mūzika
+Name[mk]=Музика
+Name[ml]=സംഗീതം
+Name[mr]=संगीत
+Name[nb]=Musikk
+Name[nds]=Musik
+Name[nl]=Muziek
+Name[nn]=Musikk
+Name[or]=ସଙ୍ଗୀତ
+Name[pa]=ਸੰਗੀਤ
+Name[pl]=Muzyka
+Name[ps]=ټنګټکور
+Name[pt_BR]=Música
+Name[pt]=Música
+Name[ro]=Muzică
+Name[ru]=Музыка
+Name[sk]=Hudba
+Name[sl]=Glasba
+Name[sq]=Muzikë
+Name[sr at Latn]=Muzika
+Name[sr]=Музика
+Name[sv]=Musik
+Name[ta]=இசை
+Name[te]=సంగీతం
+Name[th]=ดนตรี
+Name[tr]=Müzik
+Name[uk]=Музика
+Name[vi]=Nhạc
+Name[zh_CN]=音乐
+Name[zh_HK]=音樂
+Name[zh_TW]=音樂
=====================================
tasks/common
=====================================
@@ -17,9 +17,6 @@ Suggests:
Recommends:
procinfo,
-Recommends:
- openssh-client,
-
Recommends:
vim,
@@ -31,12 +28,8 @@ Recommends:
openbsd-inetd,
Recommends:
- man-db,
- manpages,
ethtool,
- hdparm,
pciutils,
- apt-listchanges,
debian-archive-keyring,
resolvconf,
psmisc,
@@ -57,20 +50,11 @@ Suggests:
debsecan,
Recommends:
- reportbug,
-
-Recommends:
- python3-reportbug,
-
-Recommends:
- bind9-host,
- traceroute,
tcptraceroute,
iftop,
less,
tcpdump,
bc,
- wget,
strace,
nmap,
eject,
@@ -157,9 +141,6 @@ Recommends:
Suggests:
printer-driver-foo2zjs,
-Recommends:
- bash-completion,
-
Recommends:
cifs-utils,
=====================================
tasks/desktop-other
=====================================
@@ -161,7 +161,6 @@ Recommends:
Recommends:
unzip,
zip,
- bzip2,
Recommends:
isc-dhcp-client,
@@ -174,7 +173,6 @@ Suggests:
Suggests:
ncftp,
- wget,
Suggests:
kig,
@@ -327,7 +325,6 @@ Recommends:
NeedConfig: yes - the site admin needs to put printers and networks into /etc/standardskriver.cfg
Recommends:
- gir1.2-vte-2.91,
kvpm
Recommends:
=====================================
tasks/development
=====================================
@@ -57,7 +57,6 @@ Recommends:
squeak-vm,
Recommends:
- python3,
idle3,
thonny
=====================================
tasks/lang-fr
=====================================
@@ -9,6 +9,5 @@ Description: Debian Edu localizations for French installs
Recommends:
myspell-fr,
- manpages-fr-extra,
debian-edu-doc-fr,
=====================================
tasks/lang-he-desktop
=====================================
@@ -9,7 +9,6 @@ Description: Debian Edu Desktop enhancements for Hebrew installs
installations.
Recommends:
- libfribidi0,
culmus,
libreoffice-l10n-he,
firefox-esr-l10n-he,
=====================================
tasks/language
=====================================
@@ -14,7 +14,6 @@ Recommends:
kanagram,
trans-de-en,
dict,
- aspell,
wordnet,
khangman,
klettres,
=====================================
tasks/main-server
=====================================
@@ -49,7 +49,6 @@ Recommends:
Recommends:
slapd,
- openssl,
libnss3-tools,
NeedConfig: yes - generate certificates for ssl/tls support
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/ca166173cfb10dacd7f128160e9fab9c22a2761a...ff4eb5c5d320d9a8d20986f7b1383effbd649386
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/ca166173cfb10dacd7f128160e9fab9c22a2761a...ff4eb5c5d320d9a8d20986f7b1383effbd649386
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/20181001/47f98047/attachment-0001.html>
More information about the debian-edu-commits
mailing list