← Back to branch summary

~ubuntu-branches/ubuntu/hardy/nvidia-settings/hardy-proposed

~ubuntu-branches/ubuntu/hardy/nvidia-settings/hardy-proposed

Viewing all changes in revision 8.

Committer: Bazaar Package Importer
Author(s): Colin Watson
Date: 2007-05-25 09:20:13 UTC
mfrom: (1.1.3 upstream)
Revision ID: james.westby@ubuntu.com-20070525092013-hy6ek4rynlbe221l

Tags: 1.0+20070502-1ubuntu1

* Resynchronise with Debian. Remaining changes:
  - Make the nvidia-glx recommendation unversioned, as nvidia-glx-legacy
    provides nvidia-glx.
  - Change preferred libgl-dev provider to libgl1-mesa-dev.

files added:
Makefile.inc

samples/Makefile.inc

src/XF86Config-parser

src/XF86Config-parser/Configint.h

src/XF86Config-parser/DRI.c

src/XF86Config-parser/Device.c

src/XF86Config-parser/Extensions.c

src/XF86Config-parser/Files.c

src/XF86Config-parser/Flags.c

src/XF86Config-parser/Generate.c

src/XF86Config-parser/Input.c

src/XF86Config-parser/Keyboard.c

src/XF86Config-parser/Layout.c

src/XF86Config-parser/Makefile

src/XF86Config-parser/Makefile.inc

src/XF86Config-parser/Module.c

src/XF86Config-parser/Monitor.c

src/XF86Config-parser/Pointer.c

src/XF86Config-parser/Read.c

src/XF86Config-parser/Scan.c

src/XF86Config-parser/Screen.c

src/XF86Config-parser/Util.c

src/XF86Config-parser/Vendor.c

src/XF86Config-parser/Video.c

src/XF86Config-parser/Write.c

src/XF86Config-parser/configProcs.h

src/XF86Config-parser/xf86Parser.h

src/XF86Config-parser/xf86tokens.h

src/gtk+-2.x/ctkbanner.c

src/gtk+-2.x/ctkbanner.h

src/gtk+-2.x/ctkdisplayconfig.c

src/gtk+-2.x/ctkdisplayconfig.h

src/gtk+-2.x/ctkdisplaylayout.c

src/gtk+-2.x/ctkdisplaylayout.h

src/gtk+-2.x/ctkgpu.c

src/gtk+-2.x/ctkgpu.h

src/gtk+-2.x/ctkscreen.c

src/gtk+-2.x/ctkscreen.h

src/gtk+-2.x/ctkserver.c

src/gtk+-2.x/ctkserver.h

src/gtk+-2.x/ctkvcsc.c

src/gtk+-2.x/ctkvcsc.h

src/image_data/antialias_pixdata.h

src/image_data/background_pixdata.h

src/image_data/background_tall_pixdata.h

src/image_data/bsd_pixdata.h

src/image_data/clock_pixdata.h

src/image_data/color_pixdata.h

src/image_data/config_pixdata.h

src/image_data/crt_pixdata.h

src/image_data/cursor_shadow_pixdata.h

src/image_data/dfp_pixdata.h

src/image_data/display_config_pixdata.h

src/image_data/framelock_pixdata.h

src/image_data/glx_pixdata.h

src/image_data/gpu_pixdata.h

src/image_data/help_pixdata.h

src/image_data/logo_pixdata.h

src/image_data/logo_tall_pixdata.h

src/image_data/opengl_pixdata.h

src/image_data/penguin_pixdata.h

src/image_data/rotation_pixdata.h

src/image_data/sdi_pixdata.h

src/image_data/solaris_pixdata.h

src/image_data/thermal_pixdata.h

src/image_data/tv_pixdata.h

src/image_data/vcsc_pixdata.h

src/image_data/x_pixdata.h

src/image_data/xvideo_pixdata.h

files removed:
doc/nvidia-settings.1

src/gtk+-2.x/ctkdevice.c

