[pkg-nvidia-devel] r680 - in /packages/nvidia-settings/trunk/debian: ./ patches/ source/

fabo at users.alioth.debian.org fabo at users.alioth.debian.org
Wed Jan 6 13:04:06 UTC 2010 

Author: fabo
Date: Wed Jan  6 13:04:04 2010
New Revision: 680

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=680
Log:
 * Switch to dpkg-source 3.0 (quilt) format
   - Remove quilt build dependency
   - Remove debian/README.source file
   - Remove quilt option to dh
 * Document patches with DEP-3
 * Add 04_add_missing_linked_library.diff to fix FTBFS with binutils-gold
   (closes: #556755)

Added:
    packages/nvidia-settings/trunk/debian/patches/04_add_missing_linked_library.diff
    packages/nvidia-settings/trunk/debian/source/
    packages/nvidia-settings/trunk/debian/source/format
Removed:
    packages/nvidia-settings/trunk/debian/README.source
Modified:
    packages/nvidia-settings/trunk/debian/changelog
    packages/nvidia-settings/trunk/debian/control
    packages/nvidia-settings/trunk/debian/patches/00_destdir.diff
    packages/nvidia-settings/trunk/debian/patches/01_allow_dark_themes.diff
    packages/nvidia-settings/trunk/debian/patches/02_fix_manpage_type.diff
    packages/nvidia-settings/trunk/debian/patches/03_build_xnvctrl_with_fpic.diff
    packages/nvidia-settings/trunk/debian/patches/series
    packages/nvidia-settings/trunk/debian/rules

Modified: packages/nvidia-settings/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-settings/trunk/debian/changelog?rev=680&op=diff
==============================================================================
--- packages/nvidia-settings/trunk/debian/changelog (original)
+++ packages/nvidia-settings/trunk/debian/changelog Wed Jan  6 13:04:04 2010
@@ -1,3 +1,18 @@
+nvidia-settings (190.42-1) unstable; urgency=low
+
+  * New upstream release (closes: #561143)
+
+  [ Fathi Boudra ]
+  * Switch to dpkg-source 3.0 (quilt) format
+    - Remove quilt build dependency
+    - Remove debian/README.source file
+    - Remove quilt option to dh
+  * Document patches with DEP-3
+  * Add 04_add_missing_linked_library.diff to fix FTBFS with binutils-gold
+    (closes: #556755)
+
+ -- Debian NVIDIA Maintainers <pkg-nvidia-devel at lists.alioth.debian.org>  Wed, 06 Jan 2010 11:09:53 +0100
+
 nvidia-settings (185.18.31-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/nvidia-settings/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-settings/trunk/debian/control?rev=680&op=diff
==============================================================================
--- packages/nvidia-settings/trunk/debian/control (original)
+++ packages/nvidia-settings/trunk/debian/control Wed Jan  6 13:04:04 2010
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel at lists.alioth.debian.org>
 Uploaders: Randall Donald <rdonald at debian.org>
-Build-Depends: debhelper (>= 7.2), quilt, sharutils, m4, libgtk2.0-dev,
+Build-Depends: debhelper (>= 7.2), sharutils, m4, libgtk2.0-dev,
  libgl1-mesa-dev | libgl-dev, libxext-dev, libxrandr-dev, libxv-dev,
  libxxf86vm-dev
 Standards-Version: 3.8.3

Modified: packages/nvidia-settings/trunk/debian/patches/00_destdir.diff
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-settings/trunk/debian/patches/00_destdir.diff?rev=680&op=diff
==============================================================================
--- packages/nvidia-settings/trunk/debian/patches/00_destdir.diff (original)
+++ packages/nvidia-settings/trunk/debian/patches/00_destdir.diff Wed Jan  6 13:04:04 2010
@@ -1,3 +1,6 @@
+Description: Define DESTDIR, ROOT and X11R6_LIB_DIR variables in the Makefile
+Author: Fathi Boudra <fabo at debian.org>
+
 --- a/Makefile
 +++ b/Makefile
 @@ -33,6 +33,10 @@

Modified: packages/nvidia-settings/trunk/debian/patches/01_allow_dark_themes.diff
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-settings/trunk/debian/patches/01_allow_dark_themes.diff?rev=680&op=diff
==============================================================================
--- packages/nvidia-settings/trunk/debian/patches/01_allow_dark_themes.diff (original)
+++ packages/nvidia-settings/trunk/debian/patches/01_allow_dark_themes.diff Wed Jan  6 13:04:04 2010
@@ -1,6 +1,5 @@
-author: Albert Milone <albertomilone at alice.it>
-
-Allow nvidia-settings to work with dark backgrounds
+Description: Allow nvidia-settings to work with dark backgrounds
+Author: Albert Milone <albertomilone at alice.it>
 
 --- a/src/gtk+-2.x/ctkglx.c
 +++ b/src/gtk+-2.x/ctkglx.c

Modified: packages/nvidia-settings/trunk/debian/patches/02_fix_manpage_type.diff
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-settings/trunk/debian/patches/02_fix_manpage_type.diff?rev=680&op=diff
==============================================================================
--- packages/nvidia-settings/trunk/debian/patches/02_fix_manpage_type.diff (original)
+++ packages/nvidia-settings/trunk/debian/patches/02_fix_manpage_type.diff Wed Jan  6 13:04:04 2010
@@ -1,3 +1,7 @@
+Description: Fix typo in nvidia-settings manpage
+Author: Fathi Boudra <fabo at debian.org>
+Bug-Debian: http://bugs.debian.org/409589
+
 --- a/doc/nvidia-settings.1.m4
 +++ b/doc/nvidia-settings.1.m4
 @@ -71,7 +71,7 @@ rather than the default

Modified: packages/nvidia-settings/trunk/debian/patches/03_build_xnvctrl_with_fpic.diff
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-settings/trunk/debian/patches/03_build_xnvctrl_with_fpic.diff?rev=680&op=diff
==============================================================================
--- packages/nvidia-settings/trunk/debian/patches/03_build_xnvctrl_with_fpic.diff (original)
+++ packages/nvidia-settings/trunk/debian/patches/03_build_xnvctrl_with_fpic.diff Wed Jan  6 13:04:04 2010
@@ -1,3 +1,7 @@
+Description: Build xnvctrl with -fPIC
+Author: Fathi Boudra <fabo at debian.org>
+Bug-Debian: http://bugs.debian.org/494526
+
 --- a/Makefile
 +++ b/Makefile
 @@ -240,7 +240,7 @@ $(XF86PARSER_LIB):

Added: packages/nvidia-settings/trunk/debian/patches/04_add_missing_linked_library.diff
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-settings/trunk/debian/patches/04_add_missing_linked_library.diff?rev=680&op=file
==============================================================================
--- packages/nvidia-settings/trunk/debian/patches/04_add_missing_linked_library.diff (added)
+++ packages/nvidia-settings/trunk/debian/patches/04_add_missing_linked_library.diff Wed Jan  6 13:04:04 2010
@@ -1,0 +1,15 @@
+Description: Fix FTBFS with binutils-gold caused by missing libdl link
+Author: Fathi Boudra <fabo at debian.org>
+Bug-Debian: http://bugs.debian.org/556755
+
+--- a/Makefile
++++ b/Makefile
+@@ -149,7 +149,7 @@ SRCDIRS := $(addprefix $(CURDIR)/, $(REL
+ INC_FLAGS := $(addprefix -I , $(RELATIVE_SRCDIRS))
+ 
+ ALL_CFLAGS = $(CFLAGS) $(LOCAL_CFLAGS) $(X11_CFLAGS) $(GTK_CFLAGS) $(INC_FLAGS)
+-ALL_LDFLAGS = $(LD_RUN_FLAG) $(LDFLAGS) $(GTK_LDFLAGS) $(X11_LIBS)
++ALL_LDFLAGS = $(LD_RUN_FLAG) $(LDFLAGS) $(GTK_LDFLAGS) $(X11_LIBS) -ldl
+ 
+ CPPFLAGS = $(ALL_CFLAGS)
+ 

Modified: packages/nvidia-settings/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-settings/trunk/debian/patches/series?rev=680&op=diff
==============================================================================
--- packages/nvidia-settings/trunk/debian/patches/series (original)
+++ packages/nvidia-settings/trunk/debian/patches/series Wed Jan  6 13:04:04 2010
@@ -2,3 +2,4 @@
 01_allow_dark_themes.diff
 02_fix_manpage_type.diff
 03_build_xnvctrl_with_fpic.diff
+04_add_missing_linked_library.diff

Modified: packages/nvidia-settings/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-settings/trunk/debian/rules?rev=680&op=diff
==============================================================================
--- packages/nvidia-settings/trunk/debian/rules (original)
+++ packages/nvidia-settings/trunk/debian/rules Wed Jan  6 13:04:04 2010
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with quilt $@
+	dh $@
 
 override_dh_auto_build:
 	dh_auto_build

Added: packages/nvidia-settings/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-settings/trunk/debian/source/format?rev=680&op=file
==============================================================================
--- packages/nvidia-settings/trunk/debian/source/format (added)
+++ packages/nvidia-settings/trunk/debian/source/format Wed Jan  6 13:04:04 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the Pkg-nvidia-devel mailing list