[pkg-nvidia-devel] r969 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog rules rules.defs watch watch.in

[anbe-guest at users.alioth.debian.org]

Author: anbe-guest
Date: Mon May 31 21:05:10 2010
New Revision: 969

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=969
Log:
* update watch file magic, add legacy support, upcoming upstream renames

- make the watch file generated (and kept), so the pattern for the version in
  the directory can be easily limited (e.g. for legacy releases)
- limit the tracked version to 195.* for now, 256.* is still beta
- upcoming 256.* releases will drop the -pkg[02] part from the file name

Added:
    packages/nvidia-graphics-drivers/trunk/debian/watch.in
      - copied, changed from r968, packages/nvidia-graphics-drivers/trunk/debian/watch
Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/rules
    packages/nvidia-graphics-drivers/trunk/debian/rules.defs
    packages/nvidia-graphics-drivers/trunk/debian/watch

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=969&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Mon May 31 21:05:10 2010
@@ -20,6 +20,7 @@
     config file /etc/default/nvidia-glx
   * nvidia-glx: work around dpkg-divert bug #581544: useless errors on not
     writable destination if source does not exist
+  * update watch file magic, add legacy support, upcoming upstream renames
 
  -- Russ Allbery <rra at debian.org>  Wed, 26 May 2010 07:19:43 -0700
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=969&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Mon May 31 21:05:10 2010
@@ -8,6 +8,7 @@
 include debian/rules.defs
 version			 = $(NVIDIA_RELEASE)
 legacy			 = $(NVIDIA_LEGACY)
+watch_pattern		 = $(or $(WATCH_PATTERN),$(if $(legacy),$(patsubst -legacy-%xx,%,$(legacy))\.[\d\.\-]+),[\d\.\-]+)
 url_x86			 = $(NVIDIA_URL_X86)
 url_x86_64		 = $(NVIDIA_URL_X86_64)
 filename_x86		 = $(NVIDIA_FILENAME_X86)
@@ -28,7 +29,7 @@
 AUTOGEN		+= debian/module/debian/control.template
 AUTOGEN		+= debian/module/debian/changelog
 AUTOGEN		+= $(patsubst %.in,%,$(RENAMED_CONTROL))
-AUTOKEEP	 = debian/copyright
+AUTOKEEP	 = debian/copyright debian/watch
 AUTOCLEAN	 = $(filter-out $(AUTOKEEP),$(AUTOGEN))
 
 module_source	 = debian/nvidia-kernel$(legacy)-source/usr/src/modules/nvidia-kernel$(legacy)
@@ -160,6 +161,7 @@
 	-e 's{#URL_X86_64#}{$(url_x86_64)}g;' \
 	-e 's{#!i386#}{$(if $(filter i386,$(DEB_HOST_ARCH)),#)}g;' \
 	-e 's{#!amd64#}{$(if $(filter amd64,$(DEB_HOST_ARCH)),#)}g;' \
+	-e 's{#WATCH_PATTERN#}{$(subst \,\\,$(watch_pattern))}g;' \
 	< $< > $@
 
 debian/module/debian/changelog: debian/changelog

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules.defs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules.defs?rev=969&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules.defs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules.defs Mon May 31 21:05:10 2010
@@ -1,6 +1,7 @@
 
 NVIDIA_RELEASE		 = 195.36.24
 NVIDIA_LEGACY		 =
+WATCH_PATTERN		 = 195\.[\d\.\-]+
 
 NVIDIA_DIRNAME_X86	 = NVIDIA-Linux-x86-${NVIDIA_RELEASE}-pkg0
 NVIDIA_DIRNAME_X86_64	 = NVIDIA-Linux-x86_64-${NVIDIA_RELEASE}-pkg2

Modified: packages/nvidia-graphics-drivers/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/watch?rev=969&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/watch (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/watch Mon May 31 21:05:10 2010
@@ -1,4 +1,5 @@
-#ftp://download.nvidia.com/XFree86/Linux-x86_64/190.36/NVIDIA-Linux-x86_64-190.36-pkg2.run
+# ftp://download.nvidia.com/XFree86/Linux-x86_64/190.36/NVIDIA-Linux-x86_64-190.36-pkg2.run
+# ftp://download.nvidia.com/XFree86/Linux-x86_64/256.29/NVIDIA-Linux-x86_64-256.29.run
 version=3
-ftp://download.nvidia.com/XFree86/Linux-x86/([\d\.\-]+)/NVIDIA-Linux-x86-([\d\.\-]+)-pkg0\.run
-ftp://download.nvidia.com/XFree86/Linux-x86_64/([\d\.\-]+)/NVIDIA-Linux-x86_64-([\d\.\-]+)-pkg2\.run
+ftp://download.nvidia.com/XFree86/Linux-x86/(195\.[\d\.\-]+)/NVIDIA-Linux-x86-([\d\.\-]+)(?:-pkg0)?\.run
+ftp://download.nvidia.com/XFree86/Linux-x86_64/(195\.[\d\.\-]+)/NVIDIA-Linux-x86_64-([\d\.\-]+)(?:-pkg2)?\.run

Copied: packages/nvidia-graphics-drivers/trunk/debian/watch.in (from r968, packages/nvidia-graphics-drivers/trunk/debian/watch)
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/watch.in?rev=969&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/watch (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/watch.in Mon May 31 21:05:10 2010
@@ -1,4 +1,5 @@
-#ftp://download.nvidia.com/XFree86/Linux-x86_64/190.36/NVIDIA-Linux-x86_64-190.36-pkg2.run
+# ftp://download.nvidia.com/XFree86/Linux-x86_64/190.36/NVIDIA-Linux-x86_64-190.36-pkg2.run
+# ftp://download.nvidia.com/XFree86/Linux-x86_64/256.29/NVIDIA-Linux-x86_64-256.29.run
 version=3
-ftp://download.nvidia.com/XFree86/Linux-x86/([\d\.\-]+)/NVIDIA-Linux-x86-([\d\.\-]+)-pkg0\.run
-ftp://download.nvidia.com/XFree86/Linux-x86_64/([\d\.\-]+)/NVIDIA-Linux-x86_64-([\d\.\-]+)-pkg2\.run
+ftp://download.nvidia.com/XFree86/Linux-x86/(#WATCH_PATTERN#)/NVIDIA-Linux-x86-([\d\.\-]+)(?:-pkg0)?\.run
+ftp://download.nvidia.com/XFree86/Linux-x86_64/(#WATCH_PATTERN#)/NVIDIA-Linux-x86_64-([\d\.\-]+)(?:-pkg2)?\.run