src/gtk+-2.x/ctkdevice.h

src/gtk+-2.x/ctkdisplaydevice.c

src/gtk+-2.x/ctkdisplaydevice.h

src/image_data/antialiasing_banner.h

src/image_data/big_banner_bsd.h

src/image_data/big_banner_penguin.h

src/image_data/big_banner_sun.h

src/image_data/clocks_banner.h

src/image_data/color_correction_banner.h

src/image_data/configuration_banner.h

src/image_data/crt.h

src/image_data/crt_banner.h

src/image_data/cursor_banner.h

src/image_data/dfp.h

src/image_data/dfp_banner.h

src/image_data/display_device_banner.h

src/image_data/frame_lock_banner.h

src/image_data/glx_banner.h

src/image_data/gvo_banner_comp_sync_green.h

src/image_data/gvo_banner_comp_sync_grey.h

src/image_data/gvo_banner_comp_sync_red.h

src/image_data/gvo_banner_comp_sync_yellow.h

src/image_data/gvo_banner_left.h

src/image_data/gvo_banner_right.h

src/image_data/gvo_banner_sdi_sync_green.h

src/image_data/gvo_banner_sdi_sync_grey.h

src/image_data/gvo_banner_sdi_sync_red.h

src/image_data/gvo_banner_sdi_sync_yellow.h

src/image_data/gvo_banner_vid1_green.h

src/image_data/gvo_banner_vid1_grey.h

src/image_data/gvo_banner_vid1_red.h

src/image_data/gvo_banner_vid1_yellow.h

src/image_data/gvo_banner_vid2_green.h

src/image_data/gvo_banner_vid2_grey.h

src/image_data/gvo_banner_vid2_red.h

src/image_data/gvo_banner_vid2_yellow.h

src/image_data/help_banner.h

src/image_data/opengl_banner.h

src/image_data/rotation_banner.h

src/image_data/thermal_banner.h

src/image_data/tv.h

src/image_data/tv_banner.h

src/image_data/xvideo_banner.h

src/xpm_data/mini_xpm.h

src/xpm_data/x11_xpm.h

files modified:
Makefile

debian/changelog

debian/control

debian/dirs

debian/rules

doc/Makefile.inc

doc/nvidia-settings.1.m4

samples/nv-control-dpy.c

samples/nv-control-events.c

samples/nv-control-targets.c

src/Makefile.inc

src/command-line.c

src/command-line.h

src/config-file.c

src/config-file.h

src/gtk+-2.x/Makefile.inc

src/gtk+-2.x/ctkclocks.c

src/gtk+-2.x/ctkclocks.h

src/gtk+-2.x/ctkcolorcorrection.c

src/gtk+-2.x/ctkconfig.c

src/gtk+-2.x/ctkconfig.h

src/gtk+-2.x/ctkcursorshadow.c

src/gtk+-2.x/ctkdisplaydevice-crt.c

src/gtk+-2.x/ctkdisplaydevice-crt.h

src/gtk+-2.x/ctkdisplaydevice-dfp.c

src/gtk+-2.x/ctkdisplaydevice-dfp.h

src/gtk+-2.x/ctkdisplaydevice-tv.c

src/gtk+-2.x/ctkdisplaydevice-tv.h

src/gtk+-2.x/ctkevent.c

src/gtk+-2.x/ctkevent.h

src/gtk+-2.x/ctkframelock.c

src/gtk+-2.x/ctkframelock.h

src/gtk+-2.x/ctkglx.c

src/gtk+-2.x/ctkgvo-csc.c

src/gtk+-2.x/ctkgvo-csc.h

src/gtk+-2.x/ctkgvo.c

src/gtk+-2.x/ctkgvo.h

src/gtk+-2.x/ctkhelp.c

src/gtk+-2.x/ctkimage.c

src/gtk+-2.x/ctkimage.h

src/gtk+-2.x/ctkimagesliders.c

