Quoting Steven Chamberlain (steven@pyro.eu.org):
> Control: tags -1 = d-i patch
>
> On 08/04/13 16:21, Julien Cristau wrote:
> > AFAIK that has been reverted.
>
> Oh it has, thanks. The purpose of the branches makes sense now.
>
> Attached is a patch for master, and with the right bug number this time.
After some resyncing in master (it still had the "drop menu" change),
I come up with the attached debdiff wrt 3.14+nmu1.
Basically:
[ Christian Perrier ]
* Add iw package to Recommends for the laptop and desktop tasks,
so that the 'iw' command is available to users.
Closes: #697890
[ Kenshi Muto ]
* Add mozc-utils-gui to japanese-desktop.
[ Steven Chamberlain ]
* Downgrade network-manager-gnome to Recommends, because a
Depends relation could only be satisfied on [linux-any]
(Closes: #704748)
[ Thijs Kinkhorst ]
* Language cleanups in Dutch translations.
kmuto change and l10n changes can of course be dropped if we very
strictly want to stick to the RC issue. I would prefer keeping them if
we can.
diff -Nru tasksel-3.14+nmu1/debian/changelog tasksel-3.15/debian/changelog
--- tasksel-3.14+nmu1/debian/changelog 2013-01-31 19:19:56.000000000 +0100
+++ tasksel-3.15/debian/changelog 2013-04-09 10:37:41.000000000 +0200
@@ -1,3 +1,23 @@
+tasksel (3.15) UNRELEASED; urgency=low
+
+ [ Christian Perrier ]
+ * Add iw package to Recommends for the laptop and desktop tasks,
+ so that the 'iw' command is available to users.
+ Closes: #697890
+
+ [ Kenshi Muto ]
+ * Add mozc-utils-gui to japanese-desktop.
+
+ [ Steven Chamberlain ]
+ * Downgrade network-manager-gnome to Recommends, because a
+ Depends relation could only be satisfied on [linux-any]
+ (Closes: #704748)
+
+ [ Thijs Kinkhorst ]
+ * Language cleanups in Dutch translations.
+
+ -- Christian Perrier <bubulle@debian.org> Mon, 25 Feb 2013 07:17:51 +0100
+
tasksel (3.14+nmu1) unstable; urgency=low
[ Julien Cristau ]
diff -Nru tasksel-3.14+nmu1/debian/control tasksel-3.15/debian/control
--- tasksel-3.14+nmu1/debian/control 2013-01-31 19:17:35.000000000 +0100
+++ tasksel-3.15/debian/control 2013-04-09 10:39:06.000000000 +0200
@@ -57,6 +57,8 @@
libgl1-mesa-dri,
# Make sure that CDs etc can be ejected. May not be installed by d-i.
eject,
+# wireless networking tools (they're more and more used on desktops too)
+ iw,
# sound
alsa-utils,
alsa-base,
@@ -72,9 +74,7 @@
Depends: ${misc:Depends},
task-desktop,
# only depend on a very minimal gnome desktop, to ensure it fits on CD1
- gnome-core,
-# but we need a working network setup at least
- network-manager-gnome
+ gnome-core
Recommends:
# The full gnome desktop environment should be included if possible
# even if the larger gnome metapackage doesn't fit.
@@ -100,6 +100,8 @@
hunspell-en-us,
# make hyphenation work
hyphen-en-us,
+# we need a working network setup at least
+ network-manager-gnome
Package: task-kde-desktop
Architecture: all
@@ -256,8 +258,11 @@
acpi,
acpi-support,
pcmciautils,
+# wireless networking tools
+ iw,
wireless-tools,
wpasupplicant,
+#
avahi-autoipd,
bluetooth,
powertop,
@@ -1488,6 +1493,7 @@
uim,
uim-anthy,
uim-mozc,
+ mozc-utils-gui,
anthy,
libreoffice-l10n-ja,
libreoffice-help-ja,
diff -Nru tasksel-3.14+nmu1/.gitattributes tasksel-3.15/.gitattributes
--- tasksel-3.14+nmu1/.gitattributes 1970-01-01 01:00:00.000000000 +0100
+++ tasksel-3.15/.gitattributes 2013-04-09 08:09:39.000000000 +0200
@@ -0,0 +1 @@
+debian/changelog merge=dpkg-mergechangelogs
diff -Nru tasksel-3.14+nmu1/po/nl.po tasksel-3.15/po/nl.po
--- tasksel-3.14+nmu1/po/nl.po 2013-01-31 19:17:35.000000000 +0100
+++ tasksel-3.15/po/nl.po 2013-04-09 08:07:58.000000000 +0200
@@ -1,14 +1,13 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# Dutch
+# Translation file for tasksel to Dutch
+# Copyright (C) 2013 Free Software Foundation, Inc.
msgid ""
msgstr ""
"Project-Id-Version: Taksel\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-06-21 11:36-0400\n"
-"PO-Revision-Date: 2006-01-07 00:44+0100\n"
-"Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
+"PO-Revision-Date: 2013-03-09 08:53+0100\n"
+"Last-Translator: Thijs Kinkhorst <thijs@debian.org>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
@@ -30,12 +29,12 @@
"Gebruik:\n"
"tasksel install <taak>...\n"
"tasksel remove <taak>...\n"
-"tasksel [opties];\n"
-"\t-t, --test test-modus, enkel simuleren niet echt uitvoeren\n"
-"\t --new-install automatische installatie van een aantal taken\n"
-"\t --list-tasks geef een lijst weer taken en sluit daarna af\n"
-"\t --task-packages geef de beschikbare pakketten van een taak weer\n"
-"\t --task-desc geef de beschrijving van een taak weer\n"
+"tasksel [opties]\n"
+"\t-t, --test test-modus, enkel simuleren, niet echt uitvoeren\n"
+"\t --new-install automatische installatie van een aantal taken\n"
+"\t --list-tasks toon een lijst van taken en sluit daarna af\n"
+"\t --task-packages toon de beschikbare pakketten van een taak\n"
+"\t --task-desc toon de beschrijving van een taak\n"
#: ../tasksel.pl:635
msgid "apt-get failed"
diff -Nru tasksel-3.14+nmu1/tasks/po/nl.po tasksel-3.15/tasks/po/nl.po
--- tasksel-3.14+nmu1/tasks/po/nl.po 2013-01-31 19:17:35.000000000 +0100
+++ tasksel-3.15/tasks/po/nl.po 2013-04-09 08:07:58.000000000 +0200
@@ -8,8 +8,8 @@
"Project-Id-Version: tasksel_2.81_nl\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-06-09 08:27+0000\n"
-"PO-Revision-Date: 2010-03-08 21:01+0100\n"
-"Last-Translator: Frans Pop <elendil@planet.nl>\n"
+"PO-Revision-Date: 2013-03-06 22:06+0100\n"
+"Last-Translator: Thijs Kinkhorst <thijs@debian.org>\n"
"Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@
#. Description
#: ../po/debian-tasks.desc:12001
msgid "Standard system utilities"
-msgstr "Standaard systeem hulpmiddelen"
+msgstr "Standaard systeemhulpmiddelen"
#. Description
#: ../po/debian-tasks.desc:12001
@@ -32,136 +32,3 @@
"Deze taak creëert een basale gebruikersomgeving en voorziet in een redelijk "
"kleine selectie van diensten en hulpmiddelen bruikbaar vanaf de "
"opdrachtregel."
-
-#~ msgid "manual package selection"
-#~ msgstr "handmatige pakketselectie"
-
-#~ msgid "Manually select packages to install in aptitude."
-#~ msgstr "Te installeren pakketten handmatig selecteren via aptitude."
-
-#~ msgid "SQL database"
-#~ msgstr "SQL-database"
-
-#~ msgid ""
-#~ "This task selects client and server packages for the PostgreSQL database."
-#~ msgstr ""
-#~ "Deze taak selecteert de client- en serverpakketten van de PostgreSQL-"
-#~ "database."
-
-#~ msgid ""
-#~ "PostgreSQL is an SQL relational database, offering increasing SQL92 "
-#~ "compliance and some SQL3 features. It is suitable for use with multi-"
-#~ "user database access, through its facilities for transactions and fine-"
-#~ "grained locking."
-#~ msgstr ""
-#~ "PostgreSQL is een relationele SQL-database, die een groeiende SQL92 en "
-#~ "SQL3 ondersteuning biedt. PostgreSQL is geschikt voor databasetoegang met "
-#~ "meerdere gebruikers, wegens de faciliteiten voor transacties en "
-#~ "fijnkorrelige vergrendeling"
-
-#~ msgid "Graphical desktop environment"
-#~ msgstr "Grafische bureaubladomgeving"
-
-#~ msgid ""
-#~ "This task provides basic desktop software and serves as a basis for the "
-#~ "GNOME and KDE desktop tasks."
-#~ msgstr ""
-#~ "Deze taak voorziet in de basis grafische software en bied een basis voor "
-#~ "de KDE- en GNOME- omgevingtaken"
-
-#~ msgid "DNS server"
-#~ msgstr "DNS-server"
-
-#~ msgid ""
-#~ "Selects the BIND DNS server, and related documentation and utility "
-#~ "packages."
-#~ msgstr ""
-#~ "Deze taak selecteert de BIND DNS-server, en de toepasselijke documentatie "
-#~ "en hulpprogramma's."
-
-#~ msgid "File server"
-#~ msgstr "Bestandsserver"
-
-#~ msgid ""
-#~ "This task sets up your system to be a file server, supporting both CIFS "
-#~ "and NFS."
-#~ msgstr ""
-#~ "Deze taak stelt uw systeem in om als bestandsserver (ondersteuning voor "
-#~ "zowel CIFS als NFS) te functioneren"
-
-#~ msgid "GNOME desktop environment"
-#~ msgstr "GNOME desktop"
-
-#~ msgid ""
-#~ "This task provides basic \"desktop\" software using the GNOME desktop "
-#~ "environment."
-#~ msgstr ""
-#~ "Deze taak voorziet in de basis grafische software voor de GNOME-omgeving"
-
-#~ msgid "KDE desktop environment"
-#~ msgstr "KDE desktop"
-
-#~ msgid ""
-#~ "This task provides basic \"desktop\" software using the K Desktop "
-#~ "Environment."
-#~ msgstr ""
-#~ "Deze taak voorziet in de basis grafische software voor de KDE-omgeving"
-
-#~ msgid "Laptop"
-#~ msgstr "Laptop"
-
-#~ msgid "This task installs software useful for a laptop."
-#~ msgstr "Deze taak installeert software die nuttig is op een laptop."
-
-#~ msgid "LXDE desktop environment"
-#~ msgstr "LXDE desktop"
-
-#~ msgid ""
-#~ "This task provides basic \"desktop\" software using the LXDE desktop "
-#~ "environment."
-#~ msgstr ""
-#~ "Deze taak voorziet in de basis grafische software voor de LXDE-omgeving"
-
-#~ msgid "Mail server"
-#~ msgstr "E-mail-server"
-
-#~ msgid ""
-#~ "This task selects a variety of package useful for a general purpose mail "
-#~ "server system."
-#~ msgstr ""
-#~ "Deze taak selecteert een aantal pakketten nuttig voor een normaal e-mail-"
-#~ "server systeem."
-
-#~ msgid "Print server"
-#~ msgstr "Printserver"
-
-#~ msgid "This task sets up your system to be a print server."
-#~ msgstr "Deze taak stelt uw systeem in om als printserver te dienen"
-
-#~ msgid "SSH server"
-#~ msgstr "SSH-server"
-
-#~ msgid ""
-#~ "This task sets up your system to be remotely accessed through SSH "
-#~ "connections."
-#~ msgstr ""
-#~ "Deze taak stelt uw systeem in voor toegang op afstand via SSH-"
-#~ "verbindingen."
-
-#~ msgid "Web server"
-#~ msgstr "Webserver"
-
-#~ msgid ""
-#~ "This task selects packages useful for a general purpose web server system."
-#~ msgstr ""
-#~ "Deze taak selecteert die pakketten nodig om dit systeem te laten "
-#~ "functioneren als een normale webserver."
-
-#~ msgid "Xfce desktop environment"
-#~ msgstr "Xfce desktop"
-
-#~ msgid ""
-#~ "This task provides basic \"desktop\" software using the Xfce desktop "
-#~ "environment."
-#~ msgstr ""
-#~ "Deze taak voorziet in de basis grafische software voor de Xfce-omgeving"
Attachment:
signature.asc
Description: Digital signature