[pkg-nvidia-devel] r853 - in /packages/nvidia-graphics-drivers/trunk: ./ debian.binary/ debian/ debian/module/ debian/module/debian/ debian/module/debian/source/ debian/source/

rra at users.alioth.debian.org rra at users.alioth.debian.org
Sat May 8 03:30:28 UTC 2010 

Author: rra
Date: Sat May  8 03:30:27 2010
New Revision: 853

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=853
Log:
Reorganize package to allow use of 3.0 (quilt) format

[ Andreas Beckmann ]
* move files: debian.binary/ ==> debian/module/debian/,
  Makefile, conftest.*, patches.h ==> debian/module/
* debian/rules: adjust for debian/module/
* switch to source format 3.0 (quilt)
* debian/module/debian/: set source format 1.0, the module source "package"
  is shipped as .tar.bz2 and unpacked with tar, therefore no newer features
  can be used

Added:
    packages/nvidia-graphics-drivers/trunk/debian/module/
    packages/nvidia-graphics-drivers/trunk/debian/module/Makefile
      - copied unchanged from r852, packages/nvidia-graphics-drivers/trunk/Makefile
    packages/nvidia-graphics-drivers/trunk/debian/module/conftest.h
      - copied unchanged from r852, packages/nvidia-graphics-drivers/trunk/conftest.h
    packages/nvidia-graphics-drivers/trunk/debian/module/conftest.sh
      - copied unchanged from r852, packages/nvidia-graphics-drivers/trunk/conftest.sh
    packages/nvidia-graphics-drivers/trunk/debian/module/debian/
      - copied from r852, packages/nvidia-graphics-drivers/trunk/debian.binary/
    packages/nvidia-graphics-drivers/trunk/debian/module/debian/source/
    packages/nvidia-graphics-drivers/trunk/debian/module/debian/source/format
    packages/nvidia-graphics-drivers/trunk/debian/module/patches.h
      - copied unchanged from r852, packages/nvidia-graphics-drivers/trunk/patches.h
Removed:
    packages/nvidia-graphics-drivers/trunk/Makefile
    packages/nvidia-graphics-drivers/trunk/conftest.h
    packages/nvidia-graphics-drivers/trunk/conftest.sh
    packages/nvidia-graphics-drivers/trunk/debian.binary/
    packages/nvidia-graphics-drivers/trunk/patches.h
Modified:
    packages/nvidia-graphics-drivers/trunk/debian/README.source
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/rules
    packages/nvidia-graphics-drivers/trunk/debian/source/format

Modified: packages/nvidia-graphics-drivers/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/README.source?rev=853&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/README.source (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/README.source Sat May  8 03:30:27 2010
@@ -20,7 +20,8 @@
     * Edit debian/upstream_info in the Debian package and change RELEASE
       to the appropriate value.
 
-    * Edit conftest.h if necessary for kernel compatibility and test.
+    * Edit debian/module/conftest.h if necessary for kernel compatibility
+      and test.
 
 Building and Uploading
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=853&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sat May  8 03:30:27 2010
@@ -79,6 +79,13 @@
   * update lintian overrides
   * debian/rules: generate most parts of the AUTOGEN list automatically
   * debian/changelog, debian/*.README*: whitespace cleanup
+  * move files: debian.binary/ ==> debian/module/debian/,
+    Makefile, conftest.*, patches.h ==> debian/module/
+  * debian/rules: adjust for debian/module/
+  * switch to source format 3.0 (quilt)
+  * debian/module/debian/: set source format 1.0, the module source "package"
+    is shipped as .tar.bz2 and unpacked with tar, therefore no newer features
+    can be used
 
  -- Russ Allbery <rra at debian.org>  Sat, 24 Apr 2010 20:35:20 -0700
 

Added: packages/nvidia-graphics-drivers/trunk/debian/module/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/module/debian/source/format?rev=853&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/module/debian/source/format (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/module/debian/source/format Sat May  8 03:30:27 2010
@@ -1,0 +1,1 @@
+1.0

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=853&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Sat May  8 03:30:27 2010
@@ -17,8 +17,8 @@
 AUTOGEN		+= $(patsubst %.in,%,$(TEMPLATES))
 AUTOGEN		+= debian/libcuda1-ia32.symbols
 AUTOGEN		+= debian/nvidia-libvdpau1-ia32.symbols
-AUTOGEN		+= debian.binary/control.template
-AUTOGEN		+= debian.binary/changelog
+AUTOGEN		+= debian/module/debian/control.template
+AUTOGEN		+= debian/module/debian/changelog
 AUTOKEEP	 = debian/copyright
 AUTOCLEAN	 = $(filter-out $(AUTOKEEP),$(AUTOGEN))
 
@@ -61,11 +61,9 @@
 	cp -a NVIDIA-Linux-amd64/usr/src/nv/nv-kernel.o debian/temp/modules/nvidia-kernel/nv-kernel.o.x86_64
 	rm -f debian/temp/modules/nvidia-kernel/nv-kernel.o
 
-	# We have new conftest files that work purely with kbuild and don't require root
-	cp -a Makefile conftest.* patches.h debian/temp/modules/nvidia-kernel/
-
-	# Prepare debian files for module package
-	cp -a debian.binary/* debian/temp/modules/nvidia-kernel/debian/
+	# Install a debian/ tree and new conftest files that work purely with kbuild
+	# and don't require root into the module package
+	cp -a debian/module/* debian/temp/modules/nvidia-kernel/
 	cp -a debian/copyright debian/temp/modules/nvidia-kernel/debian/
 
 	# Fix permissions
@@ -131,7 +129,7 @@
 	-e 's{#URL_X86_64#}{$(url_x86_64)}g;' \
 	< $< > $@
 
-debian.binary/changelog: debian/changelog
+debian/module/debian/changelog: debian/changelog
 	sed 's/^nvidia-graphics-drivers/nvidia-kernel/g' $< > $@
 
 debian/nvidia-libvdpau1-ia32.symbols: debian/nvidia-libvdpau1.symbols.i386

Modified: packages/nvidia-graphics-drivers/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/source/format?rev=853&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/source/format (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/source/format Sat May  8 03:30:27 2010
@@ -1,1 +1,1 @@
-1.0
+3.0 (quilt)

More information about the Pkg-nvidia-devel mailing list