src/gtk+-2.x/ctkimagesliders.h

src/gtk+-2.x/ctkmultisample.c

src/gtk+-2.x/ctkmultisample.h

src/gtk+-2.x/ctkopengl.c

src/gtk+-2.x/ctkrandr.c

src/gtk+-2.x/ctkthermal.c

src/gtk+-2.x/ctkui.c

src/gtk+-2.x/ctkui.h

src/gtk+-2.x/ctkutils.c

src/gtk+-2.x/ctkutils.h

src/gtk+-2.x/ctkwindow.c

src/gtk+-2.x/ctkwindow.h

src/gtk+-2.x/ctkxvideo.c

src/image_data/HOWTO-ADD-IMAGES

src/image_data/Makefile.inc

src/image_data/bnc_cable.h

src/image_data/image.h

src/image_data/led_green.h

src/image_data/led_grey.h

src/image_data/led_red.h

src/image_data/rj45_input.h

src/image_data/rj45_output.h

src/image_data/rj45_unused.h

src/image_data/rotate_left_off.h

src/image_data/rotate_left_on.h

src/image_data/rotate_right_off.h

src/image_data/rotate_right_on.h

src/image_data/rotation_orientation_horiz.h

src/image_data/rotation_orientation_horiz_flipped.h

src/image_data/rotation_orientation_vert.h

src/image_data/rotation_orientation_vert_flipped.h

src/libXNVCtrl/Makefile.inc

src/libXNVCtrl/NVCtrl.c

src/libXNVCtrl/NVCtrl.h

src/libXNVCtrl/NVCtrlLib.h

src/libXNVCtrl/libXNVCtrl.a

src/libXNVCtrl/nv_control.h

src/libXNVCtrlAttributes/Makefile.inc

src/libXNVCtrlAttributes/NvCtrlAttributes.c

src/libXNVCtrlAttributes/NvCtrlAttributes.h

src/libXNVCtrlAttributes/NvCtrlAttributesGlx.c

src/libXNVCtrlAttributes/NvCtrlAttributesNvControl.c

src/libXNVCtrlAttributes/NvCtrlAttributesPrivate.h

src/libXNVCtrlAttributes/NvCtrlAttributesXrandr.c

src/libXNVCtrlAttributes/NvCtrlAttributesXv.c

src/msg.c

src/msg.h

src/nvidia-settings.c

src/parse.c

src/parse.h

src/query-assign.c

src/xpm_data/Makefile.inc

Show diffs side-by-side

added added

removed removed

debian/changelog

doc/Makefile.inc

doc/nvidia-settings.1

doc/nvidia-settings.1.m4

samples/Makefile.inc

samples/nv-control-dpy.c

samples/nv-control-events.c

samples/nv-control-targets.c

src/Makefile.inc

src/XF86Config-parser/

src/XF86Config-parser/Configint.h

src/XF86Config-parser/DRI.c

src/XF86Config-parser/Device.c

src/XF86Config-parser/Extensions.c

src/XF86Config-parser/Files.c

src/XF86Config-parser/Flags.c

src/XF86Config-parser/Generate.c

src/XF86Config-parser/Input.c

src/XF86Config-parser/Keyboard.c

src/XF86Config-parser/Layout.c

src/XF86Config-parser/Makefile

src/XF86Config-parser/Makefile.inc

src/XF86Config-parser/Module.c

src/XF86Config-parser/Monitor.c

src/XF86Config-parser/Pointer.c

src/XF86Config-parser/Read.c

src/XF86Config-parser/Scan.c

src/XF86Config-parser/Screen.c

src/XF86Config-parser/Util.c

src/XF86Config-parser/Vendor.c

src/XF86Config-parser/Video.c

src/XF86Config-parser/Write.c

src/XF86Config-parser/configProcs.h

src/XF86Config-parser/xf86Parser.h

src/XF86Config-parser/xf86tokens.h

src/command-line.c

src/command-line.h

src/config-file.c

src/config-file.h

