-
Committer:
Bazaar Package Importer
-
Author(s):
Harald Sitter
-
Date:
2010-03-10 17:48:29 UTC
-
mfrom:
(1.1.5 upstream)
(2.1.2 experimental)
-
Revision ID:
james.westby@ubuntu.com-20100310174829-3pqxmy7vb6mc6r7p
Tags: 1.3.1-1ubuntu1
* Merge with Debian Experimental, remaining changes (LP: #536748):
- Add qt-creator transitional package
- debian/control: Conflicts on qt-creator (<< 1.2.1-1ubuntu1)
- debian/rules: set QMAKE explicitly to qmake-qt4
* Note that all other changes (most importantly those from 1.3.0-0ubuntu1)
were completely dropped, since Debian uses a full-source packaging branch
and thus the diff.gz is 100% legitimate, hence the delta would not ever
become droppable. Possibly Debian could switch to source format 3 so that
Ubuntu can sync package with patches while Debian internal development would
still be based on full-source git.
DO NOT CONVERT DIRECT DEBIAN CHANGES TO PATCHES!