[pkg-nvidia-devel] r476 - in /packages/nvidia-graphics-drivers/trunk: debian.binary/changelog debian.binary/conf.mk debian.binary/rules debian/changelog

[rdonald at users.alioth.debian.org]

Author: rdonald
Date: Mon Sep  1 18:06:13 2008
New Revision: 476

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=476
Log:
fix rc bug

Modified:
    packages/nvidia-graphics-drivers/trunk/debian.binary/changelog
    packages/nvidia-graphics-drivers/trunk/debian.binary/conf.mk
    packages/nvidia-graphics-drivers/trunk/debian.binary/rules
    packages/nvidia-graphics-drivers/trunk/debian/changelog

Modified: packages/nvidia-graphics-drivers/trunk/debian.binary/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/changelog?rev=476&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/changelog Mon Sep  1 18:06:13 2008
@@ -1,3 +1,9 @@
+nvidia-kernel (173.14.09-4) unstable; urgency=medium
+
+  * Fix bashism for nvidia-glx-ia32 (closes: #495478)
+
+ -- Randall Donald <rdonald at debian.org>  Thu, 28 Aug 2008 11:03:15 -0700
+
 nvidia-kernel (173.14.09-3) unstable; urgency=high
 
   * Only ship TLS libs. RC bug fix (closes: #441975)

Modified: packages/nvidia-graphics-drivers/trunk/debian.binary/conf.mk
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/conf.mk?rev=476&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/conf.mk (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/conf.mk Mon Sep  1 18:06:13 2008
@@ -48,8 +48,16 @@
 endif
 
 
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-CHFILE=$(CURDIR)/../../nvidia-kernel-$(KVERS)_$(PKG_VERSION)_$(ARCH).changes
+ifeq "$(origin KPKG_DEST_DIR)" "undefined"	
+ifeq "$(origin KMAINT)" "undefined"
+KPKG_DEST_DIR = $(CURDIR)/..
+else	
+KPKG_DEST_DIR = $(KSRC)/..
+endif
+endif
+CHFILE=$(KPKG_DEST_DIR)/nvidia-kernel-$(KVERS)_$(PKG_VERSION)_$(DEB_HOST_ARCH).changes
 
 
 KERNEL_VERSION_CODE = $(shell cat $(KSRC)/include/linux/version.h | grep LINUX_VERSION_CODE  | cut -d " " -f 3)

Modified: packages/nvidia-graphics-drivers/trunk/debian.binary/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/rules?rev=476&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/rules Mon Sep  1 18:06:13 2008
@@ -106,15 +106,7 @@
 #	dh_shlibdeps
 	dh_gencontrol -- -v$(PKG_VERSION)
 	dh_md5sums
-ifeq "$(origin KPKG_DEST_DIR)" "undefined"	
-ifeq "$(origin KMAINT)" "undefined"	
-	dh_builddeb  --destdir=$(CURDIR)/..
-else	
-	dh_builddeb  --destdir=$(KSRC)/..
-endif
-else
 	dh_builddeb  --destdir=$(KPKG_DEST_DIR)
-endif	
 
 
 .PHONY: clean
@@ -183,7 +175,7 @@
 kdist: 
 	$(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules binary_modules
 	# Build a .changes file.
-	dpkg-genchanges -b -e"$(KMAINT) <$(KEMAIL)>" -u"$(CURDIR)/../.." > $(CHFILE)
+	dpkg-genchanges -b -e"$(KMAINT) <$(KEMAIL)>" -u"$(KPKG_DEST_DIR)" > $(CHFILE)
 	debsign -e"$(KMAINT) <$(KEMAIL)>" $(CHFILE)
 	$(MAKE) $(MFLAGS) -f debian/rules clean
 							

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=476&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Mon Sep  1 18:06:13 2008
@@ -1,3 +1,12 @@
+nvidia-graphics-drivers (173.14.09-5) unstable; urgency=high
+
+  * RC bug:  write *.deb and *.changes file into the same subdirectory 
+  (closes: #493470)
+  * ARCH is undefined, define and use DEB_HOST_ARCH instead
+  (Thanks to Harald Dunkel <harald.dunkel at t-online.de>)
+
+ -- Randall Donald <rdonald at debian.org>  Mon, 01 Sep 2008 10:58:05 -0700
+
 nvidia-graphics-drivers (173.14.09-4) unstable; urgency=medium
 
   * Fix bashism for nvidia-glx-ia32 (closes: #495478)