Merge nightmare.
Scarlett Clark
8 years ago
| 5 | 5 |
[ Scarlett Clark ]
|
| 6 | 6 |
* Vivid backport.
|
| 7 | 7 |
* Manual merge, fix changelog failure.
|
| 8 | |
|
| 9 | |
-- Scarlett Clark <sgclark@kubuntu.org> Tue, 29 Sep 2015 14:53:15 -0700
|
|
8 |
* Merge nightmare.
|
|
9 |
|
|
10 |
-- Scarlett Clark <sgclark@kubuntu.org> Tue, 29 Sep 2015 14:53:15 -0700
|
| 10 | 11 |
|
| 11 | 12 |
attica-kf5 (5.13.0-0ubuntu1) wily; urgency=medium
|
| 12 | 13 |
|
| 4 | 4 |
Uploaders: Maximiliano Curia <maxy@debian.org>
|
| 5 | 5 |
Build-Depends: cmake (>= 2.8.12),
|
| 6 | 6 |
debhelper (>= 9),
|
| 7 | |
<<<<<<< HEAD
|
| 8 | |
extra-cmake-modules (>= 5.14.0),
|
| 9 | |
=======
|
| 10 | 7 |
extra-cmake-modules (>= 5.14.0~),
|
| 11 | |
>>>>>>> origin/kubuntu_unstable
|
| 12 | |
pkg-kde-tools (>= 0.15.15ubuntu1~),
|
|
8 |
pkg-kde-tools (>= 0.15.15~),
|
| 13 | 9 |
qtbase5-dev (>= 5.4)
|
| 14 | 10 |
Standards-Version: 3.9.6
|
| 15 | 11 |
XS-Testsuite: autopkgtest
|