r8079 - in /packages/nvidia-graphics-drivers/branches/390: ./ debian/changelog debian/control

[anbe at users.alioth.debian.org]

Author: anbe
Date: Thu May 31 00:59:22 2018
New Revision: 8079

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

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

Propchange: packages/nvidia-graphics-drivers/branches/390/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Thu May 31 00:59:22 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,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-7992
-/packages/nvidia-graphics-drivers/branches/340-stretch:6394-7993
+/packages/nvidia-graphics-drivers/branches/340:5309-8074
+/packages/nvidia-graphics-drivers/branches/340-stretch:6394-8078
 /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/branches/390/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/390/debian/changelog?rev=8079&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/390/debian/changelog	(original)
+++ packages/nvidia-graphics-drivers/branches/390/debian/changelog	Thu May 31 00:59:22 2018
@@ -16,6 +16,9 @@
   * Add xorg-video-abi-24 as alternative dependency.
   * Bump xserver-xorg-core dependency to << 2:1.20.99 for ABI 24.
     (Closes: #900112)
+
+  [ Andreas Beckmann ]
+  * Convert packaging repository from SVN to GIT.
 
  -- Luca Boccassi <bluca at debian.org>  Sat, 26 May 2018 19:14:30 +0100
 
@@ -7961,4 +7964,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/390/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/390/debian/control?rev=8079&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/390/debian/control	(original)
+++ packages/nvidia-graphics-drivers/branches/390/debian/control	Thu May 31 00:59:22 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),
@@ -1363,4 +1363,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.
-