-
Committer:
Bazaar Package Importer
-
Author(s):
Steve Langasek
-
Date:
2009-04-29 09:12:45 UTC
-
mfrom:
(1.1.3 upstream)
(2.1.2 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090429091245-y52bls65h0988u22
Tags: 1.2-1ubuntu1
* Merge from Debian unstable, remaining changes:
- libxcb1 should Breaks: libxcb-xlib0 instead of Conflicts:, since
there are no file overlaps and Breaks will allow apt to better
calculate an upgrade from hardy/intrepid.