diff -pruN 5.1.2-1/debian/changelog 5.1.2-1ubuntu1/debian/changelog --- 5.1.2-1/debian/changelog 2017-08-29 19:06:48.000000000 +0000 +++ 5.1.2-1ubuntu1/debian/changelog 2017-08-29 22:45:08.000000000 +0000 @@ -1,11 +1,27 @@ +kdevplatform (5.1.2-1ubuntu1) artful; urgency=medium + + * Merge with debian. Remeaining changes; + - Add autopkgtest + - Retain kubuntu Vcs fields + + -- Rik Mills Tue, 29 Aug 2017 23:45:08 +0100 + kdevplatform (5.1.2-1) unstable; urgency=medium - * Team upload. + [ Pino Toscano ] * New upstream release. * Update install files. * Bump Standards-Version to 4.1.0, no changes required. - -- Pino Toscano Tue, 29 Aug 2017 21:06:48 +0200 + -- Debian Qt/KDE Maintainers Tue, 29 Aug 2017 20:24:59 +0200 + +kdevplatform (5.1.1-1ubuntu1) artful; urgency=medium + + * Merge with debian. Remeaining changes; + - Add autopkgtest + - Retain kubuntu Vcs fields + + -- Rik Mills Thu, 06 Jul 2017 20:00:53 +0100 kdevplatform (5.1.1-1) unstable; urgency=medium @@ -22,6 +38,31 @@ kdevplatform (5.1.1-1) unstable; urgency -- Pino Toscano Thu, 06 Jul 2017 12:01:07 +0200 +kdevplatform (5.1.1-0ubuntu1) artful; urgency=medium + + * New upstream release (5.1.1) + + -- Rik Mills Sat, 27 May 2017 14:30:49 +0100 + +kdevplatform (5.1.0-0ubuntu1) artful; urgency=medium + + [ Clive Johnston ] + * Trying to clean-up package after direct sync with Debian + * New upstream beta release (5.0.80) + * Wildcard some install entries and installed new plugin + + [ Rik Mills ] + * Add build dep on libgrantlee5-dev + * New upstream release (5.1.0) + + -- Clive Johnston Sat, 22 Apr 2017 22:36:00 +0100 + +kdevplatform (5.0.4-0ubuntu1) zesty; urgency=medium + + * New upstream bugfix release (5.0.4) + + -- Rik Mills Wed, 15 Mar 2017 08:09:07 +0000 + kdevplatform (5.0.3-1) unstable; urgency=medium * Team upload. @@ -29,6 +70,30 @@ kdevplatform (5.0.3-1) unstable; urgency -- Lisandro Damián Nicanor Pérez Meyer Sat, 07 Jan 2017 15:43:27 -0300 +kdevplatform (5.0.3-0ubuntu2) zesty; urgency=medium + + * Clean up packaging from 5.0.3-0ubuntu1 + * Sync with Debian. Remaining changes: + - Add autopkgtest + * New upstream bugfix release + * debian/kdevplatform10-libs.install: + - Install breakpoint icons + + -- Jeremy Bicha Mon, 26 Dec 2016 15:24:14 -0500 + +kdevplatform (5.0.3-0ubuntu1) zesty; urgency=medium + + [ Ovidiu-Florin Bogdan ] + * Merged with debian experimental + + [ Clive Johnston ] + * New upstream release (5.0.1) + * New upstream release (5.0.2) + * New upstream release (5.0.3) + * Wildcard plugin version as per suggestion by kfunk + + -- Clive Johnston Mon, 26 Dec 2016 15:30:44 +0000 + kdevplatform (5.0.1-2) unstable; urgency=medium * Team upload. @@ -129,6 +194,17 @@ kdevplatform (1.7.3-1) experimental; urg -- Lisandro Damián Nicanor Pérez Meyer Sat, 30 Apr 2016 11:58:21 -0300 +kdevplatform (1.7.3-0ubuntu1) xenial; urgency=medium + + * Debian merge for new changes.. + * New upstream bugfix release. + * Fix watch file. + * Point VCS to this repo. + * Add lintian override file. + * Release to Archive. + + -- Scarlett Clark Sun, 06 Mar 2016 07:14:19 -0800 + kdevplatform (1.7.2-1) unstable; urgency=medium * Team upload. @@ -144,6 +220,13 @@ kdevplatform (1.7.2-1) unstable; urgency -- Pino Toscano Thu, 21 Jan 2016 21:43:55 +0100 +kdevplatform (1.7.1-1ubuntu1) xenial; urgency=high + + * Merge from debian, remaining changes: + - add autopkgtest. + + -- Dimitri John Ledkov Thu, 07 Jan 2016 14:51:32 +0000 + kdevplatform (1.7.1-1) unstable; urgency=medium * Team upload. diff -pruN 5.1.2-1/debian/control 5.1.2-1ubuntu1/debian/control --- 5.1.2-1/debian/control 2017-08-29 18:56:30.000000000 +0000 +++ 5.1.2-1ubuntu1/debian/control 2017-08-29 22:45:08.000000000 +0000 @@ -1,7 +1,8 @@ Source: kdevplatform Section: libs Priority: optional -Maintainer: Debian Qt/KDE Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Fathi Boudra , Jeremy Lainé , George Kiagiadakis , @@ -41,8 +42,8 @@ Build-Depends: cmake (>= 2.8.12), pkg-kde-tools (>= 0.15.16), Standards-Version: 4.1.0 Homepage: http://www.kdevelop.org/ -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/kde-std/kdevplatform.git -Vcs-Git: https://anonscm.debian.org/git/pkg-kde/kde-std/kdevplatform.git +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kdevplatform +Vcs-Git: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kdevplatform Package: kdevplatform10-libs Architecture: any diff -pruN 5.1.2-1/debian/tests/control 5.1.2-1ubuntu1/debian/tests/control --- 5.1.2-1/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ 5.1.2-1ubuntu1/debian/tests/control 2017-08-29 22:45:08.000000000 +0000 @@ -0,0 +1,4 @@ +Tests: testsuite +Depends: @builddeps@, build-essential, + xvfb, xauth, dbus-x11, openbox +Restrictions: rw-build-tree diff -pruN 5.1.2-1/debian/tests/testsuite 5.1.2-1ubuntu1/debian/tests/testsuite --- 5.1.2-1/debian/tests/testsuite 1970-01-01 00:00:00.000000000 +0000 +++ 5.1.2-1ubuntu1/debian/tests/testsuite 2017-08-29 22:45:08.000000000 +0000 @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ -d /usr/lib/ccache ]; then + export PATH="/usr/lib/ccache:$PATH" +fi +debian/rules clean 2>&1 +dpkg-source --before-build . +debian/rules build 2>&1 +xvfb-run -a --server-args="-screen 0 1024x768x24+32" \ + dbus-launch --exit-with-session debian/tests/testsuite.xsession diff -pruN 5.1.2-1/debian/tests/testsuite.xsession 5.1.2-1ubuntu1/debian/tests/testsuite.xsession --- 5.1.2-1/debian/tests/testsuite.xsession 1970-01-01 00:00:00.000000000 +0000 +++ 5.1.2-1ubuntu1/debian/tests/testsuite.xsession 2017-08-29 22:45:08.000000000 +0000 @@ -0,0 +1,10 @@ +#!/bin/sh + +export LANG=C.UTF-8 +export LC_ALL=C.UTF-8 +[ -e debian/tests.home ] || mkdir debian/tests.home +HOME=debian/tests.home openbox & +sleep 5 +HOME=debian/tests.home dh_auto_test +rm -rf debian/home/tests.home +