Re: lintain + package build

2014-01-08 Thread Scarlett Clark
I have figured it all out and I have a 100% successful build with .deb
files. I was also successful at creating the symbols files. Installed the
.deb files with dpkg.

debuild -S

unfortunately was a failure.
dpkg-source: info: using source format `3.0 (quilt)'
dpkg-source: info: building kdbusaddons using existing
./kdbusaddons_4.95.0.orig.tar.xz
dpkg-source: info: local changes detected, the modified files are:
 kdbusaddons-4.95.0/symbols.amd64

which makes sense since I was suppose to create that?
Help!
Scarlett



signature.asc
Description: This is a digitally signed message part.
-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


lintain + package build

2014-01-08 Thread Scarlett Clark
What does this mean?

Now running lintian...
E: kdbusaddons source: version-substvar-for-external-
package libkf5dbusaddons-dev -> libkf5dbusaddons
Finished running lintian.

Other than that, the package build was successful and I
have .deb files. Now what :)

Scarlett


signature.asc
Description: This is a digitally signed message part.
-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: KDE Frameworks 5 packaging

2014-01-08 Thread Scarlett Clark
Ok, making progress. I am stuck on Copyright stuff. I understand the regex
stuff, but I am unclear what I put in the actual license part? The entire
contents of the license file in /usr/share/common-licenses?


Also on my first run trying to debuild I encountered this:

CMake Error at /usr/share/ECM/cmake/ECMConfig.cmake:45 (find_package):
  Could not find a configuration file for package "Qt5Core" that is
  compatible with requested version "5.2.0".

  The following configuration files were considered but not accepted:

/usr/lib/x86_64-linux-gnu/cmake/Qt5Core/Qt5CoreConfig.cmake, version:
5.0.2

Obviously I am missing a package, I tried to find qt5core-dev or variations
of qt5core without any luck, anyone happen to know what package I need?

Thanks for all the help,
Scarlett



signature.asc
Description: This is a digitally signed message part.
-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: KDE Frameworks 5 packaging

2014-01-08 Thread Scarlett Clark
On Wednesday, January 08, 2014 11:16:25 AM Scarlett Clark wrote:
> I am trying one on my own and I have stumbled a bit. I know it is late for
> most so respond whenever.
>
> Jonathon did a magic extensive command to get all of the copyright
> information out of the src directory. I swore I copied it to a file for
> future reference, but alas I cannot find it. (Darn cold) Anyway, I know it
> involved grep/sed/sort uniq something or other.
>
> Anyone able to give me that?

Nevermind, by some miracle I figured this one out on my own.

The only thing I am stuck on is finding the correct license.
>
> Also I was mildly confused on adding a 5 to the end of the package
name
> in the control file. How I determine this?
>
Still need help here.
>
> Thanks for all of your help.
> Scarlett



signature.asc
Description: This is a digitally signed message part.
-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: Trusty L10n Report #1

2014-01-08 Thread Aaron Honeycutt
On Wednesday, January 08, 2014 03:15:07 PM you wrote:
> On Wednesday, January 08, 2014 10:16:33 AM Harald Sitter wrote:
> > https://trello.com/c/v4o3CQ1O
> > 
> > Present localization of trusty is not bad, it still has problems
> > though, all in all a french installation offers proper localization
> > from a usage POV (e.g. muon categories now speak french). More
> > advanced features have some problems.
> > 
> > A complete issue list is available on the trello card. Bug reports and
> > fixes should be noted there as well with the ultimate target that the
> > issue list for review#2 is shorter or non-existent.
> > 
> > * Documentation has no localization. I do really really hope there is
> > a solid plan for that by now. This is the only l10n issue that
> > actually can have sizable negative impact on someone's experience of
> > the product.
> > * We continue to be plagued by kubuntu specific translations not
> > getting from launchpad into a language pack.
> > * Muon/QApt still has long-standing issues that were forgotten in the
> > last batch of i18n fixes.
> > * Minor issues with usermanger, lightdm, ubiquity.
> > 
> > Bugs to be filed, people to be poked, so much work :'<
> > 
> > HS
> 
We have the pages moved to Userbase and Scarlett is working on setting up
the tags for translations. We just need one more read though so the
construction tags can be removed and word can be given to translators.


-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: KDE Frameworks 5 packaging

2014-01-08 Thread Scarlett Clark
I am trying one on my own and I have stumbled a bit. I know it is late for
most so respond whenever.

Jonathon did a magic extensive command to get all of the copyright
information out of the src directory. I swore I copied it to a file for future
reference, but alas I cannot find it. (Darn cold) Anyway, I know it involved
grep/sed/sort uniq something or other.

Anyone able to give me that?

Also I was mildly confused on adding a 5 to the end of the package name
in the control file. How I determine this?


Thanks for all of your help.
Scarlett




signature.asc
Description: This is a digitally signed message part.
-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [kubuntu-devel] Muon Discover

2014-01-08 Thread Aleix Pol
On Wed, Jan 8, 2014 at 4:20 PM, Harald Sitter wrote:

> On Wed, Jan 8, 2014 at 2:42 PM, Aleix Pol  wrote:
> > On Wed, Jan 8, 2014 at 1:03 PM, Jonathan Riddell 
> wrote:
> >>
> >> On Tue, Jan 07, 2014 at 02:25:27PM -0800, Scarlett Clark wrote:
> >> >Is this the default package manager? Or Muon?
> >> >
> >> >I need all ways to bring this up eg.. command line. I have so far
> in
> >> > a
> >> >search from KickOff and KickOff->Programs->Muon Discover
> >>
> >> We have both Muon and Muon Discover installed by default.  Arguably this
> >> is application duplication and very un-ubuntu.
> >>
> >> Does anyone have an opinion of whether Muon Discover is mature enough to
> >> stand along and for Muon to be removed from the images?
> >>
> >> You can access it by KickOff -> Computer -> Software Centre too which
> I'd
> >> expect to be the primary method.
> >>
> >> Jonathan
> >>
> >> --
> >> kubuntu-devel mailing list
> >> kubuntu-devel@lists.ubuntu.com
> >> Modify settings or unsubscribe at:
> >> https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
> >
> >
> > I would say that the decision is not really about maturity but about user
> > target. I don't think an end-user should understand all the semantics
> that
> > Muon Package Manager exposes. If a user has the knowledge to use Muon PM
> he
> > has the knowledge to install it from Discover or even apt-get.
>
> Indeed. The argument never was that software center or discover
> weren't mature enough, but that they do not deal in packages. They
> deal in applications (read: in things that have a desktop file). So if
> you want or need to install a package (say 'bzip2') you won't be able
> to do that with discover because of the way it is designed.
>
> Personally I always found this argument silly because it implies that
> a user knows the difference between Muon and Muon Discover and will
> choose the correct tool for the job at hand <- so very very very
> unlikely...
>
> Really there are three groups of people we have to consider:
> a) the user who only wants to installation an application and will not
> ever want to install a package (by himself, support cases excluded
> becasue those usually will offer concrete apt-get commands anyway)
> b) the user who perhaps could be called a sysadmin and wants to
> explicitly manage packages, but likes to do it in a GUI
> c) the user who likes direct control but feels that a GUI slows him down
>
> And here is the thing.
> A user of group a) won't be able to graps the concept of either b) or
> c) and have a very hard time trying to manage 'apps'.
> A user of group b) will be able to deal with the usage paradigm of a)
> but might not be able to do what c) does.
> A user of group c) will be able to do manage 'apps' and 'packages' given a
> gui.
>
> Looking at the presented use cases there is no reason why muon (the
> package manager) needs to be part of the default install. You could
> technically even remove apt-get itself. Because b) will be able to use
> muon-discover to install muon and c) will be able to use muon-discover
> to install muon to install apt-get. Of course latter is not very
> convenient so one can make an argument for keeping apt-get regardless
> (plus I doubt you could remove it anyway ;))
>
> Long story short: if someone wants a gui package manger, they can
> manually install muon via discover or apt-get, absolutely no reason
> why we'd need it in the default install.
>
> HS
>
> --
> kubuntu-devel mailing list
> kubuntu-devel@lists.ubuntu.com
> Modify settings or unsubscribe at:
> https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
>

FWIW, bzip should probably be installable from Discover, since it's an
end-user application.
What the user won't be able to find in discover is libbz2. Arguably, -dev
packages should be available in discover as well.

Aleix
-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~om26er/kubuntu-packaging/qtsystems_unittests into lp:~kubuntu-packagers/kubuntu-packaging/qtsystems-opensource-src

2014-01-08 Thread Timo Jyrinki
Review: Needs Fixing

bzr bd fails:
Applying patch disable_qservicemanager_ipc.patch
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--
|=== modified file 'tests/auto/serviceframework/serviceframework.pro'
|--- tests/auto/serviceframework/serviceframework.pro   2013-06-14 10:32:13 
+
|+++ tests/auto/serviceframework/serviceframework.pro   2013-12-10 17:11:31 
+
--
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
Patch disable_qservicemanager_ipc.patch does not apply (enforce with -f)


-- 
https://code.launchpad.net/~om26er/kubuntu-packaging/qtsystems_unittests/+merge/198439
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtsystems-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~om26er/kubuntu-packaging/qtdeclarative_unittests into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-01-08 Thread Omer Akram
The branch is now ready to review.
-- 
https://code.launchpad.net/~om26er/kubuntu-packaging/qtdeclarative_unittests/+merge/198425
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~om26er/kubuntu-packaging/qtdeclarative_unittests into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-01-08 Thread Timo Jyrinki
Review: Needs Fixing

About all tests failing:

https://launchpadlibrarian.net/159472784/buildlog_ubuntu-trusty-amd64.qtdeclarative-opensource-src_5.2.0~rc1-0ubuntu1~trusty1~test4_FAILEDTOBUILD.txt.gz
-- 
https://code.launchpad.net/~om26er/kubuntu-packaging/qtdeclarative_unittests/+merge/198425
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~chris.gagnon/kubuntu-packaging/qtgraphicaleffects-opensource-src-enable-unit-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtgraphicaleffects-opensource-src

2014-01-08 Thread Timo Jyrinki
Review: Approve

Built fine, thanks. 
https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-beta1/+sourcepub/3726152/+listing-archive-extra
-- 
https://code.launchpad.net/~chris.gagnon/kubuntu-packaging/qtgraphicaleffects-opensource-src-enable-unit-tests/+merge/198846
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~chris.gagnon/kubuntu-packaging/qtgraphicaleffects-opensource-src-enable-unit-tests
 into lp:~kubuntu-packagers/kubuntu-packaging/qtgraphicaleffects-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~om26er/kubuntu-packaging/qtsystems_unittests into lp:~kubuntu-packagers/kubuntu-packaging/qtsystems-opensource-src

2014-01-08 Thread Omer Akram
sorry about that. Fixed the patch now.
-- 
https://code.launchpad.net/~om26er/kubuntu-packaging/qtsystems_unittests/+merge/198439
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtsystems-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~iahmad/kubuntu-packaging/qtxmlpatterns-enable-unit-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtxmlpatterns-opensource-src

2014-01-08 Thread I Ahmad
I Ahmad has proposed merging 
lp:~iahmad/kubuntu-packaging/qtxmlpatterns-enable-unit-tests into 
lp:~kubuntu-packagers/kubuntu-packaging/qtxmlpatterns-opensource-src.

Requested reviews:
  Timo Jyrinki (timo-jyrinki)

For more details, see:
https://code.launchpad.net/~iahmad/kubuntu-packaging/qtxmlpatterns-enable-unit-tests/+merge/198898

Enabled the make check and conditionally disabled the network dependent test 
cases.
-- 
https://code.launchpad.net/~iahmad/kubuntu-packaging/qtxmlpatterns-enable-unit-tests/+merge/198898
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtxmlpatterns-opensource-src.
=== modified file 'debian/changelog'
--- debian/changelog	2013-12-13 06:26:38 +
+++ debian/changelog	2013-12-13 10:04:49 +
@@ -1,4 +1,4 @@
-qtxmlpatterns-opensource-src (5.2.0-0ubuntu1) UNRELEASED; urgency=low
+qtxmlpatterns-opensource-src (5.2.0-0ubuntu2) UNRELEASED; urgency=low
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Make every package that ships a binary managed by qtchooser depend on it.
@@ -8,7 +8,12 @@
   * Sync with Debian, no remaining differences
   * Bump build-deps to 5.1.1
 
- -- Timo Jyrinki   Fri, 30 Aug 2013 06:38:12 +
+  [ Iftikhar Ahmad (QA Engineer) ]
+  * Enabled make check
+  * Conditionally skipped the network dependent unit tests.
+
+
+ -- Iftikhar Ahmad (QA Engineer)   Fri, 13 Dec 2013 14:18:53 +0500
 
 qtxmlpatterns-opensource-src (5.1.0-2) unstable; urgency=low
 

=== added directory 'debian/patches'
=== added file 'debian/patches/enable-make-check.patch'
--- debian/patches/enable-make-check.patch	1970-01-01 00:00:00 +
+++ debian/patches/enable-make-check.patch	2013-12-13 10:04:49 +
@@ -0,0 +1,28 @@
+--- a/tests/auto/auto.pro
 b/tests/auto/auto.pro
+@@ -19,12 +19,10 @@ SUBDIRS=\
+qxmlname \
+qxmlnamepool \
+qxmlnodemodelindex   \
+-   qxmlquery\
+qxmlresultitems  \
+qxmlschema   \
+qxmlschemavalidator  \
+qxmlserializer   \
+-   xmlpatterns  \
+xmlpatternsdiagnosticsts \
+xmlpatternsschema\
+xmlpatternsschemats  \
+@@ -32,7 +30,11 @@ SUBDIRS=\
+xmlpatternsvalidator \
+xmlpatternsview  \
+xmlpatternsxqts  \
+-   xmlpatternsxslts \
++   xmlpatternsxslts
++
++#skip the network tests for unix platform.
++!unix:SUBDIRS += qxmlquery
++!unix:SUBDIRS += xmlpatterns
+ 
+ xmlpatternsdiagnosticsts.depends = xmlpatternssdk
+ xmlpatternsview.depends = xmlpatternssdk

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +
+++ debian/patches/series	2013-12-13 10:04:49 +
@@ -0,0 +1,1 @@
+enable-make-check.patch

=== modified file 'debian/rules'
--- debian/rules	2013-12-13 09:49:16 +
+++ debian/rules	2013-12-13 10:04:49 +
@@ -7,6 +7,7 @@
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
+export QT_QPA_PLATFORM := minimal
 
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtxmlpatterns5-dbg
@@ -35,3 +36,7 @@
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
+
+override_dh_auto_test:
+	cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && xvfb-run -a make -f Makefile check
+

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [kubuntu-devel] Muon Discover

2014-01-08 Thread Harald Sitter
On Wed, Jan 8, 2014 at 2:42 PM, Aleix Pol  wrote:
> On Wed, Jan 8, 2014 at 1:03 PM, Jonathan Riddell  wrote:
>>
>> On Tue, Jan 07, 2014 at 02:25:27PM -0800, Scarlett Clark wrote:
>> >Is this the default package manager? Or Muon?
>> >
>> >I need all ways to bring this up eg.. command line. I have so far in
>> > a
>> >search from KickOff and KickOff->Programs->Muon Discover
>>
>> We have both Muon and Muon Discover installed by default.  Arguably this
>> is application duplication and very un-ubuntu.
>>
>> Does anyone have an opinion of whether Muon Discover is mature enough to
>> stand along and for Muon to be removed from the images?
>>
>> You can access it by KickOff -> Computer -> Software Centre too which I'd
>> expect to be the primary method.
>>
>> Jonathan
>>
>> --
>> kubuntu-devel mailing list
>> kubuntu-devel@lists.ubuntu.com
>> Modify settings or unsubscribe at:
>> https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
>
>
> I would say that the decision is not really about maturity but about user
> target. I don't think an end-user should understand all the semantics that
> Muon Package Manager exposes. If a user has the knowledge to use Muon PM he
> has the knowledge to install it from Discover or even apt-get.

Indeed. The argument never was that software center or discover
weren't mature enough, but that they do not deal in packages. They
deal in applications (read: in things that have a desktop file). So if
you want or need to install a package (say 'bzip2') you won't be able
to do that with discover because of the way it is designed.

Personally I always found this argument silly because it implies that
a user knows the difference between Muon and Muon Discover and will
choose the correct tool for the job at hand <- so very very very
unlikely...

Really there are three groups of people we have to consider:
a) the user who only wants to installation an application and will not
ever want to install a package (by himself, support cases excluded
becasue those usually will offer concrete apt-get commands anyway)
b) the user who perhaps could be called a sysadmin and wants to
explicitly manage packages, but likes to do it in a GUI
c) the user who likes direct control but feels that a GUI slows him down

And here is the thing.
A user of group a) won't be able to graps the concept of either b) or
c) and have a very hard time trying to manage 'apps'.
A user of group b) will be able to deal with the usage paradigm of a)
but might not be able to do what c) does.
A user of group c) will be able to do manage 'apps' and 'packages' given a gui.

Looking at the presented use cases there is no reason why muon (the
package manager) needs to be part of the default install. You could
technically even remove apt-get itself. Because b) will be able to use
muon-discover to install muon and c) will be able to use muon-discover
to install muon to install apt-get. Of course latter is not very
convenient so one can make an argument for keeping apt-get regardless
(plus I doubt you could remove it anyway ;))

Long story short: if someone wants a gui package manger, they can
manually install muon via discover or apt-get, absolutely no reason
why we'd need it in the default install.

HS

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~om26er/kubuntu-packaging/qtdeclarative_unittests into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-01-08 Thread Omer Akram
The proposal to merge lp:~om26er/kubuntu-packaging/qtdeclarative_unittests into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src has been 
updated.

Status: Needs review => Work in progress

For more details, see:
https://code.launchpad.net/~om26er/kubuntu-packaging/qtdeclarative_unittests/+merge/198425
-- 
https://code.launchpad.net/~om26er/kubuntu-packaging/qtdeclarative_unittests/+merge/198425
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~om26er/kubuntu-packaging/qtsystems_unittests into lp:~kubuntu-packagers/kubuntu-packaging/qtsystems-opensource-src

2014-01-08 Thread Omer Akram
Omer Akram has proposed merging 
lp:~om26er/kubuntu-packaging/qtsystems_unittests into 
lp:~kubuntu-packagers/kubuntu-packaging/qtsystems-opensource-src.

Commit message:
Run unittests during build, disable failing tests

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)

For more details, see:
https://code.launchpad.net/~om26er/kubuntu-packaging/qtsystems_unittests/+merge/198439

Run unittests during build, disable failing tests
-- 
https://code.launchpad.net/~om26er/kubuntu-packaging/qtsystems_unittests/+merge/198439
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~om26er/kubuntu-packaging/qtsystems_unittests into 
lp:~kubuntu-packagers/kubuntu-packaging/qtsystems-opensource-src.
=== added file 'debian/patches/disable_qservicemanager_ipc.patch'
--- debian/patches/disable_qservicemanager_ipc.patch	1970-01-01 00:00:00 +
+++ debian/patches/disable_qservicemanager_ipc.patch	2013-12-10 17:17:56 +
@@ -0,0 +1,13 @@
+=== modified file 'tests/auto/serviceframework/serviceframework.pro'
+--- tests/auto/serviceframework/serviceframework.pro	2013-06-14 10:32:13 +
 tests/auto/serviceframework/serviceframework.pro	2013-12-10 17:11:31 +
+@@ -5,7 +5,7 @@
+qservicefilter \
+qserviceinterfacedescriptor \
+qservicemanager \
+-   qservicemanager_ipc \
++#  qservicemanager_ipc \   #(is failing on Ubuntu)
+qservicemetadata \
+servicedeletion
+ #   serviceobject
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-09-30 06:12:54 +
+++ debian/patches/series	2013-12-10 17:17:56 +
@@ -2,3 +2,4 @@
 add_license_files.patch
 build_with_udisk.patch
 wlan_detect.patch
+disable_qservicemanager_ipc.patch

=== modified file 'debian/rules'
--- debian/rules	2013-08-09 08:44:14 +
+++ debian/rules	2013-12-10 17:17:56 +
@@ -40,3 +40,7 @@
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
+override_dh_auto_test:
+	export LD_LIBRARY_PATH=$(CURDIR)/lib
+	cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && make -f Makefile check
+

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~iahmad/kubuntu-packaging/qtxmlpatterns-enable-unit-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtxmlpatterns-opensource-src

2014-01-08 Thread Timo Jyrinki
Review: Approve


-- 
https://code.launchpad.net/~iahmad/kubuntu-packaging/qtxmlpatterns-enable-unit-tests/+merge/198898
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtxmlpatterns-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~iahmad/kubuntu-packaging/qtxmlpatterns-enable-unit-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtxmlpatterns-opensource-src

2014-01-08 Thread Timo Jyrinki
Additionally: please don't bump the version number in changelog, ubuntu1 is not 
yet released.
-- 
https://code.launchpad.net/~iahmad/kubuntu-packaging/qtxmlpatterns-enable-unit-tests/+merge/198898
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtxmlpatterns-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~om26er/kubuntu-packaging/qtmultimedia_unittests into lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src

2014-01-08 Thread Omer Akram
The patch is now DEP3 compilant. Also fixed the failure that Timo reported. All 
the tests pass during build now. However the package still fails to build but 
that's not related to any of my changes rather a packaging issue.
-- 
https://code.launchpad.net/~om26er/kubuntu-packaging/qtmultimedia_unittests/+merge/198387
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~om26er/kubuntu-packaging/qtdeclarative_unittests into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-01-08 Thread Omer Akram
Omer Akram has proposed merging 
lp:~om26er/kubuntu-packaging/qtdeclarative_unittests into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

Commit message:
Run unittests during build

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)

For more details, see:
https://code.launchpad.net/~om26er/kubuntu-packaging/qtdeclarative_unittests/+merge/198425

Run unittests during build
-- 
https://code.launchpad.net/~om26er/kubuntu-packaging/qtdeclarative_unittests/+merge/198425
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~om26er/kubuntu-packaging/qtdeclarative_unittests into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.
=== modified file 'debian/rules'
--- debian/rules	2013-11-13 13:04:27 +
+++ debian/rules	2013-12-10 15:36:27 +
@@ -7,6 +7,7 @@
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
+export QT_QPA_PLATFORM := minimal
 
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtdeclarative5-dbg
@@ -47,5 +48,7 @@
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
-# Requires X so disabled for now
 override_dh_auto_test:
+	export LD_LIBRARY_PATH=$(CURDIR)/lib
+	cd tests/auto/unit/ && ( test -e Makefile || qmake unit.pro -o Makefile ) && make -f Makefile check
+

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~om26er/kubuntu-packaging/qtdeclarative_unittests into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-01-08 Thread Omer Akram
Omer Akram has proposed merging 
lp:~om26er/kubuntu-packaging/qtdeclarative_unittests into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

Commit message:
Run unittests during build

Requested reviews:
  Timo Jyrinki (timo-jyrinki)

For more details, see:
https://code.launchpad.net/~om26er/kubuntu-packaging/qtdeclarative_unittests/+merge/198425

Run unittests during build
-- 
https://code.launchpad.net/~om26er/kubuntu-packaging/qtdeclarative_unittests/+merge/198425
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.
=== added file 'debian/patches/disable_failing_tests.patch'
--- debian/patches/disable_failing_tests.patch	1970-01-01 00:00:00 +
+++ debian/patches/disable_failing_tests.patch	2014-01-06 13:50:43 +
@@ -0,0 +1,50 @@
+diff -ruN a/tests/auto/auto.pro b/tests/auto/auto.pro
+--- a/tests/auto/auto.pro	2013-12-08 22:10:16.0 +0500
 b/tests/auto/auto.pro	2014-01-06 18:40:39.277408238 +0500
+@@ -12,7 +12,7 @@
+ SUBDIRS += \
+ quick \
+ particles \
+-qmltest
++#qmltest (Requires OpenGL)
+ }
+ 
+ installed_cmake.depends = cmake
+diff -ruN a/tests/auto/qml/debugger/debugger.pro b/tests/auto/qml/debugger/debugger.pro
+--- a/tests/auto/qml/debugger/debugger.pro	2013-12-08 22:10:16.0 +0500
 b/tests/auto/qml/debugger/debugger.pro	2014-01-06 18:41:58.985410372 +0500
+@@ -1,7 +1,7 @@
+ TEMPLATE = subdirs
+ 
+ PUBLICTESTS += \
+-qqmlenginedebugservice \
++#qqmlenginedebugservice \ (QTBUG-35974)
+ qqmldebugjs \
+ qpacketprotocol \
+ #qv8profilerservice \
+diff -ruN a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp	2013-12-08 22:10:16.0 +0500
 b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp	2014-01-06 18:43:41.609413121 +0500
+@@ -443,6 +443,7 @@
+ 
+ void tst_QQmlProfilerService::scenegraphData()
+ {
++QSKIP("QTBUG-35923");
+ connect(true, "scenegraphTest.qml");
+ QVERIFY(m_client);
+ QTRY_COMPARE(m_client->state(), QQmlDebugClient::Enabled);
+diff -ruN a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
+--- a/tests/auto/quick/quick.pro	2013-12-08 22:10:17.0 +0500
 b/tests/auto/quick/quick.pro	2014-01-06 18:42:42.257411531 +0500
+@@ -2,10 +2,10 @@
+ 
+ PUBLICTESTS += \
+ geometry \
+-rendernode \
++#rendernode \ (QTBUG-35924)
+ qquickpixmapcache
+ 
+-qtHaveModule(widgets): PUBLICTESTS += nodes
++#qtHaveModule(widgets): PUBLICTESTS += nodes
+ 
+ !cross_compile: PRIVATETESTS += examples

=== added file 'debian/patches/fix_binary_location_for_tests.patch'
--- debian/patches/fix_binary_location_for_tests.patch	1970-01-01 00:00:00 +
+++ debian/patches/fix_binary_location_for_tests.patch	2014-01-06 13:50:43 +
@@ -0,0 +1,72 @@
+diff -ruN a/tests/auto/qml/qmlmin/tst_qmlmin.cpp b/tests/auto/qml/qmlmin/tst_qmlmin.cpp
+--- a/tests/auto/qml/qmlmin/tst_qmlmin.cpp	2013-11-21 01:16:04.0 +0500
 b/tests/auto/qml/qmlmin/tst_qmlmin.cpp	2013-12-21 14:55:25.614708078 +0500
+@@ -75,7 +75,7 @@
+ 
+ void tst_qmlmin::initTestCase()
+ {
+-qmlminPath = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/qmlmin");
++qmlminPath = QLatin1String("../../../../bin") + QLatin1String("/qmlmin");
+ #ifdef Q_OS_WIN
+ qmlminPath += QLatin1String(".exe");
+ #endif
+diff -ruN a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
+--- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp	2013-11-21 01:16:05.0 +0500
 b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp	2013-12-21 14:55:28.574708157 +0500
+@@ -66,7 +66,7 @@
+ 
+ void tst_qmlplugindump::initTestCase()
+ {
+-qmlplugindumpPath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
++qmlplugindumpPath = QLatin1String("../../../../bin");
+ 
+ #if defined(Q_OS_WIN)
+ qmlplugindumpPath += QLatin1String("/qmlplugindump.exe");
+diff -ruN a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
+--- a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp	2013-12-08 22:10:16.0 +0500
 b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp	2014-01-03 12:20:08.520795476 +0500
+@@ -833,7 +833,7 @@
+ bool tst_QQmlDebugJS::init(const QString &qmlFile, bool blockMode)
+ {
+ connection = new QQmlDebugConnection();
+-process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", this);
++process = new QQmlDebugProcess(QLatin1String("../../../../../bin") + "/qmlscene", this);
+ client = new QJSDebugClient(connection);
+ 
+ if (blockMode)
+diff -ruN a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectori

[Merge] lp:~sil2100/kubuntu-packaging/qtbase-opensource-src_appmenu-qt5_support into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

2014-01-08 Thread Łukasz Zemczak
Łukasz Zemczak has proposed merging 
lp:~sil2100/kubuntu-packaging/qtbase-opensource-src_appmenu-qt5_support into 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.

Commit message:
Add two patches needed by appmenu-qt5 which are submitted and approved upstream

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)

For more details, see:
https://code.launchpad.net/~sil2100/kubuntu-packaging/qtbase-opensource-src_appmenu-qt5_support/+merge/199642

The following proposed patches are proposed upstream and approved:

https://codereview.qt-project.org/#change,73942
https://codereview.qt-project.org/#change,73829

Since the release of Qt5.2 is near, these are required for working appmenu-qt5 
support (that's using the QPlatformThemePlugin QPA approach)
-- 
https://code.launchpad.net/~sil2100/kubuntu-packaging/qtbase-opensource-src_appmenu-qt5_support/+merge/199642
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~sil2100/kubuntu-packaging/qtbase-opensource-src_appmenu-qt5_support into 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.
=== added file 'debian/patches/make_qkdetheme_constructor_public.diff'
--- debian/patches/make_qkdetheme_constructor_public.diff	1970-01-01 00:00:00 +
+++ debian/patches/make_qkdetheme_constructor_public.diff	2013-12-19 11:27:16 +
@@ -0,0 +1,19 @@
+Author: Łukasz 'sil2100' Zemczak 
+Description: Make QKdeTheme constructor public to enable inheritance
+ Make QKdeTheme constructor public, allowing for custom inheritance.
+ There was no particular reason for the constructor being private, and
+ we need it public for appmenu-qt5.
+Bug-Upstream: https://bugreports.qt-project.org/browse/QTBUG-35566
+
+--- qtbase-opensource-src-5.2.0+dfsg.orig/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h	2013-12-08 18:09:47.0 +0100
 qtbase-opensource-src-5.2.0+dfsg/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h	2013-12-19 11:44:33.262248200 +0100
+@@ -86,8 +86,8 @@
+ class QKdeTheme : public QPlatformTheme
+ {
+ Q_DECLARE_PRIVATE(QKdeTheme)
+-QKdeTheme(const QString &kdeHome, int kdeVersion);
+ public:
++QKdeTheme(const QString &kdeHome, int kdeVersion);
+ 
+ static QPlatformTheme *createKdeTheme();
+ virtual QVariant themeHint(ThemeHint hint) const;

=== added file 'debian/patches/platformtheme_env.diff'
--- debian/patches/platformtheme_env.diff	1970-01-01 00:00:00 +
+++ debian/patches/platformtheme_env.diff	2013-12-19 11:27:16 +
@@ -0,0 +1,80 @@
+Author: Łukasz 'sil2100' Zemczak 
+Description: Add environment control on which platform theme to use
+ Introduce a way of explicit selection of the platform theme to be used,
+ either through a new environment variable - QT_QPA_PLATFORMTHEME, or by
+ the optional -platformtheme command line argument.
+Bug-Upstream: https://bugreports.qt-project.org/browse/QTBUG-30091
+
+--- qtbase-opensource-src-5.2.0+dfsg.orig/src/gui/kernel/qguiapplication.cpp	2013-12-08 18:09:52.0 +0100
 qtbase-opensource-src-5.2.0+dfsg/src/gui/kernel/qguiapplication.cpp	2013-12-19 11:53:36.550232148 +0100
+@@ -887,7 +887,7 @@
+*QGuiApplicationPrivate::platform_name : QString();
+ }
+ 
+-static void init_platform(const QString &pluginArgument, const QString &platformPluginPath, int &argc, char **argv)
++static void init_platform(const QString &pluginArgument, const QString &platformPluginPath, const QString &platformThemeName, int &argc, char **argv)
+ {
+ // Split into platform name and arguments
+ QStringList arguments = pluginArgument.split(QLatin1Char(':'));
+@@ -918,15 +918,21 @@
+ }
+ 
+ // Create the platform theme:
+-// 1) Ask the platform integration for a list of names.
+-const QStringList themeNames = QGuiApplicationPrivate::platform_integration->themeNames();
++
++// 1) Fetch the platform name from the environment if present.
++QStringList themeNames;
++if (!platformThemeName.isEmpty())
++themeNames.append(platformThemeName);
++
++// 2) Ask the platform integration for a list of names and try loading them.
++themeNames += QGuiApplicationPrivate::platform_integration->themeNames();
+ foreach (const QString &themeName, themeNames) {
+ QGuiApplicationPrivate::platform_theme = QPlatformThemeFactory::create(themeName, platformPluginPath);
+ if (QGuiApplicationPrivate::platform_theme)
+ break;
+ }
+ 
+-// 2) If none found, look for a theme plugin. Theme plugins are located in the
++// 3) If none found, look for a theme plugin. Theme plugins are located in the
+ // same directory as platform plugins.
+ if (!QGuiApplicationPrivate::platform_theme) {
+ foreach (const QString &themeName, themeNames) {
+@@ -937,7 +943,7 @@
+ // No error message; not having a theme plugin is allowed.
+ }
+ 
+-// 3) Fall back on the built-in "null" platform theme.
++// 4) Fall back on the built-in "null" platform the

Re: [Merge] lp:~allanlesage/kubuntu-packaging/qtlocation-enable-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtlocation-opensource-src

2014-01-08 Thread Timo Jyrinki
Review: Approve

Fails to build on armhf: 
https://launchpadlibrarian.net/160092190/buildlog_ubuntu-trusty-armhf.qtlocation-opensource-src_5.2.0-0ubuntu1~trusty1~test3_FAILEDTOBUILD.txt.gz

Merging anyway, I hope disabling that one more test helps.
-- 
https://code.launchpad.net/~allanlesage/kubuntu-packaging/qtlocation-enable-tests/+merge/199367
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtlocation-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~iahmad/kubuntu-packaging/qtscript-enable-unit-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtscript-opensource-src

2014-01-08 Thread I Ahmad
The proposal to merge lp:~iahmad/kubuntu-packaging/qtscript-enable-unit-tests 
into lp:~kubuntu-packagers/kubuntu-packaging/qtscript-opensource-src has been 
updated.

Description changed to:

Enabled the make check and fixed the failing tests.

For more details, see:
https://code.launchpad.net/~iahmad/kubuntu-packaging/qtscript-enable-unit-tests/+merge/199421
-- 
https://code.launchpad.net/~iahmad/kubuntu-packaging/qtscript-enable-unit-tests/+merge/199421
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtscript-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~iahmad/kubuntu-packaging/qtxmlpatterns-enable-unit-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtxmlpatterns-opensource-src

2014-01-08 Thread Timo Jyrinki
Review: Needs Fixing

Lacks at least xvfb build dependency so can't build 
(https://launchpadlibrarian.net/159656615/buildlog_ubuntu-trusty-i386.qtxmlpatterns-opensource-src_5.2.0-0ubuntu1~trusty1~test2_FAILEDTOBUILD.txt.gz),
 please test in pbuilder or PPA.
-- 
https://code.launchpad.net/~iahmad/kubuntu-packaging/qtxmlpatterns-enable-unit-tests/+merge/198898
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtxmlpatterns-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~om26er/kubuntu-packaging/qtsystems_unittests into lp:~kubuntu-packagers/kubuntu-packaging/qtsystems-opensource-src

2014-01-08 Thread Timo Jyrinki
Review: Approve

Seems great now on three archs! 
https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-daily/+sourcepub/3737985/+listing-archive-extra
-- 
https://code.launchpad.net/~om26er/kubuntu-packaging/qtsystems_unittests/+merge/198439
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtsystems-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~chris.gagnon/kubuntu-packaging/enable-unit-tests-qtbase-opensource-src into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

2014-01-08 Thread Chris Gagnon
Those test can be skipped, but I think that's something Debian needs to do, as 
it skips a lot of tests. For instance all qnetworkreply tests will not run 
without a resource file that violates DFSG. 

Ubuntu wants to know when tests brake in qtbase and doesn't have the same 
restrictions as Debian with the DFSG.
-- 
https://code.launchpad.net/~chris.gagnon/kubuntu-packaging/enable-unit-tests-qtbase-opensource-src/+merge/200535
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~chris.gagnon/kubuntu-packaging/enable-unit-tests-qtbase-opensource-src into 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~om26er/kubuntu-packaging/qtdeclarative_unittests into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-01-08 Thread Omer Akram
Not so ready. What works locally is failing in the launchpad builders :/
-- 
https://code.launchpad.net/~om26er/kubuntu-packaging/qtdeclarative_unittests/+merge/198425
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~om26er/kubuntu-packaging/qtdeclarative_unittests into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-01-08 Thread Omer Akram
The proposal to merge lp:~om26er/kubuntu-packaging/qtdeclarative_unittests into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src has been 
updated.

Status: Needs review => Work in progress

For more details, see:
https://code.launchpad.net/~om26er/kubuntu-packaging/qtdeclarative_unittests/+merge/198425
-- 
https://code.launchpad.net/~om26er/kubuntu-packaging/qtdeclarative_unittests/+merge/198425
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~allanlesage/kubuntu-packaging/qt3d-enable-tests into lp:~kubuntu-packagers/kubuntu-packaging/qt3d-opensource-src

2014-01-08 Thread Allan LeSage
Allan LeSage has proposed merging 
lp:~allanlesage/kubuntu-packaging/qt3d-enable-tests into 
lp:~kubuntu-packagers/kubuntu-packaging/qt3d-opensource-src.

Requested reviews:
  Dmitry Shachnev (mitya57)
  Timo Jyrinki (timo-jyrinki)

For more details, see:
https://code.launchpad.net/~allanlesage/kubuntu-packaging/qt3d-enable-tests/+merge/199875

Enable testing: run tests under debian build (using xvfb), skip some failing 
tests, enable our standard coverage reporting.
-- 
https://code.launchpad.net/~allanlesage/kubuntu-packaging/qt3d-enable-tests/+merge/199875
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qt3d-opensource-src.
=== modified file 'debian/changelog'
--- debian/changelog	2013-12-18 06:58:29 +
+++ debian/changelog	2014-01-08 03:51:31 +
@@ -1,9 +1,18 @@
 qt3d-opensource-src (5.0~git20130731-0ubuntu2) UNRELEASED; urgency=medium
 
+  [ Timo Jyrinki ]
   * Rebuild against Qt 5.2.0, bump dependencies
   * Use QT_SELECT instead of depending on qt5-default
   * Add syncqt_create_headers.patch to fix build against 5.2.0
 
+  [ Allan LeSage ]
+  * Add tests to QT_BUILD_PARTS.
+  * Depend on xvfb for existing tests requiring a display.
+  * Add dh_override_auto_test to dh_auto_test under xvfb-run.
+  * debian/patches/skip_failing_tests.patch
+- Skip some failing tests pending investigation.
+  * Depend on xauth, needed in some configurations.
+
  -- Timo Jyrinki   Tue, 17 Dec 2013 10:54:56 +
 
 qt3d-opensource-src (5.0~git20130731-0ubuntu1) saucy; urgency=low

=== modified file 'debian/control'
--- debian/control	2013-12-18 06:58:29 +
+++ debian/control	2014-01-08 03:51:31 +
@@ -7,6 +7,8 @@
pkg-kde-tools,
qtbase5-private-dev (>= 5.2.0+dfsg~),
qtdeclarative5-private-dev (>= 5.2.0~),
+   xauth,
+   xvfb,
zlib1g-dev,
 Standards-Version: 3.9.3
 Homepage: http://qt-project.org/

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-12-18 06:58:29 +
+++ debian/patches/series	2014-01-08 03:51:31 +
@@ -1,3 +1,5 @@
 link_against_system_zlib.patch
 workaround_zlib_linking_issue.patch
 syncqt_create_headers.patch
+skip_failing_tests.patch
+enable_coverage_reporting.patch

=== added file 'debian/patches/skip_failing_tests.patch'
--- debian/patches/skip_failing_tests.patch	1970-01-01 00:00:00 +
+++ debian/patches/skip_failing_tests.patch	2014-01-08 03:51:31 +
@@ -0,0 +1,61 @@
+Description: Skip failing tests
+ While enabling tests during build, skip those found failing pending
+ investigation.
+ .
+Author: Allan LeSage 
+Forwarded: no
+Last-Updated: 2014-01-07
+
+--- a/tests/auto/threed/threed.pro
 b/tests/auto/threed/threed.pro
+@@ -5,8 +5,9 @@
+ qbox3d \
+ qcolor4ub \
+ qcustomdataarray \
+-qgeometrydata \
+-qglabstractsurface \
++# skip these failing tests
++#qgeometrydata \
++#qglabstractsurface \
+ qglattributedescription \
+ qglattributeset \
+ qglattributevalue \
+@@ -18,7 +19,8 @@
+ qglindexbuffer \
+ qgllightmodel \
+ qgllightparameters \
+-qglmaterial \
++# skip this failing test
++#qglmaterial \
+ qglmaterialcollection \
+ qglpainter \
+ qglpickcolors \
+@@ -26,7 +28,8 @@
+ qglscenenode \
+ qglsection \
+ qglsphere \
+-qglvertexbundle \
++# skip this failing test
++#qglvertexbundle \
+ qgraphicstransform3d \
+ qplane3d \
+ qray3d \
+--- a/tests/auto/auto.pro
 b/tests/auto/auto.pro
+@@ -3,9 +3,10 @@
+   cmake
+ 
+ qtHaveModule(qml): SUBDIRS += imports
+-qtHaveModule(qmltest) {
+-SUBDIRS += qml3d
+-
+-!win32 : SUBDIRS += qml3d_visual \
+-qml3d_cpp
+-}
++# skip these failing tests
++#qtHaveModule(qmltest) {
++#SUBDIRS += qml3d
++#
++#!win32 : SUBDIRS += qml3d_visual \
++#qml3d_cpp
++#}

=== modified file 'debian/rules'
--- debian/rules	2013-12-18 06:58:29 +
+++ debian/rules	2014-01-08 03:51:31 +
@@ -13,7 +13,7 @@
 	dh $@ --fail-missing --parallel --with pkgkde_symbolshelper --dbg-package=qt3d5-dbg
 
 override_dh_auto_configure:
-	qmake
+	qmake QT_BUILD_PARTS+=tests
 
 override_dh_auto_install:
 	dh_auto_install
@@ -24,6 +24,9 @@
 	# Remove libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
+override_dh_auto_test:
+	xvfb-run -a dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
+
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~allanlesage/kubuntu-packaging/qt3d-enable-tests into lp:~kubuntu-packagers/kubuntu-packaging/qt3d-opensource-src

2014-01-08 Thread Allan LeSage
Thanks Dmitry, fixes in progress.
-- 
https://code.launchpad.net/~allanlesage/kubuntu-packaging/qt3d-enable-tests/+merge/199875
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qt3d-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~om26er/kubuntu-packaging/qtdeclarative_unittests into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-01-08 Thread Omer Akram
ouch, I should have tested against Qt 5.2


On Wed, Dec 11, 2013 at 5:36 PM, Timo Jyrinki wrote:

> Review: Needs Fixing
>
> About all tests failing:
>
>
> https://launchpadlibrarian.net/159472784/buildlog_ubuntu-trusty-amd64.qtdeclarative-opensource-src_5.2.0~rc1-0ubuntu1~trusty1~test4_FAILEDTOBUILD.txt.gz
> --
>
> https://code.launchpad.net/~om26er/kubuntu-packaging/qtdeclarative_unittests/+merge/198425
> You are the owner of lp:~om26er/kubuntu-packaging/qtdeclarative_unittests.
>

-- 
https://code.launchpad.net/~om26er/kubuntu-packaging/qtdeclarative_unittests/+merge/198425
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~iahmad/kubuntu-packaging/qtxmlpatterns-enable-unit-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtxmlpatterns-opensource-src

2014-01-08 Thread Timo Jyrinki
Works well also in PPA build, great! 
https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-daily/+sourcepub/3727303/+listing-archive-extra

Pushed with credits.
-- 
https://code.launchpad.net/~iahmad/kubuntu-packaging/qtxmlpatterns-enable-unit-tests/+merge/198898
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtxmlpatterns-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~allanlesage/kubuntu-packaging/qtlocation-enable-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtlocation-opensource-src

2014-01-08 Thread Allan LeSage
Allan LeSage has proposed merging 
lp:~allanlesage/kubuntu-packaging/qtlocation-enable-tests into 
lp:~kubuntu-packagers/kubuntu-packaging/qtlocation-opensource-src.

Requested reviews:
  Timo Jyrinki (timo-jyrinki)

For more details, see:
https://code.launchpad.net/~allanlesage/kubuntu-packaging/qtlocation-enable-tests/+merge/199367

Add tests to the Debian build; enable coverage reporting for Jenkins 
consumption; skip some failing tests.

Do we want a "make check" target at the root level of this project?  The layout 
is unfamiliar to me, coming from autotools-type projects, however I don't know 
the common patterns of Qt projects, maybe this is standard.
-- 
https://code.launchpad.net/~allanlesage/kubuntu-packaging/qtlocation-enable-tests/+merge/199367
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtlocation-opensource-src.
=== modified file 'debian/changelog'
--- debian/changelog	2013-12-03 12:18:51 +
+++ debian/changelog	2013-12-17 22:39:34 +
@@ -1,5 +1,6 @@
 qtlocation-opensource-src (5.2.0~rc1-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Timo Jyrinki ]
   * New upstream rc release.
   * Add libqt5positioning5 and qtdeclarative5-qtpositioning-plugin packages
   * Refresh add_support_for_ubuntu_platform.patch
@@ -10,6 +11,14 @@
   * Drop debian/patches/disable_nokia_plugin.patch:
 - Compiles and has been updated again.
 
+  [ Allan LeSage ]
+  * Depend on xvfb for existing tests requiring a display.
+  * Add dh_override_auto_test to make check under xvfb-run.
+  * debian/patches/skip_failing_tests.patch
+- Skip some failing tests pending investigation.
+  * debian/patches/enable_coverage_reporting.patch
+- Enable standard coverage reporting for Jenkins consumption.
+
  -- Timo Jyrinki   Thu, 14 Nov 2013 05:14:27 +
 
 qtlocation-opensource-src (5.0~git20130805-0ubuntu3) saucy; urgency=low

=== modified file 'debian/control'
--- debian/control	2013-11-21 06:44:07 +
+++ debian/control	2013-12-17 22:39:34 +
@@ -12,6 +12,7 @@
qtbase5-private-dev (>= 5.2.0~),
qtdeclarative5-private-dev (>= 5.2.0~),
qtdeclarative5-qtquick2-plugin (>= 5.2.0~),
+	   xvfb,
 Standards-Version: 3.9.4
 Homepage: http://qt-project.org/
 Vcs-Bzr: lp:~kubuntu-packagers/kubuntu-packaging/qtlocation-opensource-src

=== added file 'debian/patches/enable_coverage_reporting.patch'
--- debian/patches/enable_coverage_reporting.patch	1970-01-01 00:00:00 +
+++ debian/patches/enable_coverage_reporting.patch	2013-12-17 22:39:34 +
@@ -0,0 +1,156 @@
+--- a/qtlocation.pro
 b/qtlocation.pro
+@@ -1,3 +1,4 @@
++include(coverage.pri)
+ load(configure)
+ qtCompileTest(geoclue)
+ qtCompileTest(geoclue-satellite)
+--- a/src/3rdparty/3rdparty.pro
 b/src/3rdparty/3rdparty.pro
+@@ -1,2 +1,4 @@
++include(../../coverage.pri)
++
+ TEMPLATE = subdirs
+ SUBDIRS += poly2tri
+--- a/src/3rdparty/poly2tri/poly2tri.pro
 b/src/3rdparty/poly2tri/poly2tri.pro
+@@ -1,3 +1,5 @@
++include(../../../coverage.pri)
++
+ TEMPLATE = lib
+ TARGET = poly2tri
+ 
+--- a/src/imports/location/location.pro
 b/src/imports/location/location.pro
+@@ -1,3 +1,5 @@
++include(../../../coverage.pri)
++
+ QT += quick-private network positioning-private location-private qml-private 3d core-private gui-private
+ 
+ INCLUDEPATH += ../../location
+--- a/src/location/location.pro
 b/src/location/location.pro
+@@ -1,3 +1,5 @@
++include(../../coverage.pri)
++
+ TARGET = QtLocation
+ QT = core-private positioning
+ 
+--- a/src/location/maps/maps.pri
 b/src/location/maps/maps.pri
+@@ -1,3 +1,4 @@
++include(../../../coverage.pri)
+ 
+ INCLUDEPATH += maps
+ 
+--- a/src/plugins/geoservices/osm/osm.pro
 b/src/plugins/geoservices/osm/osm.pro
+@@ -1,3 +1,5 @@
++include(../../../../coverage.pri)
++
+ TARGET = qtgeoservices_osm
+ QT += location-private network
+ 
+--- a/src/plugins/position/geoclue/geoclue.pro
 b/src/plugins/position/geoclue/geoclue.pro
+@@ -1,3 +1,5 @@
++include(../../../../coverage.pri)
++
+ TARGET = qtposition_geoclue
+ QT = core positioning
+ 
+--- a/src/plugins/position/gypsy/gypsy.pro
 b/src/plugins/position/gypsy/gypsy.pro
+@@ -1,3 +1,5 @@
++include(../../../../coverage.pri)
++
+ TARGET = qtposition_gypsy
+ QT = core positioning
+ 
+--- a/src/plugins/position/position.pro
 b/src/plugins/position/position.pro
+@@ -1,3 +1,5 @@
++include(../../coverage.pri)
++
+ TEMPLATE = subdirs
+ 
+ config_geoclue:SUBDIRS += geoclue
+--- a/src/plugins/position/simulator/simulator.pro
 b/src/plugins/position/simulator/simulator.pro
+@@ -1,3 +1,5 @@
++include(../../../../coverage.pri)
++
+ TARGET = qtposition_simulator
+ QT += positioning gui
+ 
+--- a/src/plugins/position/ubuntu/ubuntu.pro
 b/src/plugins/position/ubuntu/ubuntu.pro
+@@ -1,3 +1,5 @@
++include(../../../../coverage.pri)
++
+ TARGET = qtposition_ubuntu
+ QT += location gui
+ 
+--- a/src/src.pro
 b/src/src.pro
+@@ -1,3 +1,5 @@
++include(../coverage.pri)
++
+ T

[Merge] lp:~iahmad/kubuntu-packaging/qtscript-enable-unit-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtscript-opensource-src

2014-01-08 Thread I Ahmad
I Ahmad has proposed merging 
lp:~iahmad/kubuntu-packaging/qtscript-enable-unit-tests into 
lp:~kubuntu-packagers/kubuntu-packaging/qtscript-opensource-src.

Requested reviews:
  Timo Jyrinki (timo-jyrinki)

For more details, see:
https://code.launchpad.net/~iahmad/kubuntu-packaging/qtscript-enable-unit-tests/+merge/199421
-- 
https://code.launchpad.net/~iahmad/kubuntu-packaging/qtscript-enable-unit-tests/+merge/199421
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtscript-opensource-src.
=== modified file 'debian/changelog'
--- debian/changelog	2013-12-16 10:44:35 +
+++ debian/changelog	2013-12-18 09:37:51 +
@@ -1,10 +1,14 @@
 qtscript-opensource-src (5.2.0+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Timo Jyrinki ]
   * Sync with Debian, no remaining differences.
   * New upstream release. 
   * Bump dependencies to 5.2.0
 
- -- Timo Jyrinki   Mon, 02 Sep 2013 12:40:58 +
+  [ Iftikhar Ahmad (QA Engineer) ]
+  * Enable make check and fix the failing tests.
+
+ -- Iftikhar Ahmad (QA Engineer)   Wed, 18 Dec 2013 13:51:29 +0500
 
 qtscript-opensource-src (5.1.0+dfsg-3) unstable; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2013-11-13 14:31:16 +
+++ debian/control	2013-12-18 09:37:51 +
@@ -12,7 +12,8 @@
 Build-Depends: debhelper (>= 9),
dpkg-dev (>= 1.16.1),
pkg-kde-tools (>= 0.15.8~),
-   qtbase5-private-dev (>= 5.2.0~)
+   qtbase5-private-dev (>= 5.2.0~),
+   xvfb
 Build-Depends-Indep: libqt5sql5-sqlite,
  qttools5-dev-tools (>= 5.2.0~)
 Standards-Version: 3.9.4

=== added file 'debian/patches/enable-make-check.patch'
--- debian/patches/enable-make-check.patch	1970-01-01 00:00:00 +
+++ debian/patches/enable-make-check.patch	2013-12-18 09:37:51 +
@@ -0,0 +1,11 @@
+--- a/tests/auto/qscriptextensionplugin/test/test.pro
 b/tests/auto/qscriptextensionplugin/test/test.pro
+@@ -14,7 +14,7 @@ CONFIG(debug_and_release) {
+ DESTDIR = ../release
+   }
+ } else {
+-  DESTDIR = ..
++  DESTDIR = .
+ }
+ 
+ DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-08-30 06:48:51 +
+++ debian/patches/series	2013-12-18 09:37:51 +
@@ -1,2 +1,3 @@
+enable-make-check.patch
 disable_v8_sunspider_tests.patch
 s390x_jscore.diff

=== modified file 'debian/rules'
--- debian/rules	2013-12-16 10:42:06 +
+++ debian/rules	2013-12-18 09:37:51 +
@@ -7,6 +7,7 @@
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
+export QT_QPA_PLATFORM := minimal
 
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtscript5-dbg
@@ -35,3 +36,6 @@
 prune-nonfree:
 	rm -rf tests/benchmarks/script/sunspider/*
 	rm -rf tests/benchmarks/script/v8/*
+
+override_dh_auto_test:
+	cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && xvfb-run make -f Makefile check

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~iahmad/kubuntu-packaging/qtxmlpatterns-enable-unit-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtxmlpatterns-opensource-src

2014-01-08 Thread I Ahmad
Fixed the xvfb dependency and version number. Also tested in pbuilder and 
everything looks fine. Please give it anther try in ppa. Thanks.
-- 
https://code.launchpad.net/~iahmad/kubuntu-packaging/qtxmlpatterns-enable-unit-tests/+merge/198898
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtxmlpatterns-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~om26er/kubuntu-packaging/qtmultimedia_unittests into lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src

2014-01-08 Thread Omer Akram
Can you please suggest a way to reproduce that environment. I tried a 'debuild' 
locally and it worked fine.
-- 
https://code.launchpad.net/~om26er/kubuntu-packaging/qtmultimedia_unittests/+merge/198387
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~om26er/kubuntu-packaging/qtmultimedia_unittests into lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src

2014-01-08 Thread Omer Akram
Full build logs of failure here: http://paste.ubuntu.com/6583508/
-- 
https://code.launchpad.net/~om26er/kubuntu-packaging/qtmultimedia_unittests/+merge/198387
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~allanlesage/kubuntu-packaging/qtjsbackend-enable-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtjsbackend-opensource-src

2014-01-08 Thread Allan LeSage
Thanks for this news.
-- 
https://code.launchpad.net/~allanlesage/kubuntu-packaging/qtjsbackend-enable-tests/+merge/200272
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtjsbackend-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~dandrader/kubuntu-packaging/qtdeclarative-opensource-src into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

2014-01-08 Thread Daniel d'Andrada
Daniel d'Andrada has proposed merging 
lp:~dandrader/kubuntu-packaging/qtdeclarative-opensource-src into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.

Commit message:
Use original fix_qtbug_32004.patch (for Qt 5.3) and not its Qt 5.0.2 version

+ update symbols file

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)

For more details, see:
https://code.launchpad.net/~dandrader/kubuntu-packaging/qtdeclarative-opensource-src/+merge/195790

Use original fix_qtbug_32004.patch (for Qt 5.3) and not its Qt 5.0.2 version

+ update symbols file
-- 
https://code.launchpad.net/~dandrader/kubuntu-packaging/qtdeclarative-opensource-src/+merge/195790
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~dandrader/kubuntu-packaging/qtdeclarative-opensource-src into 
lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.
=== modified file 'debian/libqt5quick5.symbols'
--- debian/libqt5quick5.symbols	2013-11-13 14:24:49 +
+++ debian/libqt5quick5.symbols	2013-11-19 14:27:34 +
@@ -1050,6 +1050,7 @@
  _ZN15QSGPlainTextureD0Ev@Base 5.0.2 1
  _ZN15QSGPlainTextureD1Ev@Base 5.0.2 1
  _ZN15QSGPlainTextureD2Ev@Base 5.0.2 1
+ _ZN16QCoreApplication9sendEventEP7QObjectP6QEvent@Base 5.2.0 1
  _ZN16QQuickCloseEvent11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.1.0 1
  _ZN16QQuickCloseEvent11qt_metacastEPKc@Base 5.1.0 1
  _ZN16QQuickCloseEvent16staticMetaObjectE@Base 5.1.0 1
@@ -1200,16 +1201,10 @@
  _ZN17QQuickItemPrivate15transform_clearEP16QQmlListPropertyI15QQuickTransformE@Base 5.0.2 1
  _ZN17QQuickItemPrivate15transform_countEP16QQmlListPropertyI15QQuickTransformE@Base 5.0.2 1
  _ZN17QQuickItemPrivate15visibleChildrenEv@Base 5.0.2 1
- _ZN17QQuickItemPrivate16deliverDragEventEP6QEvent@Base 5.0.2 1
  _ZN17QQuickItemPrivate16resources_appendEP16QQmlListPropertyI7QObjectEPS1_@Base 5.0.2 1
  _ZN17QQuickItemPrivate16transformChangedEv@Base 5.0.2 1
  _ZN17QQuickItemPrivate16transform_appendEP16QQmlListPropertyI15QQuickTransformEPS1_@Base 5.0.2 1
  _ZN17QQuickItemPrivate17canAcceptTabFocusEP10QQuickItem@Base 5.1.0 1
- _ZN17QQuickItemPrivate17deliverFocusEventEP11QFocusEvent@Base 5.0.2 1
- _ZN17QQuickItemPrivate17deliverHoverEventEP11QHoverEvent@Base 5.0.2 1
- _ZN17QQuickItemPrivate17deliverMouseEventEP11QMouseEvent@Base 5.0.2 1
- _ZN17QQuickItemPrivate17deliverTouchEventEP11QTouchEvent@Base 5.0.2 1
- _ZN17QQuickItemPrivate17deliverWheelEventEP11QWheelEvent@Base 5.0.2 1
  _ZN17QQuickItemPrivate17refFromEffectItemEb@Base 5.0.2 1
  _ZN17QQuickItemPrivate17setConsistentTimeEx@Base 5.0.2 1
  _ZN17QQuickItemPrivate18qt_tab_all_widgetsEv@Base 5.1.0 1

=== modified file 'debian/patches/fix_qtbug_32004.patch'
--- debian/patches/fix_qtbug_32004.patch	2013-11-19 12:28:06 +
+++ debian/patches/fix_qtbug_32004.patch	2013-11-19 14:27:34 +
@@ -10,470 +10,6 @@
 Task-number: QTBUG-32004
 Change-Id: Ib6972e7f5e588bee986ae5f2d69aa6fccb58af95
 
-Index: trunk/src/quick/items/qquickitem.cpp
-===
 trunk.orig/src/quick/items/qquickitem.cpp	2013-11-19 09:36:35.741906100 -0200
-+++ trunk/src/quick/items/qquickitem.cpp	2013-11-19 09:36:35.737906100 -0200
-@@ -4160,96 +4160,6 @@
- }
- #endif // QT_NO_IM
- 
--void QQuickItemPrivate::deliverFocusEvent(QFocusEvent *e)
--{
--Q_Q(QQuickItem);
--
--if (e->type() == QEvent::FocusIn) {
--q->focusInEvent(e);
--} else {
--q->focusOutEvent(e);
--}
--}
--
--void QQuickItemPrivate::deliverMouseEvent(QMouseEvent *e)
--{
--Q_Q(QQuickItem);
--
--Q_ASSERT(e->isAccepted());
--
--switch (e->type()) {
--default:
--Q_ASSERT(!"Unknown event type");
--case QEvent::MouseMove:
--q->mouseMoveEvent(e);
--break;
--case QEvent::MouseButtonPress:
--q->mousePressEvent(e);
--break;
--case QEvent::MouseButtonRelease:
--q->mouseReleaseEvent(e);
--break;
--case QEvent::MouseButtonDblClick:
--q->mouseDoubleClickEvent(e);
--break;
--}
--}
--
--#ifndef QT_NO_WHEELEVENT
--void QQuickItemPrivate::deliverWheelEvent(QWheelEvent *e)
--{
--Q_Q(QQuickItem);
--q->wheelEvent(e);
--}
--#endif
--
--void QQuickItemPrivate::deliverTouchEvent(QTouchEvent *e)
--{
--Q_Q(QQuickItem);
--q->touchEvent(e);
--}
--
--void QQuickItemPrivate::deliverHoverEvent(QHoverEvent *e)
--{
--Q_Q(QQuickItem);
--switch (e->type()) {
--default:
--Q_ASSERT(!"Unknown event type");
--case QEvent::HoverEnter:
--q->hoverEnterEvent(e);
--break;
--case QEvent::HoverLeave:
--q->hoverLeaveEvent(e);
--break;
--case QEvent::HoverMove:
--q->hoverMoveEvent(e);
--break;
--}
--}
--
--#ifndef QT_NO_DRAGANDDROP
--void QQuickItemPrivate::deliverDragEvent(QEvent *e)
--{
--Q_Q(QQuickItem);
--switch (e->type()) {
--default:
--Q_ASSERT(!"Unknown event type");
--case QEvent::DragEnter:
-- 

[Merge] lp:~chris.gagnon/kubuntu-packaging/qtgraphicaleffects-opensource-src-enable-unit-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtgraphicaleffects-opensource-src

2014-01-08 Thread Chris Gagnon
Chris Gagnon has proposed merging 
lp:~chris.gagnon/kubuntu-packaging/qtgraphicaleffects-opensource-src-enable-unit-tests
 into lp:~kubuntu-packagers/kubuntu-packaging/qtgraphicaleffects-opensource-src.

Requested reviews:
  Timo Jyrinki (timo-jyrinki)
  Kubuntu Packagers (kubuntu-packagers)

For more details, see:
https://code.launchpad.net/~chris.gagnon/kubuntu-packaging/qtgraphicaleffects-opensource-src-enable-unit-tests/+merge/198846

enable unit tests to run during build time
-- 
https://code.launchpad.net/~chris.gagnon/kubuntu-packaging/qtgraphicaleffects-opensource-src-enable-unit-tests/+merge/198846
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~chris.gagnon/kubuntu-packaging/qtgraphicaleffects-opensource-src-enable-unit-tests
 into lp:~kubuntu-packagers/kubuntu-packaging/qtgraphicaleffects-opensource-src.
=== modified file 'debian/changelog'
--- debian/changelog	2013-12-03 12:21:49 +
+++ debian/changelog	2013-12-12 23:32:47 +
@@ -4,6 +4,10 @@
 - Transitional package for upgrades from Ubuntu 13.04
   * New upstream release.
 
+  [ Chris Gagnon ]
+* Run unit tests during build:
+  - Chris Gagnon 
+
  -- Timo Jyrinki   Mon, 02 Sep 2013 12:39:20 +
 
 qtgraphicaleffects-opensource-src (5.1.1-1) unstable; urgency=low

=== modified file 'debian/control'
--- debian/control	2013-09-02 12:36:39 +
+++ debian/control	2013-12-12 23:32:47 +
@@ -14,6 +14,7 @@
pkg-kde-tools,
qtbase5-private-dev (>= 5.1.1+dfsg~),
qtdeclarative5-private-dev (>= 5.1.1~),
+   xvfb,
 Build-Depends-Indep: libqt5sql5-sqlite,
  qttools5-dev-tools (>= 5.1.1~)
 Standards-Version: 3.9.4

=== modified file 'debian/rules'
--- debian/rules	2013-11-15 09:22:31 +
+++ debian/rules	2013-12-12 23:32:47 +
@@ -12,7 +12,10 @@
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	qmake "CONFIG+=debug"
+	qmake "CONFIG+=debug" QT_BUILD_PARTS+=tests
+
+override_dh_auto_test:
+	xvfb-run -a make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
 
 override_dh_auto_build-indep:
 	dh_auto_build -Smakefile -- docs

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~om26er/kubuntu-packaging/qtmultimedia_unittests into lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src

2014-01-08 Thread Timo Jyrinki
Review: Needs Fixing

But unfortunately does not work when tested in PPA build, see:

https://launchpadlibrarian.net/159472661/buildlog_ubuntu-trusty-amd64.qtmultimedia-opensource-src_5.2.0~rc1-0ubuntu1~trusty1~test3_FAILEDTOBUILD.txt.gz

-- 
https://code.launchpad.net/~om26er/kubuntu-packaging/qtmultimedia_unittests/+merge/198387
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~sil2100/kubuntu-packaging/qtbase-opensource-src_appmenu-qt5_support into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

2014-01-08 Thread Timo Jyrinki
(because of the another upload that link is not strictly speaking relevant, 
other than showing the succeeded amd64 build)
-- 
https://code.launchpad.net/~sil2100/kubuntu-packaging/qtbase-opensource-src_appmenu-qt5_support/+merge/199642
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~om26er/kubuntu-packaging/qtmultimedia_unittests into lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src

2014-01-08 Thread Timo Jyrinki
Review: Approve

Builds fine in a PPA, thanks! Merged with attribution.

https://launchpadlibrarian.net/160003668/buildlog_ubuntu-trusty-amd64.qtmultimedia-opensource-src_5.2.0-1ubuntu1~trusty1~test1_UPLOADING.txt.gz
-- 
https://code.launchpad.net/~om26er/kubuntu-packaging/qtmultimedia_unittests/+merge/198387
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~om26er/kubuntu-packaging/qtmultimedia_unittests into lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src

2014-01-08 Thread Timo Jyrinki
Review: Approve

I'm fine with this approach since it's hard to find a subset of truly 
functional tests that run on builders, so this seems to make enough sense.

I'll run a test build and then merge later.
-- 
https://code.launchpad.net/~om26er/kubuntu-packaging/qtmultimedia_unittests/+merge/198387
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~iahmad/kubuntu-packaging/qtscript-enable-unit-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtscript-opensource-src

2014-01-08 Thread Timo Jyrinki
Review: Approve

Looks good 
https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-daily/+sourcepub/3741274/+listing-archive-extra
-- 
https://code.launchpad.net/~iahmad/kubuntu-packaging/qtscript-enable-unit-tests/+merge/199421
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtscript-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~iahmad/kubuntu-packaging/enable-unit-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtsensors-opensource-src

2014-01-08 Thread I Ahmad
I Ahmad has proposed merging lp:~iahmad/kubuntu-packaging/enable-unit-tests 
into lp:~kubuntu-packagers/kubuntu-packaging/qtsensors-opensource-src.

Requested reviews:
  Timo Jyrinki (timo-jyrinki)

For more details, see:
https://code.launchpad.net/~iahmad/kubuntu-packaging/enable-unit-tests/+merge/198382
-- 
https://code.launchpad.net/~iahmad/kubuntu-packaging/enable-unit-tests/+merge/198382
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtsensors-opensource-src.
=== modified file 'debian/changelog'
--- debian/changelog	2013-12-10 07:24:37 +
+++ debian/changelog	2013-12-10 12:50:09 +
@@ -1,10 +1,14 @@
-qtsensors-opensource-src (5.2.0~rc1+dfsg-0ubuntu1) UNRELEASED; urgency=low
+qtsensors-opensource-src (5.2.0~rc1+dfsg-0ubuntu2) UNRELEASED; urgency=low
 
+  [ Timo Jyrinki ]
   * New upstream version
   * Reduce delta to Debian by dropping private headers too
   * Re-enable tests
 
- -- Timo Jyrinki   Tue, 03 Dec 2013 10:33:09 +
+  [ Iftikhar Ahmad (QA Engineer) ]
+  * Enabled the unit tests and skipped the failing ones.
+
+ -- Iftikhar Ahmad (QA Engineer)   Tue, 10 Dec 2013 17:01:20 +0500
 
 qtsensors-opensource-src (5.1.1+dfsg-2ubuntu2) trusty; urgency=low
 

=== added directory 'debian/patches'
=== added file 'debian/patches/enable-make-check.patch'
--- debian/patches/enable-make-check.patch	1970-01-01 00:00:00 +
+++ debian/patches/enable-make-check.patch	2013-12-10 12:50:09 +
@@ -0,0 +1,13 @@
+--- a/tests/auto/auto.pro
 b/tests/auto/auto.pro
+@@ -5,8 +5,8 @@ SUBDIRS += sensors2qmlapi
+ #SUBDIRS += legacy_sensors
+ SUBDIRS += qtsensors5
+ SUBDIRS += qsensorgestures
+-SUBDIRS += qsensorgestureplugins
++!unix:SUBDIRS += qsensorgestureplugins
+ SUBDIRS += cmake
+ 
+-!mac:!win32:SUBDIRS += qsensorgestures_gestures
++!mac:!win32:!unix:SUBDIRS += qsensorgestures_gestures
+ 

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +
+++ debian/patches/series	2013-12-10 12:50:09 +
@@ -0,0 +1,1 @@
+enable-make-check.patch

=== modified file 'debian/rules'
--- debian/rules	2013-12-10 06:58:33 +
+++ debian/rules	2013-12-10 12:50:09 +
@@ -7,6 +7,7 @@
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
+export QT_QPA_PLATFORM := minimal
 
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtsensors5-dbg
@@ -14,9 +15,6 @@
 override_dh_auto_configure:
 	qmake "CONFIG+=debug" QT_BUILD_PARTS+=tests
 
-override_dh_auto_test:
-	xvfb-run -a dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
-
 override_dh_auto_install:
 	dh_auto_install
 	
@@ -39,6 +37,9 @@
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
+override_dh_auto_test:
+	cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && xvfb-run -a make -f Makefile check
+
 prune-nonfree:
 	# Remove minified jquery without source.
 	rm -fv doc/config/scripts/jquery.js

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~sil2100/kubuntu-packaging/qtbase-opensource-src_appmenu-qt5_support into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

2014-01-08 Thread Timo Jyrinki
Review: Approve

Looks good, amd64 and i386 practically finished: 
https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-daily/+sourcepub/3741335/+listing-archive-extra
 and there should be no reason why armhf should be failed.

But I need to do another upload since I forgot to enable the debug flags from 
the build which is wanted for PPA builds. Merging anyhow. It will reside in 
qt5-daily for the moment, and will be then copied later to qt5-beta2 again 
where the rest lies.
-- 
https://code.launchpad.net/~sil2100/kubuntu-packaging/qtbase-opensource-src_appmenu-qt5_support/+merge/199642
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~allanlesage/kubuntu-packaging/qt3d-enable-tests into lp:~kubuntu-packagers/kubuntu-packaging/qt3d-opensource-src

2014-01-08 Thread Allan LeSage
Allan LeSage has proposed merging 
lp:~allanlesage/kubuntu-packaging/qt3d-enable-tests into 
lp:~kubuntu-packagers/kubuntu-packaging/qt3d-opensource-src.

Requested reviews:
  Timo Jyrinki (timo-jyrinki)

For more details, see:
https://code.launchpad.net/~allanlesage/kubuntu-packaging/qt3d-enable-tests/+merge/199875

Enable testing: run tests under debian build (using xvfb), skip some failing 
tests, enable our standard coverage reporting.
-- 
https://code.launchpad.net/~allanlesage/kubuntu-packaging/qt3d-enable-tests/+merge/199875
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qt3d-opensource-src.
=== modified file 'debian/changelog'
--- debian/changelog	2013-12-18 06:58:29 +
+++ debian/changelog	2013-12-20 22:54:33 +
@@ -1,9 +1,18 @@
 qt3d-opensource-src (5.0~git20130731-0ubuntu2) UNRELEASED; urgency=medium
 
+  [ Timo Jyrinki ]
   * Rebuild against Qt 5.2.0, bump dependencies
   * Use QT_SELECT instead of depending on qt5-default
   * Add syncqt_create_headers.patch to fix build against 5.2.0
 
+  [ Allan LeSage ]
+  * Depend on xvfb for existing tests requiring a display.
+  * Add dh_override_auto_test to make check under xvfb-run.
+  * debian/patches/skip_failing_tests.patch
+- Skip some failing tests pending investigation.
+  * debian/patches/enable_coverage_reporting.patch
+- Enable standard coverage reporting for Jenkins consumption.
+
  -- Timo Jyrinki   Tue, 17 Dec 2013 10:54:56 +
 
 qt3d-opensource-src (5.0~git20130731-0ubuntu1) saucy; urgency=low

=== modified file 'debian/control'
--- debian/control	2013-12-18 06:58:29 +
+++ debian/control	2013-12-20 22:54:33 +
@@ -7,6 +7,7 @@
pkg-kde-tools,
qtbase5-private-dev (>= 5.2.0+dfsg~),
qtdeclarative5-private-dev (>= 5.2.0~),
+   xvfb,
zlib1g-dev,
 Standards-Version: 3.9.3
 Homepage: http://qt-project.org/

=== added file 'debian/patches/enable_coverage_reporting.patch'
--- debian/patches/enable_coverage_reporting.patch	1970-01-01 00:00:00 +
+++ debian/patches/enable_coverage_reporting.patch	2013-12-20 22:54:33 +
@@ -0,0 +1,79 @@
+--- a/src/imports/threed/threed.pro
 b/src/imports/threed/threed.pro
+@@ -1,3 +1,5 @@
++include(../../../coverage.pri)
++
+ CXX_MODULE = 3d
+ TARGET  = qthreedqmlplugin
+ 
+--- a/src/quick3d/quick3d.pro
 b/src/quick3d/quick3d.pro
+@@ -1,3 +1,5 @@
++include(../../coverage.pri)
++
+ TARGET = Qt3DQuick
+ MODULE = 3dquick
+ QT = core gui qml quick 3d
+--- a/src/threed/threed.pro
 b/src/threed/threed.pro
+@@ -1,3 +1,5 @@
++include(../../coverage.pri)
++
+ TARGET = Qt3D
+ MODULE = 3d
+ QT = core-private gui-private opengl
+--- /dev/null
 b/coverage.pri
+@@ -0,0 +1,44 @@
++# Coverage
++CONFIG(coverage) {
++LIBS += -lgcov
++QMAKE_CXXFLAGS += --coverage
++QMAKE_LDFLAGS += --coverage
++
++QMAKE_EXTRA_TARGETS += clean-gcno clean-gcda coverage-html \
++generate-coverage-html clean-coverage-html coverage-gcovr \
++generate-gcovr generate-coverage-gcovr clean-coverage-gcovr
++
++clean-gcno.commands = \
++"@echo Removing old coverage instrumentation"; \
++"find -name '*.gcno' -print | xargs -r rm"
++
++clean-gcda.commands = \
++"@echo Removing old coverage results"; \
++"find -name '*.gcda' -print | xargs -r rm"
++
++coverage-html.depends = clean-gcda check generate-coverage-html
++
++generate-coverage-html.commands = \
++"@echo Collecting coverage data"; \
++"lcov --directory $${TOP_SRC_DIR} --capture --output-file coverage.info --no-checksum --compat-libtool"; \
++"lcov --extract coverage.info \"*/src/*.cpp\" -o coverage.info"; \
++"lcov --remove coverage.info \"moc_*.cpp\" -o coverage.info"; \
++"LANG=C genhtml --prefix $${TOP_SRC_DIR} --output-directory coverage-html --title \"Code Coverage\" --legend --show-details coverage.info"
++
++clean-coverage-html.depends = clean-gcda
++clean-coverage-html.commands = \
++"lcov --directory $${TOP_SRC_DIR} -z"; \
++"rm -rf coverage.info coverage-html"
++
++coverage-gcovr.depends = clean-gcda check generate-coverage-gcovr
++
++generate-coverage-gcovr.commands = \
++"@echo Generating coverage GCOVR report"; \
++"gcovr -x -r $${TOP_SRC_DIR} -o $${TOP_SRC_DIR}/coverage.xml -e \".*/moc_.*\" -e \"tests/.*\" -e \".*\\.h\""
++
++clean-coverage-gcovr.depends = clean-gcda
++clean-coverage-gcovr.commands = \
++"rm -rf $${TOP_SRC_DIR}/coverage.xml"
++
++QMAKE_CLEAN += *.gcda *.gcno coverage.info coverage.xml
++}
+--- a/qt3d.pro
 b/qt3d.pro
+@@ -1,3 +1,5 @@
++include(coverage.pri)
++
+ requires(qtHaveModule(opengl))
+ 
+ load(qt_parts)

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-12-18 06:58:29 +
+++ debian/patches/series	2013-12-20 22:54:33 +
@@ -1,3 +1,5 @@
 link_against_system_zl

[Merge] lp:~om26er/kubuntu-packaging/qtmultimedia_unittests into lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src

2014-01-08 Thread Omer Akram
Omer Akram has proposed merging 
lp:~om26er/kubuntu-packaging/qtmultimedia_unittests into 
lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src.

Commit message:
Run unittests during build, disable flaky tests

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)

For more details, see:
https://code.launchpad.net/~om26er/kubuntu-packaging/qtmultimedia_unittests/+merge/198387

Run unittests during build, disable flaky tests
-- 
https://code.launchpad.net/~om26er/kubuntu-packaging/qtmultimedia_unittests/+merge/198387
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~om26er/kubuntu-packaging/qtmultimedia_unittests into 
lp:~kubuntu-packagers/kubuntu-packaging/qtmultimedia-opensource-src.
=== added directory 'debian/patches'
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +
+++ debian/patches/series	2013-12-10 13:15:00 +
@@ -0,0 +1,1 @@
+skip_failing_tests.patch

=== added file 'debian/patches/skip_failing_tests.patch'
--- debian/patches/skip_failing_tests.patch	1970-01-01 00:00:00 +
+++ debian/patches/skip_failing_tests.patch	2013-12-10 13:15:00 +
@@ -0,0 +1,20 @@
+=== modified file 'tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp'
+--- a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp	2013-09-20 19:21:01 +
 b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp	2013-12-05 16:30:52 +
+@@ -341,6 +341,7 @@
+ 
+ void tst_QMediaPlaylist::saveAndLoad()
+ {
++QSKIP("QTBUG-23826: Is flaky and has been like that for a while");
+ QMediaPlaylist playlist;
+ playlist.addMedia(content1);
+ playlist.addMedia(content2);
+@@ -649,6 +650,7 @@
+ 
+ void tst_QMediaPlaylist::testLoaded_signal()
+ {
++QSKIP("QTBUG-35420 Is falky and fails at random");
+ //create an instance of QMediaPlaylist class.
+ QMediaPlaylist playlist;
+ playlist.addMedia(content1); //set the media to playlist
+

=== modified file 'debian/rules'
--- debian/rules	2013-11-14 06:29:52 +
+++ debian/rules	2013-12-10 13:15:00 +
@@ -7,6 +7,7 @@
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
+export QT_QPA_PLATFORM := minimal
 
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtmultimedia5-dbg
@@ -36,3 +37,7 @@
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
+override_dh_auto_test:
+	export LD_LIBRARY_PATH=$(CURDIR)/lib
+	cd tests/auto/unit/ && ( test -e Makefile || qmake unit.pro -o Makefile ) && make -f Makefile check
+

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


[Merge] lp:~allanlesage/kubuntu-packaging/qtjsbackend-enable-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtjsbackend-opensource-src

2014-01-08 Thread Allan LeSage
Allan LeSage has proposed merging 
lp:~allanlesage/kubuntu-packaging/qtjsbackend-enable-tests into 
lp:~kubuntu-packagers/kubuntu-packaging/qtjsbackend-opensource-src.

Requested reviews:
  Timo Jyrinki (timo-jyrinki)

For more details, see:
https://code.launchpad.net/~allanlesage/kubuntu-packaging/qtjsbackend-enable-tests/+merge/200272

This is the absolute minimum to run make check under debian build--much more is 
necessary to wrangle this project into full debian-test-coverage mode :) , 
however the code-generation phase and the pending gypsy/SCons transition may 
delay this?  Regardless this passes the small set of core tests under pdebuild. 
 We'd like to return and to complete during this cycle. . . .
-- 
https://code.launchpad.net/~allanlesage/kubuntu-packaging/qtjsbackend-enable-tests/+merge/200272
Your team Kubuntu Packagers is subscribed to branch 
lp:~kubuntu-packagers/kubuntu-packaging/qtjsbackend-opensource-src.
=== modified file 'debian/rules'
--- debian/rules	2013-08-30 06:29:09 +
+++ debian/rules	2014-01-02 05:04:33 +
@@ -22,6 +22,10 @@
 	# Remove libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
+override_dh_auto_test:
+	export LD_LIBRARY_PATH=$(CURDIR)/lib
+	cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && make -f Makefile check
+
 override_dh_install:
 	dh_install --fail-missing
 

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [Merge] lp:~chris.gagnon/kubuntu-packaging/enable-unit-tests-qtbase-opensource-src into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

2014-01-08 Thread Chris Gagnon
I had to add /tests/auto/network/access/qnetworkreply/resource and .rfc files 
for test to work, these were removed from debian because they don't allow 
modification of the text, but does allow redistribution as long as it's 
un-modified.  This violates DFSG https://wiki.debian.org/NonFreeIETFDocuments, 
so we can't merge these changes back in to Debian.

The the enable-tests.patch is in the ubuntu specific portion of 
debian/patches/series
-- 
https://code.launchpad.net/~chris.gagnon/kubuntu-packaging/enable-unit-tests-qtbase-opensource-src/+merge/200535
Your team Kubuntu Packagers is requested to review the proposed merge of 
lp:~chris.gagnon/kubuntu-packaging/enable-unit-tests-qtbase-opensource-src into 
lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Call for testing logind suspend/resume/hibernate support in Kubuntu

2014-01-08 Thread Rohan Garg
Hi everyone
With the upload of kde-workspace 4:4.11.4-0ubuntu3 to Trusty, Kubuntu will now 
support suspending/resuming/hibernating via the logind API's provided by 
upstart.

Please check if this functionality works for you since I intend to drop pm-
suspend from the ISO later this week.

In order to test :

## Fully upgrade the system
sudo apt-get update && sudo apt-get dist-upgrade

## Make sure you have kde-workspace 4:4.11.4-0ubuntu3 or above
apt-cache policy kde-workspace

## Remove pm-suspend
sudo apt-get purge pm-suspend

Then suspend/hibernate via your preferred method ( either shutting the lid of 
your device or via kickoff )

If suspending does not work, please file bug reports against the kde-workspace 
package here [1] with the tag 'kubuntu'

Cheers
Rohan Garg

[1] https://bugs.launchpad.net/ubuntu/+source/kde-workspace/+filebug

signature.asc
Description: This is a digitally signed message part.
-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Trusty ISO Content Review #1

2014-01-08 Thread Harald Sitter
https://trello.com/c/LLGQ1Kbs

There is heaps of possible space usage optimization [1]; most require
additional investigation though.

Gravest pointlessness right now is ubuntu-drivers-common recommending
bits of software that pull in aptdaemon along with aptdaemon based
compatibility library magic. Most useless on Kubuntu and I hope Rohan
will deal with that in due time since he is working on an
ubuntu-drivers GUI.

Other than that we have some pointless l10n, some unmaintained
software and some stuff that has questionable use to the target
audience.

Generally speaking it probably would be good if everyone simply went
and tested the trusty daily image and checked systemsettings and
kickoff for either confusing or useless content. For example we have a
KCM for zeroconf/ddnsd but unless you know what it does, and how to
use it, and why you would want to use it, you'll not get the slightest
idea from the KCM itself.

[1] 
https://docs.google.com/spreadsheet/pub?key=0AiHh-WCutt3jdEotb2RFaWh1dl9YbFdhdGUwQkgyNWc&output=html

HS

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [kubuntu-devel] Muon Discover

2014-01-08 Thread Aleix Pol
On Wed, Jan 8, 2014 at 1:03 PM, Jonathan Riddell  wrote:

> On Tue, Jan 07, 2014 at 02:25:27PM -0800, Scarlett Clark wrote:
> >Is this the default package manager? Or Muon?
> >
> >I need all ways to bring this up eg.. command line. I have so far in a
> >search from KickOff and KickOff->Programs->Muon Discover
>
> We have both Muon and Muon Discover installed by default.  Arguably this
> is application duplication and very un-ubuntu.
>
> Does anyone have an opinion of whether Muon Discover is mature enough to
> stand along and for Muon to be removed from the images?
>
> You can access it by KickOff -> Computer -> Software Centre too which I'd
> expect to be the primary method.
>
> Jonathan
>
> --
> kubuntu-devel mailing list
> kubuntu-devel@lists.ubuntu.com
> Modify settings or unsubscribe at:
> https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
>

I would say that the decision is not really about maturity but about user
target. I don't think an end-user should understand all the semantics that
Muon Package Manager exposes. If a user has the knowledge to use Muon PM he
has the knowledge to install it from Discover or even apt-get.

Aleix
-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [kubuntu-devel] Trusty L10n Report #1

2014-01-08 Thread Jonathan Riddell
On Wed, Jan 08, 2014 at 10:16:33AM +0100, Harald Sitter wrote:
> * Documentation has no localization. I do really really hope there is
> a solid plan for that by now. This is the only l10n issue that
> actually can have sizable negative impact on someone's experience of
> the product.

Aaron how is the move to kde wiki getting on?

Myriam any pointers on how Amarok then does the translations and export?

> * We continue to be plagued by kubuntu specific translations not
> getting from launchpad into a language pack.
> * Muon/QApt still has long-standing issues that were forgotten in the
> last batch of i18n fixes.
> * Minor issues with usermanger, lightdm, ubiquity.
> 
> Bugs to be filed, people to be poked, so much work :'<

Ah but we love you for it.

Jonathan


-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: [kubuntu-devel] Muon Discover

2014-01-08 Thread Jonathan Riddell
On Tue, Jan 07, 2014 at 02:25:27PM -0800, Scarlett Clark wrote:
>Is this the default package manager? Or Muon?
> 
>I need all ways to bring this up eg.. command line. I have so far in a
>search from KickOff and KickOff->Programs->Muon Discover

We have both Muon and Muon Discover installed by default.  Arguably this is 
application duplication and very un-ubuntu.  

Does anyone have an opinion of whether Muon Discover is mature enough to stand 
along and for Muon to be removed from the images?

You can access it by KickOff -> Computer -> Software Centre too which I'd 
expect to be the primary method.

Jonathan

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Re: Muon Discover

2014-01-08 Thread Ovidiu-Florin Bogdan
muon - brings up a package manager
muon-discover - brings up the application manager (prettyer interface)
muon-updater - prings up the update manager.

The default package manager is apt. For gui, you can use righter Muon Package 
Manager (muon) or Qapt. Depending on what you are doing.

*Ovidiu-Florin Bogdan*
GeekAliens.com[1] 
Kubuntu România[2] 




[1] http://geekaliens.com
[2] http://ro.kubuntu.org
-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel


Trusty L10n Report #1

2014-01-08 Thread Harald Sitter
https://trello.com/c/v4o3CQ1O

Present localization of trusty is not bad, it still has problems
though, all in all a french installation offers proper localization
from a usage POV (e.g. muon categories now speak french). More
advanced features have some problems.

A complete issue list is available on the trello card. Bug reports and
fixes should be noted there as well with the ultimate target that the
issue list for review#2 is shorter or non-existent.

* Documentation has no localization. I do really really hope there is
a solid plan for that by now. This is the only l10n issue that
actually can have sizable negative impact on someone's experience of
the product.
* We continue to be plagued by kubuntu specific translations not
getting from launchpad into a language pack.
* Muon/QApt still has long-standing issues that were forgotten in the
last batch of i18n fixes.
* Minor issues with usermanger, lightdm, ubiquity.

Bugs to be filed, people to be poked, so much work :'<

HS

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel