diff -Nru nvidia-settings-304.51/debian/changelog nvidia-settings-304.51a/debian/changelog --- nvidia-settings-304.51/debian/changelog 2012-10-01 11:01:04.000000000 +0000 +++ nvidia-settings-304.51a/debian/changelog 2012-10-01 11:01:04.000000000 +0000 @@ -1,38 +1,58 @@ -nvidia-settings (304.51-0ubuntu1~precise~xup1) precise; urgency=low +nvidia-settings (304.51a-0yavdr0~precise) precise; urgency=medium - * New upstream release. + * rebuild package from xorg-edgers - -- Brandon Snider Mon, 24 Sep 2012 17:33:23 -0400 + -- Lars Hanisch Mon, 01 Oct 2012 12:27:29 +0200 -nvidia-settings (304.43-0ubuntu1~precise~xup1) precise; urgency=low +nvidia-settings (304.51-0ubuntu1~xedgers~precise1) precise; urgency=medium - * New upstream release. + * New upstream release - -- Brandon Snider Mon, 27 Aug 2012 22:41:04 -0400 + -- Rico Tzschichholz Mon, 24 Sep 2012 16:19:04 +0200 -nvidia-settings (304.37-0ubuntu1~precise~xup1) precise; urgency=low +nvidia-settings (304.43-0ubuntu1) quantal; urgency=low - * New upstream release. + * New upstream release (LP: #1037483): + - Updated nvidia-settings to use RandR per-CRTC gamma + control, when available. When controlling an X + server with support for RandR 1.2, nvidia-settings + will display the color correction widget as a tab + within each display device page, instead of a + per-X screen color correction page. + - Added the ability to select and move X screens in + the "X Server Display Configuration" page of + nvidia-settings via Ctrl-(Left)Click + Drag. + - Fixed a bug that prevented the display palette + from being updated immediately after an application + called XStoreColors. + - Fixed a bug that caused gnome-settings-daemon to + revert display configuration changes made by + nvidia-settings. - -- Brandon Snider Wed, 15 Aug 2012 23:17:21 -0400 + -- Alberto Milone Tue, 28 Aug 2012 14:01:47 +0200 -nvidia-settings (302.17-0ubuntu1~precise~xup3) precise; urgency=low +nvidia-settings (302.17-0ubuntu2) quantal; urgency=low - * New upstream release. + * Rename build to build-arch and make build depend on build-arch. - -- Brandon Snider Sun, 17 Jun 2012 18:04:14 -0400 + -- Adam Conrad Mon, 02 Jul 2012 17:18:24 -0600 -nvidia-settings (295.53-0ubuntu1~precise~xup1) precise; urgency=low +nvidia-settings (302.17-0ubuntu1) quantal; urgency=low * New upstream release. + * Refresh 04_nvidia-settings_natty_ftbs.patch. + * Drop 02_nvidia-settings-format-string.patch which + is now upstream. + * debian/rules: + - Make sure to install the new sources correctly. - -- Brandon Snider Wed, 16 May 2012 14:29:54 -0400 + -- Alberto Milone Mon, 25 Jun 2012 16:31:12 +0200 -nvidia-settings (295.33-0ubuntu1~precise~xup1) precise; urgency=low +nvidia-settings (295.33-0ubuntu1) precise; urgency=low * New upstream release. - -- Brandon Snider Thu, 22 Mar 2012 19:36:05 -0400 + -- Alberto Milone Fri, 30 Mar 2012 14:23:10 +0200 nvidia-settings (295.20-0ubuntu1) precise; urgency=low diff -Nru nvidia-settings-304.51/debian/patches/02_nvidia-settings-format-string.patch nvidia-settings-304.51a/debian/patches/02_nvidia-settings-format-string.patch --- nvidia-settings-304.51/debian/patches/02_nvidia-settings-format-string.patch 1970-01-01 00:00:00.000000000 +0000 +++ nvidia-settings-304.51a/debian/patches/02_nvidia-settings-format-string.patch 2012-10-01 11:01:04.000000000 +0000 @@ -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); + } diff -Nru nvidia-settings-304.51/debian/patches/03_do_not_exit_on_no_scanout.patch nvidia-settings-304.51a/debian/patches/03_do_not_exit_on_no_scanout.patch --- nvidia-settings-304.51/debian/patches/03_do_not_exit_on_no_scanout.patch 1970-01-01 00:00:00.000000000 +0000 +++ nvidia-settings-304.51a/debian/patches/03_do_not_exit_on_no_scanout.patch 2012-10-01 11:01:04.000000000 +0000 @@ -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; + diff -Nru nvidia-settings-304.51/debian/patches/04_nvidia-settings_natty_ftbs.patch nvidia-settings-304.51a/debian/patches/04_nvidia-settings_natty_ftbs.patch --- nvidia-settings-304.51/debian/patches/04_nvidia-settings_natty_ftbs.patch 1970-01-01 00:00:00.000000000 +0000 +++ nvidia-settings-304.51a/debian/patches/04_nvidia-settings_natty_ftbs.patch 2012-10-01 11:01:04.000000000 +0000 @@ -0,0 +1,12 @@ +diff -Nurp nvidia-settings.orig/src/Makefile nvidia-settings/src/Makefile +--- nvidia-settings.orig/src/Makefile 2012-05-02 17:06:02.000000000 +0200 ++++ nvidia-settings/src/Makefile 2012-05-17 09:09:32.341638054 +0200 +@@ -51,7 +51,7 @@ ifndef GTK_CFLAGS + endif + + ifndef GTK_LDFLAGS +- GTK_LDFLAGS := $(shell $(PKG_CONFIG) --libs gtk+-2.0) ++ GTK_LDFLAGS := $(shell $(PKG_CONFIG) --libs gtk+-2.0) -ldl + endif + + diff -Nru nvidia-settings-304.51/debian/patches/05_add_polkit_support.patch nvidia-settings-304.51a/debian/patches/05_add_polkit_support.patch --- nvidia-settings-304.51/debian/patches/05_add_polkit_support.patch 2012-10-01 11:01:04.000000000 +0000 +++ nvidia-settings-304.51a/debian/patches/05_add_polkit_support.patch 2012-10-01 11:01:04.000000000 +0000 @@ -1,7 +1,8 @@ ---- a/src/gtk+-2.x/ctkdisplayconfig-utils.c -+++ b/src/gtk+-2.x/ctkdisplayconfig-utils.c -@@ -3104,6 +3104,77 @@ static void update_banner(XConfigPtr con - +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() ****************************** @@ -78,7 +79,7 @@ /** save_xconfig_file() ********************************************** -@@ -3125,6 +3196,9 @@ static int save_xconfig_file(SaveXConfDl +@@ -2782,6 +2853,9 @@ static int save_xconfig_file(SaveXConfDl int ret = 0; diff -Nru nvidia-settings-304.51/debian/patches/series nvidia-settings-304.51a/debian/patches/series --- nvidia-settings-304.51/debian/patches/series 2012-10-01 11:01:04.000000000 +0000 +++ nvidia-settings-304.51a/debian/patches/series 2012-10-01 11:01:04.000000000 +0000 @@ -1,2 +1,3 @@ 01_allow_dark_themes.dpatch +04_nvidia-settings_natty_ftbs.patch 05_add_polkit_support.patch