src/gtk+-2.x/Makefile.inc

src/gtk+-2.x/ctkbanner.c

src/gtk+-2.x/ctkbanner.h

src/gtk+-2.x/ctkclocks.c

src/gtk+-2.x/ctkclocks.h

src/gtk+-2.x/ctkcolorcorrection.c

src/gtk+-2.x/ctkconfig.c

src/gtk+-2.x/ctkconfig.h

src/gtk+-2.x/ctkcursorshadow.c

src/gtk+-2.x/ctkdevice.c

src/gtk+-2.x/ctkdevice.h

src/gtk+-2.x/ctkdisplayconfig.c

src/gtk+-2.x/ctkdisplayconfig.h

src/gtk+-2.x/ctkdisplaydevice-crt.c

src/gtk+-2.x/ctkdisplaydevice-crt.h

src/gtk+-2.x/ctkdisplaydevice-dfp.c

src/gtk+-2.x/ctkdisplaydevice-dfp.h

src/gtk+-2.x/ctkdisplaydevice-tv.c

src/gtk+-2.x/ctkdisplaydevice-tv.h

src/gtk+-2.x/ctkdisplaydevice.c

src/gtk+-2.x/ctkdisplaydevice.h

src/gtk+-2.x/ctkdisplaylayout.c

src/gtk+-2.x/ctkdisplaylayout.h

src/gtk+-2.x/ctkevent.c

src/gtk+-2.x/ctkevent.h

src/gtk+-2.x/ctkframelock.c

src/gtk+-2.x/ctkframelock.h

src/gtk+-2.x/ctkglx.c

src/gtk+-2.x/ctkgpu.c

src/gtk+-2.x/ctkgpu.h

src/gtk+-2.x/ctkgvo-csc.c

src/gtk+-2.x/ctkgvo-csc.h

src/gtk+-2.x/ctkgvo.c

src/gtk+-2.x/ctkgvo.h

src/gtk+-2.x/ctkhelp.c

src/gtk+-2.x/ctkimage.c

src/gtk+-2.x/ctkimage.h

src/gtk+-2.x/ctkimagesliders.c

src/gtk+-2.x/ctkimagesliders.h

src/gtk+-2.x/ctkmultisample.c

src/gtk+-2.x/ctkmultisample.h

src/gtk+-2.x/ctkopengl.c

src/gtk+-2.x/ctkrandr.c

src/gtk+-2.x/ctkscreen.c

src/gtk+-2.x/ctkscreen.h

src/gtk+-2.x/ctkserver.c

src/gtk+-2.x/ctkserver.h

src/gtk+-2.x/ctkthermal.c

src/gtk+-2.x/ctkui.c

src/gtk+-2.x/ctkui.h

src/gtk+-2.x/ctkutils.c

src/gtk+-2.x/ctkutils.h

src/gtk+-2.x/ctkvcsc.c

src/gtk+-2.x/ctkvcsc.h

src/gtk+-2.x/ctkwindow.c

src/gtk+-2.x/ctkwindow.h

src/gtk+-2.x/ctkxvideo.c

src/image_data/HOWTO-ADD-IMAGES

src/image_data/Makefile.inc

src/image_data/antialias_pixdata.h

src/image_data/antialiasing_banner.h

src/image_data/background_pixdata.h

src/image_data/background_tall_pixdata.h

src/image_data/big_banner_bsd.h

src/image_data/big_banner_penguin.h

src/image_data/big_banner_sun.h

src/image_data/bnc_cable.h

src/image_data/bsd_pixdata.h

src/image_data/clock_pixdata.h

src/image_data/clocks_banner.h

src/image_data/color_correction_banner.h

src/image_data/color_pixdata.h

src/image_data/config_pixdata.h

src/image_data/configuration_banner.h

src/image_data/crt.h

src/image_data/crt_banner.h

src/image_data/crt_pixdata.h

src/image_data/cursor_banner.h

