--- nvidia-settings-195.36.08.orig/debian/examples +++ nvidia-settings-195.36.08/debian/examples @@ -0,0 +1 @@ +samples --- nvidia-settings-195.36.08.orig/debian/docs +++ nvidia-settings-195.36.08/debian/docs @@ -0,0 +1,2 @@ +doc/Makefile.inc +doc/*.txt --- nvidia-settings-195.36.08.orig/debian/dirs +++ nvidia-settings-195.36.08/debian/dirs @@ -0,0 +1,3 @@ +usr/bin +usr/lib +usr/include/NVCtrl --- nvidia-settings-195.36.08.orig/debian/rules +++ nvidia-settings-195.36.08/debian/rules @@ -0,0 +1,31 @@ +#!/usr/bin/make -f +# +# Copyright (C) 2009 Canonical Services Ltd +# Copyright (C) 2009 Alberto Milone + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +PKG_name := nvidia-settings +libdir := /usr/lib +includedir := /usr/include + +configure/$(PKG_name):: + $(MAKE) -C src/libXNVCtrl EXTINCSRC=/usr/include/X11/extensions \ + CFLAGS="$(CFLAGS) -fPIC" + $(MAKE) + + +clean:: + -$(MAKE) -C src/libXNVCtrl distclean 2>/dev/null + -$(MAKE) clean + if [ -e src/XF86Config-parser/Makefile ]; then \ + $(MAKE) -C src/XF86Config-parser clean; \ + fi + +binary-install/$(PKG_name):: + $(MAKE) prefix=$(CURDIR)/debian/$(PKG_name)/usr install + dh_install -p$(PKG_name) src/libXNVCtrl/libXNVCtrl.a "$(libdir)" + dh_install -p$(PKG_name) src/libXNVCtrl/NVCtrl.h "$(includedir)/NVCtrl" + dh_install -p$(PKG_name) src/libXNVCtrl/NVCtrlLib.h "$(includedir)/NVCtrl" + --- nvidia-settings-195.36.08.orig/debian/compat +++ nvidia-settings-195.36.08/debian/compat @@ -0,0 +1 @@ +4 --- nvidia-settings-195.36.08.orig/debian/control +++ nvidia-settings-195.36.08/debian/control @@ -0,0 +1,24 @@ +Source: nvidia-settings +Section: contrib/x11 +Priority: optional +XSBC-Original-Maintainer: Debian NVIDIA Maintainers +Maintainer: Ubuntu MOTU Developers +Uploaders: Randall Donald +Build-Depends: debhelper (>= 4.0.0), m4, libgtk2.0-dev, libxext-dev, xutils-dev, libxrandr-dev, + libgl1-mesa-dev | libgl-dev, libxxf86vm-dev, libxv-dev, cdbs +Standards-Version: 3.6.2 + +Package: nvidia-settings +Architecture: i386 amd64 lpia +Depends: screen-resolution-extra (>= 0.12), ${shlibs:Depends} +Conflicts: libxnvctrl-dev +Replaces: libxnvctrl-dev +Description: Tool of configuring the NVIDIA graphics driver + The nvidia-settings utility is a tool for configuring the NVIDIA + Linux graphics driver. It operates by communicating with the NVIDIA + X driver, querying and updating state as appropriate. This + communication is done with the NV-CONTROL X extension. + . + Values such as brightness and gamma, XVideo attributes, temperature, + and OpenGL settings can be queried and configured via nvidia-settings. + --- nvidia-settings-195.36.08.orig/debian/copyright +++ nvidia-settings-195.36.08/debian/copyright @@ -0,0 +1,198 @@ +This package was debianized by Randall Donald on +Wed, 30 Jun 2004 16:45:52 -0700. + +It was downloaded from ftp://download.nvidia.com/XFree86/nvidia-settings/ + +Upstream Author: NVIDIA Corporation + +Copyright: + +Copyright (C) 2004-2005 NVIDIA Corporation. + +some files (see below for a complete list): +Copyright (c) 1997-2003 by The XFree86 Project, Inc. +Copyright (c) 1997 Metro Link Incorporated +Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. +Copyright 2004 Red Hat Inc., Raleigh, North Carolina. + + +This program is free software; you can redistribute it and/or +modify it under the terms of Version 2 of the GNU General Public +License as published by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See Version 2 +of the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the: + + Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA + + +On Debian GNU/Linux systems the full text of Version 2 the GPL maybe be found +in /usr/share/common-licenses/GPL-2 + +These files fall under a different (less restrictive) license: +../src/XF86Config-parser/Device.c +../src/XF86Config-parser/Keyboard.c +../src/XF86Config-parser/Layout.c +../src/XF86Config-parser/Merge.c +../src/XF86Config-parser/Module.c +../src/XF86Config-parser/Monitor.c +../src/XF86Config-parser/Pointer.c +../src/XF86Config-parser/Scan.c +../src/XF86Config-parser/Screen.c +../src/XF86Config-parser/Vendor.c +../src/XF86Config-parser/Video.c +../src/XF86Config-parser/Write.c +../src/XF86Config-parser/Configint.h +../src/XF86Config-parser/Files.c +../src/XF86Config-parser/Flags.c +../src/XF86Config-parser/xf86Parser.h +../src/XF86Config-parser/xf86tokens.h + + * Copyright (c) 1997 Metro Link Incorporated + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF + * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * Except as contained in this notice, the name of the Metro Link shall not be + * used in advertising or otherwise to promote the sale, use or other dealings + * in this Software without prior written authorization from Metro Link. + * + */ +/* + * Copyright (c) 1997-2003 by The XFree86 Project, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the name of the copyright holder(s) + * and author(s) shall not be used in advertising or otherwise to promote + * the sale, use or other dealings in this Software without prior written + * authorization from the copyright holder(s) and author(s). + */ + +and: +../src/XF86Config-parser/DRI.c: + +/* DRI.c -- DRI Section in XF86Config file + * Created: Fri Mar 19 08:40:22 1999 by faith@precisioninsight.com + * Revised: Thu Jun 17 16:08:05 1999 by faith@precisioninsight.com + * + * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + */ + +and also: +../src/XF86Config-parser/Extensions.c: + * Copyright 2004 Red Hat Inc., Raleigh, North Carolina. + * + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation on the rights to use, copy, modify, merge, + * publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +../src/XF86Config-parser/configProcs.h +/* + * Copyright (c) 1997-2001 by The XFree86 Project, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the name of the copyright holder(s) + * and author(s) shall not be used in advertising or otherwise to promote + * the sale, use or other dealings in this Software without prior written + * authorization from the copyright holder(s) and author(s). + */ + +The packaging is a derived work of the upstream source, and hence falls under +the GPL-2 as weel (see usr/share/common-licenses/GPL-2). --- nvidia-settings-195.36.08.orig/debian/changelog +++ nvidia-settings-195.36.08/debian/changelog @@ -0,0 +1,355 @@ +nvidia-settings (195.36.08-0ubuntu2) lucid; urgency=low + + * debian/patches/03_do_not_exit_on_no_scanout.patch: + - Do not fail if the driver doesn't support the NV_CTRL_NO_SCANOUT + property (LP: #539196). + + -- Alberto Milone Tue, 06 Apr 2010 19:50:01 +0200 + +nvidia-settings (195.36.08-0ubuntu1) lucid; urgency=low + + * New upstream release: + - Fixed an X server crash caused by starting nvidia-settings while + X was not on the active VT. + - Fixed an nvidia-settings bug that produced many "Bad argument" + warning messages when running nvidia-settings --query all. + * Drop patches 03_xf86vidmode-rampsize-check.patch and + 04_include_xf86vmproto.patch as the problem is fixed + in the upstream code now. + + + -- Alberto Milone Fri, 05 Mar 2010 11:19:05 +0100 + +nvidia-settings (190.53-0ubuntu1) lucid; urgency=low + + * New upstream release (LP: #417410). + * debian/control: + - Add build dependency on cdbs. + - Remove build dependency on dpatch. + - Add lpia architecture. + - Depend on screen-resolution-extra >= 0.12. + * debian/patches/02_nvidia-settings-format-string.patch: + - Patch from Mandriva to pass formatted strings to gtk dialogs (thus + reducing gtk warnings). + * debian/patches/03_xf86vidmode-rampsize-check.patch: + - Fix FTBFS with recent versions of XF86VidMode. + * debian/patches/04_include_xf86vmproto.patch: + - Include xf86vmproto.h so as to get back XF86VidModeGetGammaRampSize(). + * debian/patches/05_polkit.patch: + - Add support for PolicyKit so that nvidia-settings doesn't require + that users call it with sudo to edit xorg.conf (LP: #200868) + (requires screen-resolution-extra >= 0.12). + * debian/rules: + - Switch to CDBS. + - Do not provide a desktop file. The different nvidia packages will + deal with it. + + -- Alberto Milone Sun, 10 Jan 2010 12:12:42 +0100 + +nvidia-settings (180.25-0ubuntu1) jaunty; urgency=low + + * New upstream release (LP: #315667) + * debian/patches/02_add_missing_serverlayout.dpatch: drop patch + + -- Alberto Milone (tseliot) Sat, 31 Jan 2009 17:21:51 +0100 + +nvidia-settings (177.78-0ubuntu2.1) intrepid-proposed; urgency=low + + * debian/rules: Add missing dpatch unpatching on clean. + * Add debian/patches/02_add_missing_serverlayout.dpatch: + - Prevent nvidia-settings from crashing when no ServerLayout section is + found in the xorg.conf (LP: #286424). + + -- Alberto Milone (tseliot) Sat, 01 Nov 2008 13:12:40 +0100 + +nvidia-settings (177.78-0ubuntu2) intrepid; urgency=low + + * Restore ROOT=$(DESTDIR) in the Makefile + + -- Alberto Milone (tseliot) Mon, 13 Oct 2008 15:16:15 +0200 + +nvidia-settings (177.78-0ubuntu1) intrepid; urgency=low + + * New upstream release + - Do not add RgbPath to the Files section of xorg.conf + (LP: #274866) + * debian/copyright: + - Restore detailed version of the license (cf. debian #494388) + + -- Alberto Milone (tseliot) Wed, 08 Oct 2008 18:24:16 +0200 + +nvidia-settings (173.14.09-1ubuntu3) intrepid; urgency=low + + [ Alberto Milone (tseliot) ] + * Comment out gtk_widget_modify_fg and gtk_widget_modify_bg in + src/gtk+-2.x/ctkglx.c + + [ Mario Limonciello ] + * Add dpatch patching support so that Alberto's previous patch is + not lost in newer upstream versions. + + -- Alberto Milone (tseliot) Thu, 28 Aug 2008 22:56:28 +0200 + +nvidia-settings (173.14.09-1ubuntu2) intrepid; urgency=low + + * debian/rules: force -fPIC in CFLAGS for xnvctrl library. + + -- Stefan Potyra Sun, 10 Aug 2008 12:52:07 +0200 + +nvidia-settings (173.14.09-1ubuntu1) intrepid; urgency=low + + * Merge from unstable, remaining changes: + - debian/copyright: updated, add MIT license (cf. debian #494388). + - debian/rules, debian/nvidia-settings.desktop: install desktop file + (cf. debian #317993). Also add usr/share/applications to dirs. + - drop Recommends on nvidia-glx, instead the nvidia drivers will + recommend nvidia-settings. + - update build depends of xutils and xlibmesa-gl-dev. + - update debian/rules to clean also XF86Config-parser directory + (cf. debian: #494456). + Dropped: + - patch against src/gtk+-2.x/ctkwindow.c: solved upstream. + - separate package libxnvctrl-dev (caused a major diversion, not so + much nicer to keep it). + - updating standards-version + - debhelper bump (it should build fine with v4). + * debian/control: + - add Conflicts against libxnvctrl-dev, which is dropped with this + upload and used to contain the static library/header files that + are now found in nvidia-settings itself. + + -- Stefan Potyra Sat, 09 Aug 2008 22:33:28 +0200 + +nvidia-settings (173.14.09-1) unstable; urgency=low + + * New upstream release + + -- Randall Donald Tue, 24 Jun 2008 10:41:09 -0700 + +nvidia-settings (169.07-1) unstable; urgency=low + + * New upstream release + * reinclude nvctrl headers (closes: #434885) + * depend on nvidia-glx (169.07). there are legacy versions now too. + + -- Randall Donald Sun, 23 Dec 2007 17:07:10 -0800 + +nvidia-settings (1.0+20080304-0ubuntu3) intrepid; urgency=low + + [ Alberto Milone (tseliot) ] + * Remove Recommends and Conflicts from nvidia-settings. Each NVIDIA driver + will Recommend nvidia-settings instead. + + [ Mario Limonciello ] + * debian/control: + - Modify build depends from obsoleted packages xutils and xlibmesa-gl-dev + - Bump standards version. + + -- Mario Limonciello Tue, 08 Jul 2008 13:13:05 -0500 + +nvidia-settings (1.0+20080304-0ubuntu2) intrepid; urgency=low + + * src/gtk+-2.x/ctkwindow.c: + - Set selection to default to first item when opening (LP: #198503) + + -- Mario Limonciello Wed, 04 Jun 2008 22:21:40 -0500 + +nvidia-settings (1.0+20080304-0ubuntu1) hardy; urgency=low + + * New upstream version. (LP: #198484) + - Fixes errors writing out xorg.conf + (LP: #194528,195241,195302,197568,198215) + + -- Mario Limonciello Tue, 04 Mar 2008 13:50:58 -0600 + +nvidia-settings (1.0+20071221-0ubuntu5) hardy; urgency=low + + * Add versioned nvidia-glx-legacy to Recommends and Conflicts + + -- Emmet Hikory Sat, 16 Feb 2008 10:38:08 +0900 + +nvidia-settings (1.0+20071221-0ubuntu4) hardy; urgency=low + + * debian/control: add versioned conflicts to older nvidia-glx and + nvidia-glx-new for the binary package nvidia-settings. The older + conflicted versions shipped the nvidia-settings application as + well. + * Add nvidia-glx-new as alternate recommends in debian/control. + * debian/control: (re)add versions to the recommends. + * debian/rules: don't create usr/lib for nvidia-settings (seems like + I initially added that wrongly when dropping nvidia-settings + binary package). + + -- Stefan Potyra Fri, 15 Feb 2008 22:30:12 +0100 + +nvidia-settings (1.0+20071221-0ubuntu3) hardy; urgency=low + + * Drop version from nvidia-glx recommends for virtual package support + + -- Emmet Hikory Sat, 16 Feb 2008 04:36:10 +0900 + +nvidia-settings (1.0+20071221-0ubuntu2) hardy; urgency=low + + * Enable nvidia-settings binary package again, since the binary + was dropped from nvidia-glx* in favor of this opensource version. + * Add nvidia-settings.desktop, set the category to System;Settings;. + * rules: clean src/XF86Config-parser. + * control: libxnvctrl-dev section libdevel -> contrib/libdevel. + + -- Timo Aaltonen Wed, 13 Feb 2008 16:52:16 +0200 + +nvidia-settings (1.0+20071221-0ubuntu1) hardy; urgency=low + + * New upstream version (aka 169.07). + * debian/control: Mangle maintainer/XSBC-Original-Maintainer according to + spec. + * debian/control: add libxnvctrl-dev package, which contains the headers + and the static library. + * move current debian/* to package specific places: + - debian/dirs -> removed (cannot handle non-existant package with + debhelper) + - debian/menu -> debian/nvidia-settings.menu + - debian/docs -> debian/nvidia-settings.doc, debian/libxnvctrl-dev.docs, + splitting off the relevant files. + * debian/rules: install libXNVCtrl.a to libxnvctrl-dev package. + * debian/rules: install the headers NVCtrl.h and NVCtrlLib.h to + the libxnvctrl-dev package (cf. LP bug #59945). + Also create necessary directories. + * bump debhelper recommends to version 5: + - debian/compat updated + - debian/control: tighten debhelper build-depends version. + * debian/README.ubuntu: new file, explaining the ubuntu changes. + * debian/examples -> debian/libxnvctrl.examples, because the examples + only apply to libXNVCtrl.a. + * debian/control: comment out nvidia-settings package: + The nvidia-settings binary is provided by linux-restricted-modules, + so there's no need to ship it from this package. + * debian/rules: force remove the directories from nvidia-settings in + clean rule. + * debian/copyright: updated, adjusted to list all other licensed files + as well. + + -- Stefan Potyra Fri, 08 Feb 2008 23:38:35 +0100 + +nvidia-settings (1.0+20070502-1) unstable; urgency=low + + * New upstream release. + + -- Randall Donald Sat, 12 May 2007 14:34:59 -0700 + +nvidia-settings (1.0+20060919-1) unstable; urgency=low + + * New upstream release (20060919) + * include /usr/lib/libXNVCtrl.a (closes: #375191) + + -- Randall Donald Sat, 7 Oct 2006 14:31:44 -0700 + +nvidia-settings (1.0+20060516-1) unstable; urgency=low + + * add build depend on m4. (closes: #369661) + * New upstream (nvidia-settings-1.0.tar.gz 05/16/06 ) + + -- Randall Donald Fri, 2 Jun 2006 23:21:01 -0700 + +nvidia-settings (1.0+20060404-1) unstable; urgency=low + + * New upstream (nvidia-settings-1.0.tar.gz 04/04/06) + * fix for xorg7 (closes: #366243) + + -- Randall Donald Wed, 17 May 2006 19:21:28 -0700 + +nvidia-settings (1.0+20051122-1) unstable; urgency=low + + * New upstream. (nvidia-settings-1.0-11-22-05.tar.gz) + + -- Randall Donald Wed, 28 Dec 2005 14:10:15 -0800 + +nvidia-settings (1.0+20050729-1) unstable; urgency=low + + * New upstream. + * update standards version: 3.6.2 + * correct fsf address + + -- Randall Donald Mon, 7 Nov 2005 10:54:24 -0800 + +nvidia-settings (1.0+20050525-2.2) unstable; urgency=low + + * Non-maintainer upload + * corrected X11R6_LIB_DIR for x86_64 (closes: #321295, #327337) + + -- tony mancill Fri, 30 Sep 2005 08:44:56 -0700 + +nvidia-settings (1.0+20050525-2.1) unstable; urgency=low + + * Non-maintainer upload + * adds build-depends on libxv-dev (closes: #324594) + + -- tony mancill Sun, 11 Sep 2005 10:49:58 -0700 + +nvidia-settings (1.0+20050525-2) unstable; urgency=low + + * Change build-depends from xlibs-static-dev to libxxf86vm-dev + (closes: #318814) + + -- Randall Donald Tue, 19 Jul 2005 13:56:09 -0700 + +nvidia-settings (1.0+20050525-1) unstable; urgency=low + + * upstream from May 25 2005 + * add date to version name. (how about that for an idea, duh) + + -- Randall Donald Mon, 20 Jun 2005 15:19:10 -0700 + +nvidia-settings (1.0+3-1) unstable; urgency=low + + * upstream from 03/22/05 + * add libxrandr-dev and xlibmesa-gl-dev to build depends + + -- Randall Donald Sat, 2 Apr 2005 04:51:20 +0000 + +nvidia-settings (1.0+2-3) unstable; urgency=low + + * patch for rebuilding libXNVCtrl.a runtime. Thanks + to Tollef Fog Heen (closes: 265640) + * change arch to only those supported by nvidia. + + -- Randall Donald Sat, 13 Nov 2004 12:41:47 -0800 + +nvidia-settings (1.0+2-2) unstable; urgency=low + + * Build against libs in unstable, not experimental. (closes: #280221) + + -- Randall Donald Mon, 8 Nov 2004 02:29:31 -0800 + +nvidia-settings (1.0+2-1) unstable; urgency=low + + * New upstream from Nov 5, 2004. + + -- Randall Donald Sun, 7 Nov 2004 00:02:46 -0800 + +nvidia-settings (1.0+1-1) unstable; urgency=low + + * New upstream (minor quit dialog change) but no new upstream + version number. + + -- Randall Donald Thu, 5 Aug 2004 13:52:07 -0700 + +nvidia-settings (1.0-3) unstable; urgency=low + + * Fix Author(s) :p + * install debian menu. + + -- Randall Donald Sat, 3 Jul 2004 19:09:17 -0700 + +nvidia-settings (1.0-2) unstable; urgency=low + + * Fix Build-Depends + + -- Randall Donald Wed, 30 Jun 2004 22:39:18 -0700 + +nvidia-settings (1.0-1) unstable; urgency=low + + * Initial Release. + + -- Randall Donald Wed, 30 Jun 2004 16:45:52 -0700 + --- nvidia-settings-195.36.08.orig/debian/patches/02_nvidia-settings-format-string.patch +++ nvidia-settings-195.36.08/debian/patches/02_nvidia-settings-format-string.patch @@ -0,0 +1,88 @@ +Index: nvidia-settings-1.0/src/query-assign.c +=================================================================== +--- nvidia-settings-1.0/src/query-assign.c ++++ nvidia-settings-1.0/src/query-assign.c 2009-07-17 04:23:15.528973916 +0300 +@@ -755,7 +755,7 @@ + for (i = 0; targetTypeTable[i].name; i++) { + if (valid.permissions & targetTypeTable[i].permission_bit) { + if (n > 0) c += sprintf(c, ", "); +- c += sprintf(c, targetTypeTable[i].name); ++ c += sprintf(c, "%s", targetTypeTable[i].name); + n++; + } + } +Index: nvidia-settings-1.0/src/gtk+-2.x/ctkdisplayconfig.c +=================================================================== +--- nvidia-settings-1.0/src/gtk+-2.x/ctkdisplayconfig.c ++++ nvidia-settings-1.0/src/gtk+-2.x/ctkdisplayconfig.c 2009-07-17 04:28:06.217972586 +0300 +@@ -653,7 +653,7 @@ + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_NONE, +- msg); ++ "%s", msg); + + gtk_dialog_add_buttons(GTK_DIALOG(dlg), + "Truncate MetaModes", +@@ -4220,7 +4220,7 @@ + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, +- msg); ++ "%s", msg); + + gtk_dialog_run(GTK_DIALOG(dlg)); + gtk_widget_destroy(dlg); +@@ -5850,7 +5850,7 @@ + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_YES_NO, +- msg); ++ "%s", msg); + } else { + msg = g_strdup_printf("Failed to set MetaMode (%d) '%s' " + "(Mode %dx%d, id: %d) on X screen %d.", +@@ -5862,7 +5862,7 @@ + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, +- msg); ++ "%s", msg); + } + + result = gtk_dialog_run(GTK_DIALOG(dlg)); +Index: nvidia-settings-1.0/src/gtk+-2.x/ctkslimm.c +=================================================================== +--- nvidia-settings-1.0/src/gtk+-2.x/ctkslimm.c ++++ nvidia-settings-1.0/src/gtk+-2.x/ctkslimm.c 2009-07-17 04:31:00.462973003 +0300 +@@ -353,7 +353,7 @@ + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, +- err_msg); ++ "%s", err_msg); + + gtk_dialog_run(GTK_DIALOG(dlg)); + gtk_widget_destroy(dlg); +Index: nvidia-settings-1.0/src/gtk+-2.x/ctkutils.c +=================================================================== +--- nvidia-settings-1.0/src/gtk+-2.x/ctkutils.c ++++ nvidia-settings-1.0/src/gtk+-2.x/ctkutils.c 2009-07-17 04:26:44.069972888 +0300 +@@ -106,7 +106,7 @@ + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, +- msg); ++ "%s", msg); + gtk_dialog_run(GTK_DIALOG(dlg)); + gtk_widget_destroy(dlg); + } +@@ -134,7 +134,7 @@ + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, +- msg); ++ "%s", msg); + gtk_dialog_run(GTK_DIALOG(dlg)); + gtk_widget_destroy(dlg); + } --- nvidia-settings-195.36.08.orig/debian/patches/05_add_polkit_support.patch +++ nvidia-settings-195.36.08/debian/patches/05_add_polkit_support.patch @@ -0,0 +1,91 @@ +diff -Nurp nvidia-settings-190.53.orig/src/gtk+-2.x/ctkdisplayconfig-utils.c nvidia-settings-190.53/src/gtk+-2.x/ctkdisplayconfig-utils.c +--- nvidia-settings-190.53.orig/src/gtk+-2.x/ctkdisplayconfig-utils.c 2009-12-09 06:18:39.000000000 +0100 ++++ nvidia-settings-190.53/src/gtk+-2.x/ctkdisplayconfig-utils.c 2009-12-30 15:04:53.089702717 +0100 +@@ -2762,6 +2762,77 @@ static void update_banner(XConfigPtr con + + } /* update_banner() */ + ++/** ubuntu save_xconfig_file() ****************************** ++ * ++ * Calls Screen Resolution Extra (which uses PolicyKit) to save ++ * the X config file text from buf into a file called filename. ++ * If the filename already exists, a backup file named ++ * 'filename.backup' is created. ++ * ++ **/ ++ ++static int ubuntu_save_xconfig_file(SaveXConfDlg *dlg, ++ gchar *filename, char *buf, mode_t mode) ++{ ++ gchar *backup_filename = NULL; ++ int temp_fd; ++ gchar *err_msg = NULL; ++ ++ int ret = 0; ++ gchar *temp_filename; ++ gchar *command; ++ gboolean polkit_status; ++ int status; ++ char *nvidia_polkit = "/usr/share/screen-resolution-extra/nvidia-polkit.py"; ++ ++ if (!buf || !filename) goto done; ++ ++ backup_filename = g_strdup_printf("%s.backup", filename); ++ ++ /* Write out the X config file to a temporary file */ ++ temp_filename = g_strdup_printf("/tmp/nvidia-settings.XXXXXX"); ++ temp_fd = mkstemp(temp_filename); ++ write(temp_fd, buf, strlen(buf)); ++ close(temp_fd); ++ ++ /* Backup the the X config file (if any) and write out the X config ++ * file from the temporary file ++ */ ++ command = g_strconcat("python ", ++ nvidia_polkit, ++ " --write-from=", ++ temp_filename, ++ " --backup-to=", ++ backup_filename, ++ NULL); ++ polkit_status = (g_spawn_command_line_sync(command, NULL, NULL, &status, NULL) && status == 0); ++ g_free(command); ++ ++ /* Remove the temporary file */ ++ unlink(temp_filename); ++ g_free(temp_filename); ++ ++ if (!polkit_status) { ++ err_msg = g_strdup_printf("Unable to open X config file '%s' for writing.", ++ filename); ++ goto done; ++ } ++ ++ ret = 1; ++ ++ done: ++ /* Display any errors that might have occured */ ++ if (err_msg) { ++ ctk_display_error_msg(ctk_get_parent_window(GTK_WIDGET(dlg->parent)), ++ err_msg); ++ g_free(err_msg); ++ } ++ ++ g_free(backup_filename); ++ return ret; ++ ++} /* save_xconfig_file() */ ++ + + + /** save_xconfig_file() ********************************************** +@@ -2782,6 +2853,9 @@ static int save_xconfig_file(SaveXConfDl + + int ret = 0; + ++ ret = ubuntu_save_xconfig_file(dlg, filename, buf, mode); ++ ++ return ret; + + if (!buf || !filename) goto done; + --- nvidia-settings-195.36.08.orig/debian/patches/01_allow_dark_themes.dpatch +++ nvidia-settings-195.36.08/debian/patches/01_allow_dark_themes.dpatch @@ -0,0 +1,45 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_allow_dark_themes.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Allow nvidia-settings to work with dark backgrounds + +@DPATCH@ +diff -urNad nvidia-settings-173.14.09~/src/gtk+-2.x/ctkglx.c nvidia-settings-173.14.09/src/gtk+-2.x/ctkglx.c +--- nvidia-settings-173.14.09~/src/gtk+-2.x/ctkglx.c 2008-06-05 02:14:03.000000000 -0500 ++++ nvidia-settings-173.14.09/src/gtk+-2.x/ctkglx.c 2008-08-28 16:59:43.000000000 -0500 +@@ -265,8 +265,8 @@ + event = gtk_event_box_new(); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollWin), + GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); +- gtk_widget_modify_fg(event, GTK_STATE_NORMAL, &(event->style->text[GTK_STATE_NORMAL])); +- gtk_widget_modify_bg(event, GTK_STATE_NORMAL, &(event->style->base[GTK_STATE_NORMAL])); ++ //gtk_widget_modify_fg(event, GTK_STATE_NORMAL, &(event->style->text[GTK_STATE_NORMAL])); ++ //gtk_widget_modify_bg(event, GTK_STATE_NORMAL, &(event->style->base[GTK_STATE_NORMAL])); + gtk_container_add(GTK_CONTAINER(event), hbox); + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrollWin), + event); +@@ -349,15 +349,15 @@ + data_table = gtk_table_new(num_fbconfigs, NUM_FBCONFIG_ATTRIBS, FALSE); + event = gtk_event_box_new(); + +- gtk_widget_modify_fg(data_table, GTK_STATE_NORMAL, +- &(data_table->style->text[GTK_STATE_NORMAL])); +- gtk_widget_modify_bg(data_table, GTK_STATE_NORMAL, +- &(data_table->style->base[GTK_STATE_NORMAL])); ++ //gtk_widget_modify_fg(data_table, GTK_STATE_NORMAL, ++ // &(data_table->style->text[GTK_STATE_NORMAL])); ++ //gtk_widget_modify_bg(data_table, GTK_STATE_NORMAL, ++ // &(data_table->style->base[GTK_STATE_NORMAL])); + gtk_container_add (GTK_CONTAINER(event), data_table); +- gtk_widget_modify_fg(event, GTK_STATE_NORMAL, +- &(event->style->text[GTK_STATE_NORMAL])); +- gtk_widget_modify_bg(event, GTK_STATE_NORMAL, +- &(event->style->base[GTK_STATE_NORMAL])); ++ //gtk_widget_modify_fg(event, GTK_STATE_NORMAL, ++ // &(event->style->text[GTK_STATE_NORMAL])); ++ //gtk_widget_modify_bg(event, GTK_STATE_NORMAL, ++ // &(event->style->base[GTK_STATE_NORMAL])); + gtk_container_add(GTK_CONTAINER(data_viewport), event); + + /* Pack the fbconfig header and data tables */ --- nvidia-settings-195.36.08.orig/debian/patches/03_do_not_exit_on_no_scanout.patch +++ nvidia-settings-195.36.08/debian/patches/03_do_not_exit_on_no_scanout.patch @@ -0,0 +1,26 @@ +Description: Do not fail if the driver doesn't support NV_CTRL_NO_SCANOUT + NV_CTRL_NO_SCANOUT is not supported by legacy drivers such as series + 173 and 96. Pretending that the property exists and is set to false + prevents nvidia-settings from breaking compatibility with these drivers. +Forwarded: no +Bug: https://bugs.launchpad.net/ubuntu/+source/nvidia-settings/+bug/539196 +Author: Alberto Milone + +diff -Nurp nvidia-settings-195.36.08.orig/src/gtk+-2.x/ctkdisplayconfig-utils.c nvidia-settings-195.36.08/src/gtk+-2.x/ctkdisplayconfig-utils.c +--- nvidia-settings-195.36.08.orig/src/gtk+-2.x/ctkdisplayconfig-utils.c 2010-02-25 14:44:28.000000000 +0100 ++++ nvidia-settings-195.36.08/src/gtk+-2.x/ctkdisplayconfig-utils.c 2010-04-06 19:47:14.335936746 +0200 +@@ -2112,11 +2112,14 @@ static int gpu_add_screen_from_server(nv + /* See if the screen is set to not scanout */ + ret = NvCtrlGetAttribute(screen->handle, NV_CTRL_NO_SCANOUT, &val); + if (ret != NvCtrlSuccess) { ++ /* + *err_str = g_strdup_printf("Failed to query NoScanout for " + "screen %d.", + screen_id); + nv_warning_msg(*err_str); + goto fail; ++ */ ++ val = NV_CTRL_NO_SCANOUT_DISABLED; + } + screen->no_scanout = (val == NV_CTRL_NO_SCANOUT_ENABLED) ? TRUE : FALSE; +