[pkg-nvidia-devel] r1380 - in /packages/nvidia-xconfig/trunk/debian: changelog patches/DESTDIR.diff patches/FHS.diff patches/series

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

Author: anbe-guest
Date: Tue Jul 13 08:06:29 2010
New Revision: 1380

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1380
Log:
* New upstream release (256.35).
* Update DESTDIR.diff, add FHS.diff to install in /usr instead of /usr/local

Added:
    packages/nvidia-xconfig/trunk/debian/patches/FHS.diff
Modified:
    packages/nvidia-xconfig/trunk/debian/changelog
    packages/nvidia-xconfig/trunk/debian/patches/DESTDIR.diff
    packages/nvidia-xconfig/trunk/debian/patches/series

Modified: packages/nvidia-xconfig/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-xconfig/trunk/debian/changelog?rev=1380&op=diff
==============================================================================
--- packages/nvidia-xconfig/trunk/debian/changelog (original)
+++ packages/nvidia-xconfig/trunk/debian/changelog Tue Jul 13 08:06:29 2010
@@ -1,3 +1,11 @@
+nvidia-xconfig (256.35-1) UNRELEASED; urgency=low
+
+  [ Andreas Beckmann ]
+  * New upstream release.
+  * Update DESTDIR.diff, add FHS.diff to install in /usr instead of /usr/local
+
+ -- Andreas Beckmann <debian at abeckmann.de>  Tue, 13 Jul 2010 09:14:36 +0200
+
 nvidia-xconfig (195.36.31-1) unstable; urgency=low
 
   [ Andreas Beckmann ]

Modified: packages/nvidia-xconfig/trunk/debian/patches/DESTDIR.diff
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-xconfig/trunk/debian/patches/DESTDIR.diff?rev=1380&op=diff
==============================================================================
--- packages/nvidia-xconfig/trunk/debian/patches/DESTDIR.diff (original)
+++ packages/nvidia-xconfig/trunk/debian/patches/DESTDIR.diff Tue Jul 13 08:06:29 2010
@@ -1,13 +1,25 @@
-Description: Upstream changes introduced in version 1.0+20051122-1
- Add DESTDIR support to the build system.
-Author: Randall Donald <rdonald at debian.org>
-Last-Update: 2005-11-07
+Description: Add DESTDIR support to the build system.
+Author: Andreas Beckmann <debian at abeckmann.de>
+Last-Update: 2010-07-13
 
---- nvidia-xconfig-1.0+20051122.orig/Makefile
-+++ nvidia-xconfig-1.0+20051122/Makefile
-@@ -1,3 +1,5 @@
-+DESTDIR=
-+ROOT=$(DESTDIR)
- #
- # nvidia-xconfig: A tool for manipulating X config files,
- # specifically for use by the NVIDIA Linux graphics driver.
+Index: b/Makefile
+===================================================================
+--- a/Makefile	2010-06-17 05:02:52.000000000 +0200
++++ b/Makefile	2010-07-13 09:54:45.676037763 +0200
+@@ -94,12 +94,12 @@
+ install: NVIDIA_XCONFIG_install MANPAGE_install
+ 
+ NVIDIA_XCONFIG_install: $(NVIDIA_XCONFIG)
+-	$(MKDIR) $(bindir)
+-	$(INSTALL) $(INSTALL_BIN_ARGS) $< $(bindir)/$(notdir $<)
++	$(MKDIR) $(DESTDIR)$(bindir)
++	$(INSTALL) $(INSTALL_BIN_ARGS) $< $(DESTDIR)$(bindir)/$(notdir $<)
+ 
+ MANPAGE_install: $(MANPAGE)
+-	$(MKDIR) $(mandir)
+-	$(INSTALL) $(INSTALL_DOC_ARGS) $< $(mandir)/$(notdir $<)
++	$(MKDIR) $(DESTDIR)$(mandir)
++	$(INSTALL) $(INSTALL_DOC_ARGS) $< $(DESTDIR)$(mandir)/$(notdir $<)
+ 
+ $(NVIDIA_XCONFIG): $(OBJS)
+ 	$(call quiet_cmd,LINK) -o $@ $(OBJS) $(CFLAGS) \

Added: packages/nvidia-xconfig/trunk/debian/patches/FHS.diff
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-xconfig/trunk/debian/patches/FHS.diff?rev=1380&op=file
==============================================================================
--- packages/nvidia-xconfig/trunk/debian/patches/FHS.diff (added)
+++ packages/nvidia-xconfig/trunk/debian/patches/FHS.diff Tue Jul 13 08:06:29 2010
@@ -1,0 +1,18 @@
+Description: FHS fixes for the build system
+ - do not install in /usr/local
+Author: Andreas Beckmann <debian at abeckmann.de>
+Last-Update: 2010-07-13
+
+Index: b/utils.mk
+===================================================================
+--- a/utils.mk	2010-07-13 09:58:21.488537721 +0200
++++ b/utils.mk	2010-07-13 09:58:43.267536671 +0200
+@@ -108,7 +108,7 @@
+ # the source tarball
+ ##############################################################################
+ 
+-prefix = /usr/local
++prefix = /usr
+ 
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin

Modified: packages/nvidia-xconfig/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-xconfig/trunk/debian/patches/series?rev=1380&op=diff
==============================================================================
--- packages/nvidia-xconfig/trunk/debian/patches/series (original)
+++ packages/nvidia-xconfig/trunk/debian/patches/series Tue Jul 13 08:06:29 2010
@@ -1,1 +1,2 @@
 DESTDIR.diff
+FHS.diff