Merge lp:~robru/sni-qt/inline-packaging into lp:~canonical-dx-team/sni-qt/trunk

[Robert Bruce Park]

[Didier Roche (didrocks)]

Looking good, building and merging, thanks! :)

However, do you think more tests can be run, like installing xvfb and running under them? Otherwise, can we ship the integration tests in a separate package (built) so that we can run them automatically on a daily basis?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:98
http://s-jenkins:8080/job/sni-qt-ci/1/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/sni-qt-ci/./build=pbuilder,distribution=raring,flavor=amd64/1/console
    SUCCESS: http://s-jenkins:8080/job/sni-qt-ci/./build=pbuilder,distribution=raring,flavor=i386/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/sni-qt-ci/1//rebuild/?

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

I have no idea about any of the details of this test suite for this package, Didier... I am just following the checklist for each package like a robot ;-)

[Didier Roche (didrocks)]

I think you will need to wear your inspector hat then, and investigate (magnifying glass is not mandatory ;)). I can help you next week if needed on how to look at it :)

[Michael Terry (mterry)]

I looked at this, and made a changes to run all tests under xvfb: https://code.launchpad.net/~mterry/sni-qt/inline2/+merge/136243

[Didier Roche (didrocks)]

Reject this branch as the superseeding mterry's branch is approved.

