No subject

this is the final part of a patch I started quite some time ago to
improve the handling of generated control files.

Removes many empty or unused files from the repository.

Removed:
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.links.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.override.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.override.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.dirs
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.links.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.dirs
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.docs.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.links.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.shlibs
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-settings.dirs
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-settings.substvars
    packages/nvidia-graphics-drivers/trunk/mail
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=767&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Wed Apr  7 05:23:32 2010
@@ -52,6 +52,7 @@
   * nvidia-kernel-source: switch patch system from dpatch to quilt
   * debian.binary/patches/fix-2.6.33-build.patch: new patch to fix module
     build with kernel 2.6.33 (closes: #573251)
+  * improve handling of generated files (closes: #533518)
 
  -- Andres Mejia <mcitadel at gmail.com>  Thu, 18 Mar 2010 18:44:40 -0400
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=767&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Wed Apr  7 05:23:32 2010
@@ -27,7 +27,10 @@
 dirname_x86:=$(shell sh debian/upstream_info DIRNAME_X86)
 dirname_x86_64:=$(shell sh debian/upstream_info DIRNAME_X86_64)
 
-AUTOCLEAN=debian/nvidia-kernel-source.README.Debian \
+AUTOGEN		 = $(AUTOKEEP) $(AUTOCLEAN)
+AUTOKEEP	 = debian/control debian/copyright
+AUTOCLEAN	 = \
+debian/nvidia-kernel-source.README.Debian \
 debian/nvidia-glx.links \
 debian/nvidia-glx.lintian-overrides.amd64 debian/nvidia-glx.lintian-overrides.i386 \
 debian/nvidia-glx.docs debian/nvidia-glx.examples \
@@ -51,12 +54,7 @@
 debian/nvidia-vdpau-driver.lintian-overrides.i386 \
 debian/nvidia-vdpau-driver-ia32.docs \
 debian/nvidia-vdpau-driver-ia32.lintian-overrides \
-
-
-AUTOGEN=$(AUTOCLEAN) debian/copyright
-
-
-
+debian.binary/changelog
 
 
 CFLAGS = -Wall -g
@@ -70,12 +68,12 @@
 	INSTALL_PROGRAM += -s
 endif
 
-version-change: version-clean debian/control $(AUTOGEN) clean
+version-change: version-clean $(AUTOGEN) clean
 
 configure: configure-stamp
 
 .PHONY: configure-stamp
-configure-stamp: version-clean debian/control $(AUTOGEN) ${filename_x86} ${filename_x86_64}
+configure-stamp: version-clean $(AUTOGEN) ${filename_x86} ${filename_x86_64}
 	dh_testdir
 	# extract both so we can fetch the kernel object code for both arches
 	./${filename_x86} --extract-only
@@ -160,7 +158,7 @@
 	rm -fr $(dirname_x86) $(dirname_x86_64)  nvidia-kernel.tar.bz2
 	rm -fr debian/temp
 
-	$(MAKE) -f debian/rules debian/control
+	$(MAKE) -f debian/rules $(AUTOKEEP)
 
 
 .PHONY: install
@@ -346,4 +344,4 @@
 	rm -f ${AUTOCLEAN} || true
 
 .PHONY: autogen
-autogen: debian/control ${AUTOGEN}
+autogen: ${AUTOGEN}