r8083 - in /packages/nvidia-graphics-drivers-legacy-340xx/trunk: ./ debian/ debian/module/debian/ debian/source/ debian/upstream/
anbe at users.alioth.debian.org
anbe at users.alioth.debian.org
Thu May 31 03:32:27 BST 2018
Author: anbe
Date: Thu May 31 02:32:27 2018
New Revision: 8083
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=8083
Log:
merge changes from n-g-d branches/340-stretch
Added:
packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/upstream/
- copied from r8082, packages/nvidia-graphics-drivers/branches/340-stretch/debian/upstream/
Modified:
packages/nvidia-graphics-drivers-legacy-340xx/trunk/ (props changed)
packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/README.source
packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/changelog
packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/control
packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/libgl1-nvidia-glx.docs
packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/module/debian/control.template.in
packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/nvidia-kernel-source.README.Debian.in
packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/nvidia-vdpau-driver.docs
packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/rules
packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/rules.defs
packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/source/lintian-overrides
Propchange: packages/nvidia-graphics-drivers-legacy-340xx/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 31 02:32:27 2018
@@ -1,6 +1,6 @@
-/packages/nvidia-graphics-drivers/branches/304:3148-3478,4676-7862
-/packages/nvidia-graphics-drivers/branches/304-jessie:3566-3819,6386-7866
-/packages/nvidia-graphics-drivers/branches/304-stretch:6398-7867
+/packages/nvidia-graphics-drivers/branches/304:3148-3478,4676-8071
+/packages/nvidia-graphics-drivers/branches/304-jessie:3566-3819,6386-8073
+/packages/nvidia-graphics-drivers/branches/304-stretch:6398-8074
/packages/nvidia-graphics-drivers/branches/304-wheezy:3714-5930
/packages/nvidia-graphics-drivers/branches/304.51:3420-3423
/packages/nvidia-graphics-drivers/branches/304.60:3473-3565
@@ -9,8 +9,8 @@
/packages/nvidia-graphics-drivers/branches/319:3826-4401
/packages/nvidia-graphics-drivers/branches/325:3946-4423
/packages/nvidia-graphics-drivers/branches/331:4424-4683
-/packages/nvidia-graphics-drivers/branches/340:5309-7867
-/packages/nvidia-graphics-drivers/branches/340-stretch:6394-7879
+/packages/nvidia-graphics-drivers/branches/340:5309-8074
+/packages/nvidia-graphics-drivers/branches/340-stretch:6394-8082
/packages/nvidia-graphics-drivers/branches/343:5012-6003
/packages/nvidia-graphics-drivers/branches/346:5168-6010
/packages/nvidia-graphics-drivers/branches/349:5393-6037
Modified: packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/README.source?rev=8083&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/README.source (original)
+++ packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/README.source Thu May 31 02:32:27 2018
@@ -12,11 +12,13 @@
may be different and may not support clean upgrades from/to the versions
uploaded in the archive.
+
Importing a New Upstream Release
- The *.orig.tar.gz file for nvidia-graphics-drivers contains just a
- directory named nvidia-graphics-drivers-<version> containing the
- upstream .run files for amd64, i386, and maybe armhf.
+ The orig tarballs for nvidia-graphics-drivers are split by
+ architecture. The *.orig.tar.gz file contains just an empty directory
+ and the *.orig-<arch>.tar.gz files contain the upstream .run file for
+ the corresponding architecture.
Everything else comes from the Subversion repository for the package.
Use the following steps to update to a new upstream release:
@@ -29,25 +31,13 @@
debchange --distribution UNRELEASED --newversion <version>-1
- * Download the driver archives and create a new .orig.tar.gz
+ * Download the driver archives and create new .orig*.tar.gz
debian/rules get-orig-source
- Alternatively do it manually:
- - Download the .run files for i386 and amd64 from upstream.
- - mkdir nvidia-graphics-drivers-<version>.orig and place package files
- in that directory. Make them executable. Then, create the orig
- tarball with:
- tar czvf nvidia-graphics-drivers_<version>.orig.tar.gz
+ * Add the new *.orig*.tar.gz to the tarballs directory in the svn
+ repository: svn://svn.debian.org/svn/pkg-nvidia/tarballs
- * For generating tarballs of older versions first set WATCH_VERSION in
- debian/rules.defs appropriately and regenerate debian/watch.
-
- * Edit debian/module/conftest.h if necessary for kernel compatibility
- and test.
-
- * Add the new *.orig.tar.gz to the tarballs directory in the svn
- repository: svn://svn.debian.org/svn/pkg-nvidia/tarballs
Building and Uploading
@@ -68,15 +58,15 @@
parts of the kernel module
This repository is intended to simplify extracting upstream changelog
- updates and reimplementing the conftest.sh script as conftest.h.
+ updates.
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
+ git clone https://salsa.debian.org/nvidia-team/nks-history.git history
+ git clone https://salsa.debian.org/nvidia-team/nks-history.git --reference history -b scripts scripts
- To importing the changelog and module source of a new release follow
+ To import the changelog and module source of a new release follow
these instructions:
* Change to the scripts directory.
@@ -86,7 +76,7 @@
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.
+ * Update debian/changelog with data from nks-history.
-- Andreas Beckmann <anbe at debian.org> Sun, 09 Nov 2014 14:49:10 +0100
Modified: packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/changelog?rev=8083&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/changelog Thu May 31 02:32:27 2018
@@ -1,3 +1,10 @@
+nvidia-graphics-drivers-legacy-340xx (340.106-3) UNRELEASED; urgency=medium
+
+ * Convert packaging repository from SVN to GIT.
+ * Bump Standards-Version to 4.1.4. No changes needed.
+
+ -- Andreas Beckmann <anbe at debian.org> Thu, 31 May 2018 04:21:34 +0200
+
nvidia-graphics-drivers-legacy-340xx (340.106-2~deb9u1) stretch; urgency=medium
* Rebuild for stretch.
Modified: packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/control?rev=8083&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/control Thu May 31 02:32:27 2018
@@ -7,8 +7,8 @@
Andreas Beckmann <anbe at debian.org>,
Vincent Cheng <vcheng at debian.org>,
Luca Boccassi <bluca at debian.org>,
-Vcs-Svn: svn://anonscm.debian.org/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-340xx/trunk
-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-340xx/
+Vcs-Browser: https://salsa.debian.org/nvidia-team/nvidia-graphics-drivers
+Vcs-Git: https://salsa.debian.org/nvidia-team/nvidia-graphics-drivers.git -b 340xx/master
Build-Depends:
debhelper (>= 10),
dpkg-dev (>= 1.18.8),
@@ -18,7 +18,7 @@
quilt,
po-debconf,
Rules-Requires-Root: no
-Standards-Version: 4.1.3
+Standards-Version: 4.1.4
Homepage: https://www.nvidia.com
XS-Autobuild: yes
@@ -678,4 +678,3 @@
.
This package provides the NVIDIA installable client driver (ICD) for OpenCL
which supports NVIDIA GPUs. This ICD supports OpenCL 1.x only.
-
Modified: packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/libgl1-nvidia-glx.docs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/libgl1-nvidia-glx.docs?rev=8083&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/libgl1-nvidia-glx.docs (original)
+++ packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/libgl1-nvidia-glx.docs Thu May 31 02:32:27 2018
@@ -1,2 +1,2 @@
debian/README.alternatives
-NVIDIA-Linux-i386/README.txt
+NVIDIA-Linux-amd64/README.txt
Modified: packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/module/debian/control.template.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/module/debian/control.template.in?rev=8083&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/module/debian/control.template.in (original)
+++ packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/module/debian/control.template.in Thu May 31 02:32:27 2018
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel at lists.alioth.debian.org>
Build-Depends: debhelper (>= 10), quilt
-Standards-Version: 4.1.3
+Standards-Version: 4.1.4
Homepage: https://www.nvidia.com/
Package: #NVIDIA#-kernel-#KVERS#
Modified: packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/nvidia-kernel-source.README.Debian.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/nvidia-kernel-source.README.Debian.in?rev=8083&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/nvidia-kernel-source.README.Debian.in (original)
+++ packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/nvidia-kernel-source.README.Debian.in Thu May 31 02:32:27 2018
@@ -111,7 +111,7 @@
7. Install the nvidia-kernel package:
- dpkg -i ../#NVIDIA#-kernel-2.6.14-2-k7_#VERSION#-1+_.Custom_i386.deb
+ dpkg -i ../#NVIDIA#-kernel-2.6.14-2-k7_#VERSION#-1+_.Custom_amd64.deb
( or similar filename )
Now see GENERAL NOTES below method #4
Modified: packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/nvidia-vdpau-driver.docs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/nvidia-vdpau-driver.docs?rev=8083&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/nvidia-vdpau-driver.docs (original)
+++ packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/nvidia-vdpau-driver.docs Thu May 31 02:32:27 2018
@@ -1 +1 @@
-NVIDIA-Linux-i386/README.txt
+NVIDIA-Linux-amd64/README.txt
Modified: packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/rules?rev=8083&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/rules Thu May 31 02:32:27 2018
@@ -15,10 +15,10 @@
LINUX_KMOD_TESTED ?=
NVIDIA_LEGACY_CHECK ?=
NVIDIA_SETTINGS ?= nvidia-settings$(legacy)
-ARCH_LIST ?= i386 amd64
+ARCH_LIST ?= amd64
ARCH_DEPS_i386 ?=
BLOB_ARCH_LIST ?= $(strip $(DEB_HOST_ARCH) $(ARCH_DEPS_$(DEB_HOST_ARCH)))
-UVM_ARCH_LIST ?= $(ARCH_LIST)
+NO_UVM_ARCH_LIST ?=
NVIDIA_RELEASE = $(DEB_VERSION_UPSTREAM)
version = $(NVIDIA_RELEASE)
@@ -28,7 +28,7 @@
libcuda1 = lib$(if $(legacy),$(nvidia)-)cuda1
module = nvidia-$(current)
current = $(if $(legacy),$(patsubst -%,%,$(legacy)),current)
-has_uvm = $(filter $(DEB_HOST_ARCH),$(UVM_ARCH_LIST))
+has_uvm = $(filter $(DEB_HOST_ARCH),$(filter-out $(NO_UVM_ARCH_LIST),$(ARCH_LIST)))
legacy = $(if $(NVIDIA_LEGACY),-legacy-$(NVIDIA_LEGACY)xx)
legacy_description = $(if $(NVIDIA_LEGACY), ($(NVIDIA_LEGACY)xx legacy version))
legacy_description_short = $(if $(NVIDIA_LEGACY), ($(NVIDIA_LEGACY)xx legacy))
@@ -94,7 +94,8 @@
.PHONY: autogen prepare patch
autogen: $(AUTOGEN)
-prepare: autogen unpack-stamp nvidia.ids compare-copyright-license
+prepare: autogen unpack-stamp
+prepare: nvidia.ids compare-copyright-license
patch: prepare
NVIDIA-Linux-%:
@@ -163,7 +164,8 @@
# - module-assistant and make-kpkg
# - dkms
.PHONY: install-into-tmp build-kernel-source-tree build-kernel-dkms-tree kernel-source-tree
-override_dh_auto_install: install-into-tmp build-kernel-source-tree build-kernel-dkms-tree
+override_dh_auto_install: install-into-tmp
+override_dh_auto_install: build-kernel-source-tree build-kernel-dkms-tree
install-into-tmp:
# "Install" into debian/tmp.
Modified: packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/rules.defs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/rules.defs?rev=8083&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/rules.defs (original)
+++ packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/rules.defs Thu May 31 02:32:27 2018
@@ -7,15 +7,15 @@
XORG_ABI_LIST = 23 20 19 18 15 14 13 12 11 10 8 6.0
XORG_BOUND = (<< 2:1.19.99)
-LINUX_KMOD_TESTED = 4.15
+LINUX_KMOD_TESTED = 4.16
LINUX_KMOD_TESTED_amd64 =
LINUX_KMOD_TESTED_i386 =
LINUX_KMOD_TESTED_armhf =
-ARCH_LIST = i386 amd64
+ARCH_LIST = amd64
+ARCH_LIST += i386
ARCH_LIST += armhf
ARCH_DEPS_i386 =
-UVM_ARCH_LIST = $(ARCH_LIST)
NVIDIA_DIRNAME_i386 = NVIDIA-Linux-x86-${NVIDIA_RELEASE}
NVIDIA_DIRNAME_amd64 = NVIDIA-Linux-x86_64-${NVIDIA_RELEASE}
Modified: packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/source/lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/source/lintian-overrides?rev=8083&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/source/lintian-overrides (original)
+++ packages/nvidia-graphics-drivers-legacy-340xx/trunk/debian/source/lintian-overrides Thu May 31 02:32:27 2018
@@ -6,6 +6,3 @@
# upstream provides no signatures
debian-watch-does-not-check-gpg-signature
-
-# false positive, see #726589
-version-substvar-for-external-package
More information about the pkg-nvidia-devel
mailing list