Unmerged revisions

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2012-11-22 19:48:20 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2012-11-22 19:48:20 +0000
@@ -0,0 +1,98 @@
+sni-qt (0.2.7-0ubuntu1) raring; urgency=low
+
+  * Inline packaging metadata.
+
+ -- Robert Bruce Park <[e-mail]>  Thu, 22 Nov 2012 13:37:45 -0600
+
+sni-qt (0.2.6-0ubuntu1) quantal; urgency=low
+
+  * New upstream release (lp: #1020419).
+  * debian/patches/do-not-delete-cwd-if-tmp-dir-is-not-writable.diff,
+    debian/patches/do-not-eat-cpu-with-animated-icons.diff:
+    - dropped, the patches are in the new version
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 31 Jul 2012 13:19:47 +0200
+
+sni-qt (0.2.5-0ubuntu3) oneiric-proposed; urgency=low
+
+  * Backport r88.1.4 from upstream trunk: avoid causing unity-panel-service to
+    eat all CPU when an application uses an animated icon (LP: #865601)
+
+ -- Aurélien Gâteau <[e-mail]>  Tue, 25 Oct 2011 15:52:35 -0400
+
+sni-qt (0.2.5-0ubuntu2) oneiric-proposed; urgency=high
+
+  * Backport r91 from upstream trunk: prevent deletion of cwd if tmp dir is not
+    writable (LP: #874447)
+
+ -- Aurélien Gâteau <[e-mail]>  Sat, 15 Oct 2011 16:08:57 +0200
+
+sni-qt (0.2.5-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+    - Prefix log output with pid of application.
+    - Use a placeholder menu if there is none defined yet (LP: #860395)
+
+ -- Didier Roche <[e-mail]>  Wed, 28 Sep 2011 12:24:50 +0200
+
+sni-qt (0.2.4-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+    - Make sure GTK notices icon updates (LP: #812884).
+    - Prevent applications from stealing icons from each others (LP: #850139)
+    - Turn debug into a runtime option.
+
+ -- Didier Roche <[e-mail]>  Mon, 26 Sep 2011 11:17:11 +0200
+
+sni-qt (0.2.2-0ubuntu3) oneiric; urgency=low
+
+  * Multi-Arch support (LP: #838470).
+  * Update Vcs-Bzr url.
+
+ -- Aurélien Gâteau <[e-mail]>  Wed, 07 Sep 2011 18:53:05 +0200
+
+sni-qt (0.2.2-0ubuntu2) oneiric; urgency=low
+
+  * debian/sni-qt.conf:
+    - add clementine and speedcrunch whitelist for activate entry (LP: #842752)
+  * debian/rules:
+    - remove the verbose mode, sni-qt seems to work quite well :)
+
+ -- Didier Roche <[e-mail]>  Tue, 06 Sep 2011 18:03:18 +0200
+
+sni-qt (0.2.2-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release:
+    - Add the ability to show an Activate entry to the menu if the app does not
+      provide it.
+    - Survive a restart of the StatusNotifierWatcher process.
+    - Build with -fvisibility=hidden and move all classes into a SniQt
+      namespace to reduce risks of symbol clashes.
+    - Rename _qt_sni_category to _sni_qt_category.
+    - Touch the icon theme dir, so that GTK looks into it and find new icons.
+    - Add build-time option to enable debug output
+    - Document the _qt_sni_property hack
+  * Cherry-pick some upstream commits to get a better localtion of sni-qt.conf
+    file and translation fixes when the Qt app doesn't load it properly
+  * debian/rules:
+    - Add -DSNI_DEBUG_OUTPUT to get some debug info
+  * debian/sni-qt.conf, debian/sni-qt.install:
+    - List Mumble and skype as candidate for "activate" entry menu
+
+ -- Didier Roche <[e-mail]>  Thu, 04 Aug 2011 14:56:54 +0200
+
+sni-qt (0.2.0-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+  * debian/copyright:
+    - add the BSD notice for new example files
+  * debian/rules:
+    - auto tests changed their location
+
+ -- Didier Roche <[e-mail]>  Thu, 07 Jul 2011 18:10:35 +0200
+
+sni-qt (0.1.5-0ubuntu1) oneiric; urgency=low
+
+  * Initial package
+
+ -- Didier Roche <[e-mail]>  Fri, 01 Jul 2011 16:56:24 +0200

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2012-11-22 19:48:20 +0000
@@ -0,0 +1,1 @@
+9

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2012-11-22 19:48:20 +0000
@@ -0,0 +1,24 @@
+Source: sni-qt
+Section: x11
+Priority: optional
+Maintainer: Kubuntu Developers <[e-mail]>
+Build-Depends: cmake,
+               debhelper (>= 9),
+               libdbusmenu-qt-dev,
+               libqt4-dev,
+               pkg-config,
+               qt4-qmake,
+Standards-Version: 3.9.2
+Homepage: https://launchpad.net/sni-qt
+# If you aren't a member of ~canonical-dx-team but need to upload packaging changes,
+# just go ahead.  ~canonical-dx-team will notice and sync up the code again.
+Vcs-Bzr: https://code.launchpad.net/~canonical-dx-team/sni-qt/trunk
+
+Package: sni-qt
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libqtcore4 (>= 4:4.7.3-1ubuntu3~), ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
+Description: indicator support for Qt
+ This plugin provides indicator support for Qt.  It allows applications
+ to export their systray transparently to the indicator system.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2012-11-22 19:48:20 +0000
@@ -0,0 +1,67 @@
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: sni-qt
+Upstream-Contact: Aurelien Gateau <[e-mail]>
+Source: https://launchpad.net/sni-qt/+download
+
+File: *
+Copyright: 2011 Canonical Ltd
+License: LGPL-3
+ sni-qt is free software; you can redistribute it and/or modify it under the
+ terms of the GNU Lesser General Public License (LGPL) as published by the
+ Free Software Foundation; version 3 of the License.
+ .
+ sni-qt is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ more details.
+ .
+ On Debian/Ubuntu systems, the full text of the LGPL v3 can be found in
+ `/usr/share/common-licenses/LGPL-3'
+
+File: src/private/qabstractsystemtrayiconsys_p.h
+Copyright: 2011 Nokia Corporation and/or its subsidiary(-ies)
+License: LGPL-2.1 (with additional exception)
+ This file may be used under the terms of the GNU Lesser General Public
+ License version 2.1 as published by the Free Software Foundation and
+ appearing in the file LICENSE.LGPL included in the packaging of this
+ file. Please review the following information to ensure the GNU Lesser
+ General Public License version 2.1 requirements will be met:
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ .
+ In addition, as a special exception, Nokia gives you certain additional
+ rights. These rights are described in the Nokia Qt LGPL Exception
+ version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+ .
+ On Debian/Ubuntu systems, the full text of the LGPL v2.1 can be found in
+ `/usr/share/common-licenses/LGPL-2.1'
+
+Files: added tests/manual/*
+Copyright: 2011 Nokia Corporation and/or its subsidiary(-ies)
+License: BSD
+ You may use this file under the terms of the BSD license as follows:
+ .
+ "Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+     the names of its contributors may be used to endorse or promote
+     products derived from this software without specific prior written
+     permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2012-11-22 19:48:20 +0000
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
+
+%:
+	dh $@
+
+override_dh_auto_test:
+	# Only one test doesn't need a X display
+	obj-$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)/tests/auto/fsutilstest
+
+override_dh_makeshlibs:
+	dh_makeshlibs -Nsni-qt
+
+override_dh_install:
+	dh_install --fail-missing

=== added file 'debian/sni-qt.conf'
--- debian/sni-qt.conf	1970-01-01 00:00:00 +0000
+++ debian/sni-qt.conf	2012-11-22 19:48:20 +0000
@@ -0,0 +1,5 @@
+[need-activate-action]
+clementine=1
+mumble=1
+skype=1
+speedcrunch=1

=== added file 'debian/sni-qt.install'
--- debian/sni-qt.install	1970-01-01 00:00:00 +0000
+++ debian/sni-qt.install	2012-11-22 19:48:20 +0000
@@ -0,0 +1,1 @@
+debian/sni-qt.conf /etc/xdg/