--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package nvidia-graphics-drivers
+nvidia-graphics-drivers (340.46-5) unstable; urgency=medium
+
+ * nvidia-driver-bin: Breaks+Replaces nvidia-glx from wheezy.
darn, yet another file overwrite error
+ * libgles2-nvidia: Fix the SONAME symlink.
copy+paste error since I initially shipped libgles2-nvidia,
makes the nvidia-alternatives magic not work on libgles2-nvidia,
rendering the package useless without manual intervention
+ * nvidia-alternative: Ship /usr/share/nvidia (slave alternative location).
update-alternatives would fail if that directory is missing
(not a problem right now, but no guarantee that this will always be
there)
+ * New Dutch (nl) debconf translations by Frans Spiesschaert.
+ (Closes: #767492)
+ * README.source: Document the nks-history.git repository.
documentation+translation
+ * bug-script: Collect more information.
for better triaging bug reports
unblock nvidia-graphics-drivers/340.46-5
Thanks,
Andreas
diff -Nru nvidia-graphics-drivers-340.46/debian/README.source nvidia-graphics-drivers-340.46/debian/README.source
--- nvidia-graphics-drivers-340.46/debian/README.source 2014-10-17 12:34:34.000000000 +0200
+++ nvidia-graphics-drivers-340.46/debian/README.source 2014-11-09 14:50:43.000000000 +0100
@@ -50,6 +50,33 @@
-- Russ Allbery <rra@debian.org>, Tue, 6 Apr 2010 23:36:07 -0700
+Using the nks-history.git repository for upstreams changelog and the non-blob
+parts of the kernel module
+
+ This repository is intended to simplify extracting upstream changelog
+ updates and reimplementing the conftest.sh script as conftest.h.
+
+ To setup an initial clone of this repository run these two commands in
+ an empty directory:
+
+ git clone git+ssh://git.debian.org/git/pkg-nvidia/nks-history.git history
+ git clone git+ssh://git.debian.org/git/pkg-nvidia/nks-history.git --reference history -b scripts scripts
+
+ To importing the changelog and module source of a new release follow
+ these instructions:
+
+ * Change to the scripts directory.
+ * Edit 'versions'.
+ * Run ./00import-history
+ * Look at the imported history (in the ../history repository) e.g. using
+ gitk. If something was wrong or a parent was missing, edit 'versions'
+ and run ./00import-history again. Repeat until you are happy.
+ * Commit 'versions' and push both repositories (scripts and history).
+ * Update debian/changelog and conftest.h with data from nks-history.
+
+ -- Andreas Beckmann <anbe@debian.org> Sun, 09 Nov 2014 14:49:10 +0100
+
+
Importing a new upstream release that moved support for some legacy cards
to a new legacy driver
diff -Nru nvidia-graphics-drivers-340.46/debian/bug-script nvidia-graphics-drivers-340.46/debian/bug-script
--- nvidia-graphics-drivers-340.46/debian/bug-script 2014-10-22 00:17:27.000000000 +0200
+++ nvidia-graphics-drivers-340.46/debian/bug-script 2014-11-22 18:49:24.000000000 +0100
@@ -39,15 +39,25 @@
/etc/alternatives/*libGL* \
/etc/alternatives/*_gl_conf \
/etc/ld.so.conf.d/*_GL.conf \
+ /etc/X11/*.conf \
+ /usr/lib/libEGL.* \
/usr/lib/libGL.* \
+ /usr/lib/libGLES*.* \
/usr/lib/libGLcore* \
/usr/lib/libnvidia* \
+ /usr/lib/*-linux-gnu/libEGL.* \
/usr/lib/*-linux-gnu/libGL.* \
+ /usr/lib/*-linux-gnu/libGLES*.* \
/usr/lib/*-linux-gnu/libGLcore* \
/usr/lib/*-linux-gnu/libnvidia* \
/usr/lib32/libGL.* \
/usr/lib32/libGLcore* \
/usr/lib32/libnvidia* \
+ /usr/lib/xorg/modules/*glx* \
+ /usr/lib/xorg/modules/*/*glx* \
+ /usr/lib/xorg/modules/*nvidia* \
+ /usr/lib/xorg/modules/*/*nvidia* \
+ /var/log/Xorg.*.log* \
2>/dev/null
ls -la \
@@ -62,9 +72,7 @@
/usr/lib/mesa-diverted/*-linux-gnu/ \
/usr/lib32/nvidia/ \
/usr/lib32/nvidia/diversions/ \
- /etc/X11/{xorg,nvidia}.conf \
- /etc/X11/xorg.conf.d \
- /var/log/Xorg.*.log* \
+ /etc/X11/xorg.conf.d/ \
2>/dev/null
echo
diff -Nru nvidia-graphics-drivers-340.46/debian/changelog nvidia-graphics-drivers-340.46/debian/changelog
--- nvidia-graphics-drivers-340.46/debian/changelog 2014-10-30 23:48:00.000000000 +0100
+++ nvidia-graphics-drivers-340.46/debian/changelog 2014-11-22 18:49:24.000000000 +0100
@@ -1,3 +1,15 @@
+nvidia-graphics-drivers (340.46-5) unstable; urgency=medium
+
+ * nvidia-driver-bin: Breaks+Replaces nvidia-glx from wheezy.
+ * libgles2-nvidia: Fix the SONAME symlink.
+ * nvidia-alternative: Ship /usr/share/nvidia (slave alternative location).
+ * New Dutch (nl) debconf translations by Frans Spiesschaert.
+ (Closes: #767492)
+ * README.source: Document the nks-history.git repository.
+ * bug-script: Collect more information.
+
+ -- Andreas Beckmann <anbe@debian.org> Sat, 22 Nov 2014 18:47:36 +0100
+
nvidia-graphics-drivers (340.46-4) unstable; urgency=medium
* Fix installation of nvidia-smi. (Closes: #766343)
diff -Nru nvidia-graphics-drivers-340.46/debian/control nvidia-graphics-drivers-340.46/debian/control
--- nvidia-graphics-drivers-340.46/debian/control 2014-10-30 23:48:00.000000000 +0100
+++ nvidia-graphics-drivers-340.46/debian/control 2014-11-22 18:49:24.000000000 +0100
@@ -73,8 +73,10 @@
${nvidia}-driver,
Breaks:
${nvidia}-driver (<< 340.46-4~),
+ nvidia-glx${nvidia:Legacy} (<< 319),
Replaces:
${nvidia}-driver (<< 340.46-4~),
+ nvidia-glx${nvidia:Legacy} (<< 319),
Description: NVIDIA driver support binaries${nvidia:LegacyDesc}
The NVIDIA binary driver provides optimized hardware acceleration of
OpenGL applications via a direct-rendering X Server.
diff -Nru nvidia-graphics-drivers-340.46/debian/libgles2-nvidia.links.in nvidia-graphics-drivers-340.46/debian/libgles2-nvidia.links.in
--- nvidia-graphics-drivers-340.46/debian/libgles2-nvidia.links.in 2014-04-22 14:55:15.000000000 +0200
+++ nvidia-graphics-drivers-340.46/debian/libgles2-nvidia.links.in 2014-11-22 18:49:24.000000000 +0100
@@ -1 +1 @@
-#LIBDIR#/#PRIVATE#/libGLESv2.so.#VERSION# #LIBDIR#/#PRIVATE#/libGLESv2.so.1
+#LIBDIR#/#PRIVATE#/libGLESv2.so.#VERSION# #LIBDIR#/#PRIVATE#/libGLESv2.so.2
diff -Nru nvidia-graphics-drivers-340.46/debian/nvidia-alternative.dirs.in nvidia-graphics-drivers-340.46/debian/nvidia-alternative.dirs.in
--- nvidia-graphics-drivers-340.46/debian/nvidia-alternative.dirs.in 2014-10-20 10:33:33.000000000 +0200
+++ nvidia-graphics-drivers-340.46/debian/nvidia-alternative.dirs.in 2014-11-22 18:49:24.000000000 +0100
@@ -3,3 +3,4 @@
#LIBDIR#/vdpau
usr/share/applications
usr/share/man/man1
+usr/share/nvidia
diff -Nru nvidia-graphics-drivers-340.46/debian/nvidia-alternative.lintian-overrides.in nvidia-graphics-drivers-340.46/debian/nvidia-alternative.lintian-overrides.in
--- nvidia-graphics-drivers-340.46/debian/nvidia-alternative.lintian-overrides.in 2014-10-20 10:33:33.000000000 +0200
+++ nvidia-graphics-drivers-340.46/debian/nvidia-alternative.lintian-overrides.in 2014-11-22 18:49:24.000000000 +0100
@@ -5,3 +5,4 @@
package-contains-empty-directory #LIBDIR#/vdpau/
package-contains-empty-directory usr/share/applications/
package-contains-empty-directory usr/share/man/man1/
+package-contains-empty-directory usr/share/nvidia/
diff -Nru nvidia-graphics-drivers-340.46/debian/po/nl.po nvidia-graphics-drivers-340.46/debian/po/nl.po
--- nvidia-graphics-drivers-340.46/debian/po/nl.po 1970-01-01 01:00:00.000000000 +0100
+++ nvidia-graphics-drivers-340.46/debian/po/nl.po 2014-11-09 14:50:32.000000000 +0100
@@ -0,0 +1,65 @@
+# Dutch translation of nvidia-graphics-drivers debconf templates.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the nvidia-graphics-drivers package.
+# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: nvidia-graphics-drivers\n"
+"Report-Msgid-Bugs-To: nvidia-graphics-drivers@packages.debian.org\n"
+"POT-Creation-Date: 2014-10-20 02:45+0200\n"
+"PO-Revision-Date: 2014-10-21 21:23+0200\n"
+"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
+"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: boolean
+#. Description
+#. Translators, do not translate the ${substitution} ${variables}.
+#. ${vendor} will be substituted with 'NVIDIA' or 'Fglrx' (without quotes, of
+#. course), ${free_name} will become 'Nouveau' or 'Radeon' (no quotes, again)
+#. and the ${*driver} variables will be replaced with package names.
+#: ../libgl1-nvidia-glx.templates:3001
+msgid "Install ${vendor} driver despite unsupported graphics card?"
+msgstr ""
+"Toch het ${vendor}-stuurprogramma installeren, hoewel de grafische kaart "
+"niet ondersteund wordt?"
+
+#. Type: boolean
+#. Description
+#: ../libgl1-nvidia-glx.templates:3001
+msgid ""
+"This system has a graphics card which is no longer handled by the ${vendor} "
+"driver (package ${driver}). You may wish to keep the package installed - for "
+"instance to drive some other card - but the card with the following chipset "
+"won't be usable:"
+msgstr ""
+"Dit systeem heeft een grafische kaart die niet langer beheerd wordt door het "
+"stuurprogramma van ${vendor} (pakket ${driver}). Misschien wilt u het pakket "
+"geïnstalleerd houden - bijvoorbeeld om een andere kaart aan te sturen - maar "
+"de kaart met de volgende chipset zal niet bruikbaar zijn:"
+
+#. Type: boolean
+#. Description
+#: ../libgl1-nvidia-glx.templates:3001
+msgid ""
+"The above card requires either the non-free legacy ${vendor} driver (package "
+"${legacy_driver}) or the free ${free_name} driver (package ${free_driver})."
+msgstr ""
+"De hierboven vermelde kaart heeft ofwel het niet-vrije vroegere ${vendor}-"
+"stuurprogramma (pakket ${legacy_driver}) of het vrije ${free_name}-"
+"stuurprogramma (pakket ${free_driver}) nodig."
+
+#. Type: boolean
+#. Description
+#: ../libgl1-nvidia-glx.templates:3001
+msgid ""
+"Before the ${free_name} driver can be used you must remove ${vendor} "
+"configuration from xorg.conf (and xorg.conf.d/)."
+msgstr ""
+"Vooraleer u het ${free_name}-stuurprogramma kunt gebruiken, moet u de "
+"instellingen voor ${vendor} verwijderen uit xorg.conf (en xorg.conf.d/)."
--- End Message ---
--- Begin Message ---
On Sat, 2014-11-22 at 19:23 +0100, Andreas Beckmann wrote:
> +nvidia-graphics-drivers (340.46-5) unstable; urgency=medium
> +
> + * nvidia-driver-bin: Breaks+Replaces nvidia-glx from wheezy.
> darn, yet another file overwrite error
>
> + * libgles2-nvidia: Fix the SONAME symlink.
> copy+paste error since I initially shipped libgles2-nvidia,
> makes the nvidia-alternatives magic not work on libgles2-nvidia,
> rendering the package useless without manual intervention
>
> + * nvidia-alternative: Ship /usr/share/nvidia (slave alternative location).
> update-alternatives would fail if that directory is missing
> (not a problem right now, but no guarantee that this will always be
> there)
>
> + * New Dutch (nl) debconf translations by Frans Spiesschaert.
> + (Closes: #767492)
> + * README.source: Document the nks-history.git repository.
> documentation+translation
>
> + * bug-script: Collect more information.
> for better triaging bug reports
Unblocked.
Regards,
Adam
--- End Message ---