src/image_data/cursor_shadow_pixdata.h

src/image_data/dfp.h

src/image_data/dfp_banner.h

src/image_data/dfp_pixdata.h

src/image_data/display_config_pixdata.h

src/image_data/display_device_banner.h

src/image_data/frame_lock_banner.h

src/image_data/framelock_pixdata.h

src/image_data/glx_banner.h

src/image_data/glx_pixdata.h

src/image_data/gpu_pixdata.h

src/image_data/gvo_banner_comp_sync_green.h

src/image_data/gvo_banner_comp_sync_grey.h

src/image_data/gvo_banner_comp_sync_red.h

src/image_data/gvo_banner_comp_sync_yellow.h

src/image_data/gvo_banner_left.h

src/image_data/gvo_banner_right.h

src/image_data/gvo_banner_sdi_sync_green.h

src/image_data/gvo_banner_sdi_sync_grey.h

src/image_data/gvo_banner_sdi_sync_red.h

src/image_data/gvo_banner_sdi_sync_yellow.h

src/image_data/gvo_banner_vid1_green.h

src/image_data/gvo_banner_vid1_grey.h

src/image_data/gvo_banner_vid1_red.h

src/image_data/gvo_banner_vid1_yellow.h

src/image_data/gvo_banner_vid2_green.h

src/image_data/gvo_banner_vid2_grey.h

src/image_data/gvo_banner_vid2_red.h

src/image_data/gvo_banner_vid2_yellow.h

src/image_data/help_banner.h

src/image_data/help_pixdata.h

src/image_data/image.h

src/image_data/led_green.h

src/image_data/led_grey.h

src/image_data/led_red.h

src/image_data/logo_pixdata.h

src/image_data/logo_tall_pixdata.h

src/image_data/opengl_banner.h

src/image_data/opengl_pixdata.h

src/image_data/penguin_pixdata.h

src/image_data/rj45_input.h

src/image_data/rj45_output.h

src/image_data/rj45_unused.h

src/image_data/rotate_left_off.h

src/image_data/rotate_left_on.h

src/image_data/rotate_right_off.h

src/image_data/rotate_right_on.h

src/image_data/rotation_banner.h

src/image_data/rotation_orientation_horiz.h

src/image_data/rotation_orientation_horiz_flipped.h

src/image_data/rotation_orientation_vert.h

src/image_data/rotation_orientation_vert_flipped.h

src/image_data/rotation_pixdata.h

src/image_data/sdi_pixdata.h

src/image_data/solaris_pixdata.h

src/image_data/thermal_banner.h

src/image_data/thermal_pixdata.h

src/image_data/tv.h

src/image_data/tv_banner.h

src/image_data/tv_pixdata.h

src/image_data/vcsc_pixdata.h

src/image_data/x_pixdata.h

src/image_data/xvideo_banner.h

src/image_data/xvideo_pixdata.h

src/libXNVCtrl/Makefile.inc

src/libXNVCtrl/NVCtrl.c

src/libXNVCtrl/NVCtrl.h

src/libXNVCtrl/NVCtrlLib.h

src/libXNVCtrl/libXNVCtrl.a

src/libXNVCtrl/nv_control.h

src/libXNVCtrlAttributes/Makefile.inc

src/libXNVCtrlAttributes/NvCtrlAttributes.c

src/libXNVCtrlAttributes/NvCtrlAttributes.h

src/libXNVCtrlAttributes/NvCtrlAttributesGlx.c

src/libXNVCtrlAttributes/NvCtrlAttributesNvControl.c

src/libXNVCtrlAttributes/NvCtrlAttributesPrivate.h

src/libXNVCtrlAttributes/NvCtrlAttributesXrandr.c

src/libXNVCtrlAttributes/NvCtrlAttributesXv.c

src/nvidia-settings.c

src/query-assign.c

src/xpm_data/Makefile.inc

src/xpm_data/mini_xpm.h

src/xpm_data/x11_xpm.h

Older »