[pkg-nvidia-devel] r971 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog rules

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

Author: anbe-guest
Date: Mon May 31 21:54:17 2010
New Revision: 971

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=971
Log:
update get-orig-source: target for upcoming upstream renames

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/rules

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=971&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Mon May 31 21:54:17 2010
@@ -21,6 +21,7 @@
   * 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
+  * update get-orig-source: target for 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=971&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Mon May 31 21:54:17 2010
@@ -189,9 +189,10 @@
 	mkdir get-orig-source
 	uscan --no-symlink --download-current-version --pasv \
 	    --destdir get-orig-source
+	test `ls get-orig-source/* | wc -l` = 2  # we need exactly 2 downloaded files
 	@set -e -x ; \
 	    cd get-orig-source ; \
-	    newversion=$$(ls *-x86-*.run | sed -e 's/.*-\([0-9.]*\)-.*/\1/') ; \
+	    newversion=$$(ls *-x86-*.run | sed -e 's/.*-\([0-9.]*\)\(-.*\)\?\.run/\1/') ; \
 	    mkdir nvidia-graphics-drivers-$${newversion}.orig ; \
 	    mv *.run nvidia-graphics-drivers-$${newversion}.orig/ ; \
 	    chmod 0755 nvidia-graphics-drivers-$${newversion}.orig/* ; \