-
Committer:
Bazaar Package Importer
-
Author(s):
Christopher James Halse Rogers
-
Date:
2010-06-10 15:24:41 UTC
-
mfrom:
(1.1.2 upstream)
(2.1.1 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20100610152441-i3ceb493rvxw5063
Tags: 1:0.10.6-0ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
+ 107_ntrig_tabletpc.patch: PCI id for N-Trig TabletPC
+ debian/rules: use xsfbs & xsfbs patch system
+ debian/control: add B-D on quilt
+ Add epoch
* Update to new upstream version
+ Drop 101_strcat_args.patch, included in new upstream version.
+ Drop debian/local: xorg.conf.d snippet is now shipped upstream.
* debian/rules:
+ Use xsfbs targets rather than hand-coding server ABI substvars.
+ Drop deletion of HAL rules; new upstream no longer installs them.
* debian/control:
+ Add ${misc:Depends} to silence lintian
+ Use ${xinpdriver:Depends} rather than deprecated ${xserver:Depends}
* Update debian/xsfbs
* Add XSF README.source