r8075 - in /packages/nvidia-graphics-drivers/branches/340-stretch: ./ debian/changelog debian/control

[anbe at users.alioth.debian.org]

Author: anbe
Date: Thu May 31 00:04:12 2018
New Revision: 8075

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=8075
Log:
merge changes from branches/340 and branches/304-stretch

Modified:
    packages/nvidia-graphics-drivers/branches/340-stretch/   (props changed)
    packages/nvidia-graphics-drivers/branches/340-stretch/debian/changelog
    packages/nvidia-graphics-drivers/branches/340-stretch/debian/control

Propchange: packages/nvidia-graphics-drivers/branches/340-stretch/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Thu May 31 00:04:12 2018
@@ -1,6 +1,6 @@
-/packages/nvidia-graphics-drivers/branches/304:3148-3478,4676-7986
-/packages/nvidia-graphics-drivers/branches/304-jessie:3566-3819,6386-7991
-/packages/nvidia-graphics-drivers/branches/304-stretch:6398-7992
+/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,5 +9,5 @@
 /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:6394-7992
+/packages/nvidia-graphics-drivers/branches/340:6394-8074
 /packages/nvidia-graphics-drivers/branches/jessie:5163-5181

Modified: packages/nvidia-graphics-drivers/branches/340-stretch/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/340-stretch/debian/changelog?rev=8075&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/340-stretch/debian/changelog	(original)
+++ packages/nvidia-graphics-drivers/branches/340-stretch/debian/changelog	Thu May 31 00:04:12 2018
@@ -1,4 +1,4 @@
-nvidia-graphics-drivers (340.106-1~svn4deb9stretch) UNRELEASED; urgency=medium
+nvidia-graphics-drivers (340.106-2~git4deb9stretch) UNRELEASED; urgency=medium
 
   * nvidia-driver-libs: New metapackage for bundling the
     Depends/Recommends on the OpenGL/GLX/EGL/GLES packages.
@@ -21,7 +21,7 @@
   * disable-preempt_rt_sanity_check.patch: Remove, unsupported upstream.
   * build-module-packages.sh: Skip PREEMPT_RT (*-rt-*) kernels, unsupported
     upstream (375.82-2).
-  * Bump Standards-Version to 4.1.3. No changes needed.
+  * Bump Standards-Version to 4.1.4. No changes needed.
   * nvidia-alternative: Explicitly use interest-await triggers (375.82-2).
   * Switch from dh_install --list-missing to dh_missing (375.82-2).
   * Use dpkg makefile snippets instead of manual changelog parsing (375.82-2).
@@ -29,6 +29,12 @@
   * Add #tls# substitution for the tls/ source directory (384.111-1).
 
  -- Andreas Beckmann <anbe at debian.org>  Wed, 17 Jan 2018 16:47:43 +0100
+
+nvidia-graphics-drivers (340.106-2~git4deb8jessie) UNRELEASED; urgency=medium
+
+  * Convert packaging repository from SVN to GIT.
+
+ -- Andreas Beckmann <anbe at debian.org>  Thu, 31 May 2018 01:43:43 +0200
 
 nvidia-graphics-drivers (340.106-1) jessie; urgency=medium
 
@@ -1900,6 +1906,7 @@
   * Use https:// URLs where possible (375.82-8).
   * nvidia-kernel-{dkms,source}: Mention the supported architecture(s) in the
     long Description (384.111-4).
+  * Convert packaging repository from SVN to GIT.
 
   [ Luca Boccassi ]
   * Switch to my debian.org email address in Uploaders.
@@ -5896,4 +5903,3 @@
     <mmagallo at debian.org>. Thanks. (closes: #192312, #192311)
 
  -- Randall Donald <rdonald at debian.org>  Fri,  9 May 2003 14:51:15 -0700
-

Modified: packages/nvidia-graphics-drivers/branches/340-stretch/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/340-stretch/debian/control?rev=8075&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/340-stretch/debian/control	(original)
+++ packages/nvidia-graphics-drivers/branches/340-stretch/debian/control	Thu May 31 00:04:12 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/trunk
-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-nvidia/packages/nvidia-graphics-drivers/
+Vcs-Browser: https://salsa.debian.org/nvidia-team/nvidia-graphics-drivers
+Vcs-Git: https://salsa.debian.org/nvidia-team/nvidia-graphics-drivers.git
 Build-Depends:
  debhelper (>= 10),
  dpkg-dev (>= 1.18.8),
@@ -791,4 +791,3 @@
  system and recommends one of the non-free accelerated driver meta-packages
  (nvidia-driver, nvidia-legacy-340xx-driver, or nvidia-legacy-304xx-driver)
  for installation.
-