Hi,
this is a revised version of my previous patch. In order to keep the
diffs in further patches of this series small and readable there is no
renaming of debian/control.in (and no checked regeneration of
debian/control). Improvements of handling this file may be introduced in
a later patch.
What's being done:
* remove all generated files during clean (except debian/control)
* rebuild all generated files during configure
* rebuild debian/control during clean
* handle debian.binary/changelog as a generated file, too
Patch is against r562 from svn.
The following files have to be deleted from svn, the patch does not
include the removing diffs (just run debian/rules clean)
debian.binary/changelog
debian/nvidia-glx.override
debian/nvidia-libvdpau-ia32.links
debian/nvidia-libvdpau.links
debian/nvidia-glx-dev.links
debian/nvidia-glx.init
debian/nvidia-libvdpau.docs
debian/nvidia-glx-ia32.links
debian/nvidia-kernel-source.docs
debian/nvidia-glx.examples
debian/nvidia-glx.links
debian/nvidia-glx.postrm
debian/nvidia-glx.docs
debian/nvidia-glx-dev.preinst
debian/nvidia-kernel-source.README.Debian
debian/copyright
debian/nvidia-glx-ia32.override
Regards,
Andreas
Index: debian/nvidia-glx.override (deleted)
===================================================================
Index: debian/nvidia-libvdpau-ia32.links (deleted)
===================================================================
Index: debian/nvidia-libvdpau.links (deleted)
===================================================================
Index: debian/nvidia-glx-dev.links (deleted)
===================================================================
Index: debian/nvidia-glx.init (deleted)
===================================================================
Index: debian/nvidia-libvdpau.docs (deleted)
===================================================================
Index: debian/nvidia-glx-ia32.links (deleted)
===================================================================
Index: debian/nvidia-kernel-source.docs (deleted)
===================================================================
Index: debian/nvidia-glx.examples (deleted)
===================================================================
Index: debian/nvidia-glx.links (deleted)
===================================================================
Index: debian/nvidia-glx.postrm (deleted)
===================================================================
Index: debian/nvidia-glx.docs (deleted)
===================================================================
Index: debian/nvidia-glx-dev.preinst (deleted)
===================================================================
Index: debian/nvidia-kernel-source.README.Debian (deleted)
===================================================================
Index: debian/copyright (deleted)
===================================================================
Index: debian/nvidia-glx-ia32.override (deleted)
===================================================================
Index: debian/changelog
===================================================================
--- debian/changelog (.../trunk) (revision 821)
+++ debian/changelog (.../branches/anbe-10-0-cleanup-autogenerated-files) (revision 821)
@@ -1,3 +1,10 @@
+nvidia-graphics-drivers (185.18.14-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * do not ship generated files in the source package
+
+ -- Andreas Beckmann <deb...@abeckmann.de> Thu, 02 Jul 2009 04:03:14 +0200
+
nvidia-graphics-drivers (185.18.14-2) UNRELEASED; urgency=low
* /emul/ia32-linux/usr/lib to /usr/lib32 transition (closes: 534873)
Index: debian/rules
===================================================================
--- debian/rules (.../trunk) (revision 821)
+++ debian/rules (.../branches/anbe-10-0-cleanup-autogenerated-files) (revision 821)
@@ -27,14 +27,15 @@
dirname_x86:=$(shell sh debian/upstream_info DIRNAME_X86)
dirname_x86_64:=$(shell sh debian/upstream_info DIRNAME_X86_64)
-AUTOGEN=debian/nvidia-kernel-source.README.Debian debian/control \
+AUTOGEN=debian/nvidia-kernel-source.README.Debian \
debian/copyright debian/nvidia-glx.links debian/nvidia-glx-dev.links \
debian/nvidia-libvdpau.links debian/nvidia-libvdpau-ia32.links \
debian/nvidia-glx.override debian/nvidia-glx.docs debian/nvidia-glx.examples \
debian/nvidia-libvdpau.docs \
debian/nvidia-glx.postrm debian/nvidia-glx.init \
debian/nvidia-glx-ia32.override debian/nvidia-glx-ia32.links \
-debian/nvidia-kernel-source.docs debian/nvidia-glx-dev.preinst
+debian/nvidia-kernel-source.docs debian/nvidia-glx-dev.preinst \
+debian.binary/changelog
@@ -51,12 +52,12 @@
INSTALL_PROGRAM += -s
endif
-version-change: version-clean $(AUTOGEN) clean
+version-change: version-clean debian/control $(AUTOGEN) clean
configure: configure-stamp
.PHONY: configure-stamp
-configure-stamp: version-clean $(AUTOGEN)
+configure-stamp: version-clean debian/control $(AUTOGEN)
dh_testdir
# extract both so we can fetch the kernel object code for both arches
./${filename_x86} --extract-only
@@ -71,11 +72,11 @@
# done; \
fi
- sed 's/^nvidia-graphics-drivers/nvidia-kernel/g' debian/changelog > debian.binary/changelog
+ touch configure-stamp
+debian.binary/changelog: debian/changelog
+ sed 's/^nvidia-graphics-drivers/nvidia-kernel/g' $< > $@
- touch configure-stamp
-
.PHONY: build
build: configure-stamp build-stamp
@@ -87,7 +88,7 @@
build-kernel:
.PHONY: build-kernel-stamp
-build-kernel-stamp:
+build-kernel-stamp: debian.binary/changelog
dh_testroot
dh_testdir
@@ -133,7 +134,7 @@
touch build-kernel-stamp
.PHONY: clean
-clean:
+clean: version-clean
dh_testdir
dh_testroot
rm -f build-stamp build-kernel-stamp configure-stamp
@@ -142,7 +143,9 @@
rm -fr $(dirname_x86) $(dirname_x86_64) nvidia-kernel.tar.bz2
rm -fr debian/temp
+ $(MAKE) -f debian/rules debian/control
+
.PHONY: install
install: build-stamp build-kernel-stamp
dh_testdir
@@ -318,5 +321,7 @@
.PHONY: version-clean
version-clean:
- rm -f ${AUTOGEN} || true
-
+ rm -f ${AUTOGEN} || true
+
+.PHONY: autogen
+autogen: debian/control ${AUTOGEN}
Property changes on: debian
___________________________________________________________________
Added: svn-bp:origDir
+ ../../../../tarballs
Index: debian.binary/changelog (deleted)
===================================================================
Property changes on: .
___________________________________________________________________
Added: svn:mergeinfo
Merged /local/packages/nvidia-graphics-drivers/branches/anbe:r566-567,581,646,648,763-764,769
Merged /local/packages/nvidia-graphics-drivers/branches/anbe-20-0-emul-ia32-transition:r782-785
Merged /local/packages/nvidia-graphics-drivers/branches/anbe-20-1-emul-ia32-transition:r786-815
Merged /mirror/packages/nvidia-graphics-drivers/branches/anbe-10-0-cleanup-autogenerated-files:r558-813
Merged /local/packages/nvidia-graphics-drivers/trunk:r772-814
Added: svn:ignore
+ NVIDIA-Linux*
