-
Committer:
Bazaar Package Importer
-
Author(s):
Stefan Potyra
-
Date:
2008-08-09 22:33:28 UTC
-
mfrom:
(1.1.6 upstream)
(2.2.1 lenny)
-
Revision ID:
james.westby@ubuntu.com-20080809223328-mpho9ilhndtnrymv
Tags: 173.14.09-1ubuntu1
* 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.