--- url-dispatcher-0.1+17.04.20170328.orig/CMakeLists.txt +++ url-dispatcher-0.1+17.04.20170328/CMakeLists.txt @@ -72,9 +72,6 @@ pkg_check_modules(SQLITE REQUIRED sqlite3) include_directories(${SQLITE_INCLUDE_DIRS}) -pkg_check_modules(SCOPES REQUIRED libunity-scopes) -include_directories(${SCOPES_INCLUDE_DIRS}) - pkg_check_modules(APPARMOR REQUIRED libapparmor) include_directories(${APPARMOR_INCLUDE_DIRS}) --- url-dispatcher-0.1+17.04.20170328.orig/data/bad-url.qml +++ url-dispatcher-0.1+17.04.20170328/data/bad-url.qml @@ -14,29 +14,13 @@ * along with this program. If not, see . */ -import QtQuick 2.0 -import Ubuntu.Components 1.0 -import Ubuntu.Components.Popups 1.0 +import QtQuick 2.2 +import QtQuick.Dialogs 1.1 -MainView { - applicationName: "com.canonical.url-dispatcher.bad-url-prompt" - automaticOrientation: true - backgroundColor: "transparent" - anchors.fill: parent - - Component { - id: dialog - Dialog { - title: i18n.tr("Unrecognized Address") - text: i18n.tr("Ubuntu can't open addresses of type “%1”.").arg(Qt.application.arguments[2].split(':')[0]) - - Button { - text: i18n.tr("OK") - color: UbuntuColors.orange - onClicked: Qt.quit() - } - } - } - - Component.onCompleted: PopupUtils.open(dialog) +MessageDialog { + id: dialog + title: qsTr("Unrecognized Address") + text: qsTr("Ubuntu can't open addresses of type “%1”.").arg(Qt.application.arguments[2].split(':')[0]) + onAccepted: Qt.quit() + Component.onCompleted: visible = true } --- url-dispatcher-0.1+17.04.20170328.orig/debian/apparmor/url-dispatcher-bad-url-helper +++ url-dispatcher-0.1+17.04.20170328/debian/apparmor/url-dispatcher-bad-url-helper @@ -0,0 +1,15 @@ +# vim:syntax=apparmor +#include + +# Mostly unconfined. Don't allow capability or any mount rules. Also ensure that +# exec inherits from this profile +profile url-dispatcher-bad-url-helper (attach_disconnected) { + network, + / rwkl, + /** rwlkm, + /** pix, + dbus, + signal, + ptrace, + unix, +} --- url-dispatcher-0.1+17.04.20170328.orig/debian/changelog +++ url-dispatcher-0.1+17.04.20170328/debian/changelog @@ -0,0 +1,387 @@ +url-dispatcher (0.1+17.04.20170328-0ubuntu4) bionic; urgency=medium + + * Drop unity-scopes-api. + + -- Dimitri John Ledkov Tue, 06 Mar 2018 15:44:41 +0100 + +url-dispatcher (0.1+17.04.20170328-0ubuntu3) artful; urgency=medium + + * Drop ubuntu-ui-toolkit for now, patch from mitya57 LP: #1711204 + + -- Dimitri John Ledkov Thu, 24 Aug 2017 20:01:44 +0100 + +url-dispatcher (0.1+17.04.20170328-0ubuntu2) zesty; urgency=medium + + * No-change rebuild (LP: #1681870). + + -- Łukasz 'sil2100' Zemczak Tue, 11 Apr 2017 17:34:10 +0100 + +url-dispatcher (0.1+17.04.20170328-0ubuntu1) zesty; urgency=medium + + * Fix deprecation warning in mir mock. + * The unity8-dash interface is actually com.canonical.UnityDash. + * Use libwhoopsie for reporting recoverable problems. + * Convert service main process and url-dispatcher tool code to C++. + + -- Rodney Dawes Tue, 28 Mar 2017 18:29:07 +0000 + +url-dispatcher (0.1+17.04.20170318-0ubuntu1) zesty; urgency=medium + + * Update bad-url exec tool to UAL C++ interface + * Remove Upstart from the test suite and replace it with systemd + + -- Ted Gould Sat, 18 Mar 2017 19:59:26 +0000 + +url-dispatcher (0.1+17.04.20170314-0ubuntu1) zesty; urgency=medium + + [ Charles Kerr ] + * Honor XDG_CACHE_HOME in url-dispatcher-dump and url-dispatcher.conf + + [ Rodney Dawes ] + * Remove click usage and support. + * Use gmock module from cmake-extras. + * Use the coverage support from cmake-extras. + * Use cmake-extras intltool support. + * Use gdbus integration from cmake-extras. + * Remove unused gsettings cmake module. + + -- Rodney Dawes Tue, 14 Mar 2017 14:35:03 +0000 + +url-dispatcher (0.1+17.04.20170308.1-0ubuntu1) zesty; urgency=medium + + * Don't use upstart to get unity8 pid. + + -- Rodney Dawes Wed, 08 Mar 2017 20:43:30 +0000 + +url-dispatcher (0.1+17.04.20170227.2-0ubuntu1) zesty; urgency=medium + + [ Ken VanDine ] + * Handle UAL API bump + + [ Rodney Dawes ] + * Remove tests that depend on libertine, as url-dispatcher has no + support for handlers in libertine anyway. + + -- Rodney Dawes Mon, 27 Feb 2017 19:07:50 +0000 + +url-dispatcher (0.1+17.04.20161206-0ubuntu1) zesty; urgency=medium + + [ Ted Gould ] + * Instead of sleeping make the refresh tasks low enough priority they + don't get in the way (LP: #1645793) + * Start after Unity8 so it has a chance to set the MIR_SOCKET + + -- Michael Terry Tue, 06 Dec 2016 14:38:17 +0000 + +url-dispatcher (0.1+17.04.20161108-0ubuntu1) zesty; urgency=medium + + * Support running inside a snap. + + -- Michael Terry Tue, 08 Nov 2016 22:16:56 +0000 + +url-dispatcher (0.1+17.04.20161107-0ubuntu1) zesty; urgency=medium + + [ Florian Boucault ] + * Crossbuilding Fixes + + [ Larry Price ] + * App ID should allow package names with dots. (LP: #1591342) (LP: #1606498) + + [ Ted Gould ] + * Check versions of appid:// urls to reduce the number of invalid appids + we send to UAL (LP: #1352656) + * Scope testing for the scope:// URL and overlays that should be over + the dash + * Protect the dash from getting NULL urls (LP: #1476257) + * Make sure URL Overlays are shutdown on exit + * Remove the wildcard that is confusing the update script (LP: #1461496) + * Not using a message that isn't set properly (LP: #1608009) + * Fixing tests to adjust for UAL changes + * Add a small GUI helper tool for testing + * Show error dialog over apps that use Bad URLs (LP: #1370008) + + -- Ted Gould Mon, 07 Nov 2016 16:33:15 +0000 + +url-dispatcher (0.1+16.10.20160816.1-0ubuntu1) yakkety; urgency=medium + + * No chnage rebuild for UAL migration + + -- Ted Gould Tue, 16 Aug 2016 15:20:27 +0000 + +url-dispatcher (0.1+16.04.20151110-0ubuntu2) xenial; urgency=high + + * No change rebuild for s390x. + + -- Dimitri John Ledkov Fri, 11 Dec 2015 01:30:51 +0000 + +url-dispatcher (0.1+16.04.20151110-0ubuntu1) xenial; urgency=medium + + [ CI Train Bot ] + * New rebuild forced. + + [ Ted Gould ] + * Remove the cache if the service fails to start. Fail to start if we + can't create the database. (LP: #1483854) + + -- Bill Filler Tue, 10 Nov 2015 14:37:07 +0000 + +url-dispatcher (0.1+15.10.20150717-0ubuntu1) wily; urgency=medium + + [ Andreas Pokorny ] + * unchagned for mir release 0.14.0 + + -- CI Train Bot Fri, 17 Jul 2015 12:37:44 +0000 + +url-dispatcher (0.1+15.10.20150612-0ubuntu1) wily; urgency=medium + + [ Ted Gould ] + * Add upstart build dep for tests on Wily + * Provide a small tool to dump the URL DB in a readable form + * Support URL Overlays of content in a trusted session without a + desktop file + + -- CI Train Bot Fri, 12 Jun 2015 16:00:40 +0000 + +url-dispatcher (0.1+15.04.20150123-0ubuntu1) vivid; urgency=low + + [ Ted Gould ] + * Special handling for intent URLs (LP: #1407709) + + -- Ubuntu daily release Fri, 23 Jan 2015 15:19:33 +0000 + +url-dispatcher (0.1+15.04.20141211-0ubuntu1) vivid; urgency=low + + [ Ted Gould ] + * Fix domain handling in generic regular expression (LP: #1401612) + + -- Ubuntu daily release Thu, 11 Dec 2014 19:43:40 +0000 + +url-dispatcher (0.1+15.04.20141031-0ubuntu1) vivid; urgency=low + + [ Ted Gould ] + * Making generic regular expression more robust (LP: #1351222) + + [ Jussi Pakkanen ] + * General cleanups + * Do a rollback when update operations fail so there are no dangling + transactions. + * Ensure that tables always exist. + + -- Ubuntu daily release Fri, 31 Oct 2014 15:51:36 +0000 + +url-dispatcher (0.1+14.10.20140925-0ubuntu1) utopic; urgency=low + + [ Ted Gould ] + * Drop file based URLs for Music and Video (LP: #1340952) + * Update tests to work with new UAL requirements (LP: #1370735) + + -- Ubuntu daily release Thu, 25 Sep 2014 13:29:40 +0000 + +url-dispatcher (0.1+14.10.20140905.1-0ubuntu1) utopic; urgency=low + + [ Ted Gould ] + * Throw a bad_url on the appid 'unconfined' + + -- Ubuntu daily release Fri, 05 Sep 2014 03:40:44 +0000 + +url-dispatcher (0.1+14.10.20140827-0ubuntu1) utopic; urgency=low + + [ Ted Gould ] + * Split update jobs into independent jobs + * Support for unity8-dash URLs even though it's not an application + (LP: #1361349) + + -- Ubuntu daily release Wed, 27 Aug 2014 02:10:21 +0000 + +url-dispatcher (0.1+14.10.20140819.1-0ubuntu1) utopic; urgency=low + + [ Ted Gould ] + * Ensure send works even without a mainloop (LP: #1356077) + * Test replacing a timestamp + + -- Ubuntu daily release Tue, 19 Aug 2014 21:01:10 +0000 + +url-dispatcher (0.1+14.10.20140724-0ubuntu1) utopic; urgency=low + + [ Ubuntu daily release ] + * debian/liburl-dispatcher1.symbols: auto-update to released version + + [ Ted Gould ] + * Make the database handle multiple writers more robustly + * Add a TestURL function to determine which AppID will be used for a + given URL + + [ Leo Arias ] + * Add url-dispatcher-testability binary package. + + [ Brendan Donegan ] + * Add url-dispatcher-testability binary package. + + -- Ubuntu daily release Thu, 24 Jul 2014 17:10:14 +0000 + +url-dispatcher (0.1+14.10.20140619-0ubuntu1) utopic; urgency=low + + [ Ted Gould ] + * Improving error messages and collecting more data + + -- Ubuntu daily release Thu, 19 Jun 2014 02:43:30 +0000 + +url-dispatcher (0.1+14.10.20140604-0ubuntu1) utopic; urgency=low + + [ Ted Gould ] + * Merge and review policies + * Recoverable errors on DB errors on update + + -- Ubuntu daily release Wed, 04 Jun 2014 19:07:02 +0000 + +url-dispatcher (0.1+14.10.20140601-0ubuntu1) utopic; urgency=low + + [ Ted Gould ] + * Changing to Ubuntu App Launch + + -- Ubuntu daily release Sun, 01 Jun 2014 20:53:35 +0000 + +url-dispatcher (0.1+14.04.20140403-0ubuntu1) trusty; urgency=low + + [ Ted Gould ] + * Fix cache directory permissions if they got messed up (LP: #1290997) + + -- Ubuntu daily release Thu, 03 Apr 2014 21:17:00 +0000 + +url-dispatcher (0.1+14.04.20140331.1-0ubuntu1) trusty; urgency=low + + [ Ted Gould ] + * Make it so that URLs can be installed with configuration files. + * Switch to using libupstart-app-launch for discovering AppIDs + * Migrate test suite to use libclick based libual + + -- Ubuntu daily release Mon, 31 Mar 2014 17:18:43 +0000 + +url-dispatcher (0.1+14.04.20140217.1-0ubuntu1) trusty; urgency=low + + [ Ted Gould ] + * Add tests for the library and service as a binary. + * Upgrading to libupstart-app-launch v2. + * Flushing trunk with a release + * Update Upstart mock for the new UAL + + -- Ubuntu daily release Mon, 17 Feb 2014 17:58:44 +0000 + +url-dispatcher (0.1+14.04.20131209.1-0ubuntu2) trusty; urgency=low + + * Restrict on which arch we build url-dispatcher due to the ust build-dep + + -- Didier Roche Mon, 09 Dec 2013 13:41:41 +0100 + +url-dispatcher (0.1+14.04.20131209.1-0ubuntu1) trusty; urgency=low + + * Cherry-pick libupstart-app-launch API/ABI bump from trunk + + -- Łukasz 'sil2100' Zemczak Fri, 06 Dec 2013 14:32:26 +0100 + +url-dispatcher (0.1+13.10.20131014.2-0ubuntu1) saucy; urgency=low + + [ Michal Hruby ] + * Revert the definition change for mediaplayer, it'll remain a non- + click app for now. + + [ Ted Gould ] + * Adds the appid:// URL format. + * Use 'click info' to get the manifest. (LP: #1232118) + * Allow custom URIs to have variable based package specifications. + * Switching many core apps to Click App ID's. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 38 + + -- Ubuntu daily release Mon, 14 Oct 2013 18:07:27 +0000 + +url-dispatcher (0.1+13.10.20131003-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * Enfoce the ///. (LP: #1231444) + * Make dispatcher more testable and add some application:/// tests. + * Adding a calendar URL. (LP: #1231136) + * Adding the alarm URL pattern. (LP: #1233176) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 32 + + -- Ubuntu daily release Thu, 03 Oct 2013 02:08:19 +0000 + +url-dispatcher (0.1+13.10.20130924.1-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * Report a recoverable problem on Bad URLs. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 27 + + -- Ubuntu daily release Tue, 24 Sep 2013 06:09:10 +0000 + +url-dispatcher (0.1+13.10.20130919.3-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * Fix the name of the dialer-app. + * Fix the URI environment variable by properly using libupstart-app- + launch. + * Add URLs for PIM apps. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 25 + + -- Ubuntu daily release Thu, 19 Sep 2013 14:05:04 +0000 + +url-dispatcher (0.1+13.10.20130917.1-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * Call webbrowser for http/https URLs. + * Switch the library relationship to the service to a Suggests. + * URLs for music and video application launching. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 21 + + -- Ubuntu daily release Tue, 17 Sep 2013 22:11:05 +0000 + +url-dispatcher (0.1+13.10.20130823-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * Adding a URL format for system settings. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 17 + + -- Ubuntu daily release Fri, 23 Aug 2013 02:06:01 +0000 + +url-dispatcher (0.1+13.10.20130726-0ubuntu1) saucy; urgency=low + + [ Łukasz 'sil2100' Zemczak ] + * Add symbols file, modify the package's short descriptions. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 15 + + -- Ubuntu daily release Fri, 26 Jul 2013 00:02:46 +0000 + +url-dispatcher (0.1+13.10.20130725.1-0ubuntu1) saucy; urgency=low + + [ Łukasz 'sil2100' Zemczak ] + * Remove debian/watch + * debian/control: + - Modifications related to compliance with our packaging standards + * Add copyright info to the source code + * Automatic snapshot from revision 11 (bootstrap) + * Additional packaging changes, since some things got missed last + time. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 13 + + -- Ubuntu daily release Thu, 25 Jul 2013 07:52:47 +0000 + +url-dispatcher (0.1-0ubuntu1) saucy; urgency=low + + * Start + + -- Ted Gould Thu, 27 Jun 2013 11:36:18 -0500 --- url-dispatcher-0.1+17.04.20170328.orig/debian/compat +++ url-dispatcher-0.1+17.04.20170328/debian/compat @@ -0,0 +1 @@ +9 --- url-dispatcher-0.1+17.04.20170328.orig/debian/control +++ url-dispatcher-0.1+17.04.20170328/debian/control @@ -0,0 +1,120 @@ +Source: url-dispatcher +Section: gnome +Priority: optional +Maintainer: Ubuntu Developers +Build-Depends: cmake, + cmake-extras (>= 1.2), + dbus-test-runner, + debhelper (>= 9), + dh-autoreconf, + dh-apparmor, + dh-translations, + gcovr, + googletest | google-mock, + intltool, + lcov, + libapparmor-dev, + libdbus-1-dev, + libdbustest1-dev (>= 14.04.0), + libglib2.0-dev, + libjson-glib-dev, + libsqlite3-dev, + libubuntu-app-launch3-dev (>= 0.11), + libwhoopsie-dev (>= 0.2.52), + python3:any, + python3-dbusmock , + python3-fixtures , + python3-nose , + python3-testtools , + sqlite3, +Standards-Version: 3.9.4 +Homepage: http://launchpad.net/url-dispatcher +X-Ubuntu-Use-Langpack: yes +# If you aren't a member of ~indicator-applet-developers but need to upload +# packaging changes, just go ahead. ~indicator-applet-developers will notice +# and sync up the code again. +Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/url-dispatcher/trunk.13.10 +Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/url-dispatcher/trunk.13.10/files + +Package: url-dispatcher +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends}, +Depends: ${misc:Depends}, + ${shlibs:Depends}, +# For the bad URL dialog + qtchooser, + qml-module-qtquick-dialogs, +Description: service to allow sending of URLs and get handlers started + Allows applications to request a URL to be opened and handled by another + process without seeing the list of other applications on the system or + starting them inside its own Application Confinement. + . + This package provides a service for the URL Dispatcher + +Package: url-dispatcher-tools +Architecture: any +Depends: url-dispatcher (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Description: tools for working with the URL Dispatcher. + Allows applications to request a URL to be opened and handled by another + process without seeing the list of other applications on the system or + starting them inside its own Application Confinement. + . + This package provides tools for working with the URL Dispatcher. + +Package: url-dispatcher-tools-gui +Architecture: any +Depends: url-dispatcher (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, + qtchooser, + qml-module-qtquick-controls, + qml-module-qtquick-layouts, + qml-module-qtquick-window2, +Description: GUI tools for working with the URL Dispatcher. + Allows applications to request a URL to be opened and handled by another + process without seeing the list of other applications on the system or + starting them inside its own Application Confinement. + . + This package provides GUI tools for working with the URL Dispatcher. + +Package: liburl-dispatcher1 +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends}, +Depends: ${misc:Depends}, + ${shlibs:Depends}, +Suggests: url-dispatcher (= ${binary:Version}), +Description: library for sending requests to the url dispatcher + Allows applications to request a URL to be opened and handled by another + process without seeing the list of other applications on the system or + starting them inside its own Application Confinement. + . + This package contains shared libraries to be used by applications. + +Package: liburl-dispatcher1-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends}, +Depends: libglib2.0-dev, + liburl-dispatcher1 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Description: developer files for sending requests to the url dispatcher + Allows applications to request a URL to be opened and handled by another + process without seeing the list of other applications on the system or + starting them inside its own Application Confinement. + . + This package contains files that are needed to build applications. + +Package: url-dispatcher-testability +Architecture: all +Depends: ${misc:Depends}, + ${python3:Depends}, + python3-dbusmock, + python3-dbus, +Description: A fake URL dispatcher for use in testing. --- url-dispatcher-0.1+17.04.20170328.orig/debian/copyright +++ url-dispatcher-0.1+17.04.20170328/debian/copyright @@ -0,0 +1,25 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: URL Dispatcher +Source: http://launchpad.net/url-dispatcher + +Files: * +Copyright: 2013 Canonical, Ltd. +License: LGPL-3 + +License: LGPL-3 + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; version 3 of + the License. + . + This package 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. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU Lesser General + Public License can be found in "/usr/share/common-licenses/LGPL-3". + --- url-dispatcher-0.1+17.04.20170328.orig/debian/liburl-dispatcher1-dev.install +++ url-dispatcher-0.1+17.04.20170328/debian/liburl-dispatcher1-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/include/liburl-dispatcher-1/* +debian/tmp/usr/lib/*/liburl-dispatcher.so +debian/tmp/usr/lib/*/pkgconfig/url-dispatcher-1.pc --- url-dispatcher-0.1+17.04.20170328.orig/debian/liburl-dispatcher1.install +++ url-dispatcher-0.1+17.04.20170328/debian/liburl-dispatcher1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/*/liburl-dispatcher.so.1* --- url-dispatcher-0.1+17.04.20170328.orig/debian/liburl-dispatcher1.symbols +++ url-dispatcher-0.1+17.04.20170328/debian/liburl-dispatcher1.symbols @@ -0,0 +1,4 @@ +liburl-dispatcher.so.1 liburl-dispatcher1 #MINVER# + url_dispatch_send@Base 0.1 + url_dispatch_send_restricted@Base 0.1+14.10.20140724 + url_dispatch_url_appid@Base 0.1+14.10.20140724 --- url-dispatcher-0.1+17.04.20170328.orig/debian/rules +++ url-dispatcher-0.1+17.04.20170328/debian/rules @@ -0,0 +1,19 @@ +#!/usr/bin/make -f + +export DPKG_GENSYMBOLS_CHECK_LEVEL = 4 +export G_MESSAGES_DEBUG=all +export URL_DISPATCHER_DISABLE_RECOVERABLE_ERROR=1 +ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) +export DEB_BUILD_PROFILES := cross +endif + +%: + dh $@ --fail-missing --with translations + +override_dh_install: + mkdir -p debian/url-dispatcher/usr/share/apport/package-hooks/ + install -m 644 debian/source_url-dispatcher.py debian/url-dispatcher/usr/share/apport/package-hooks/ + mkdir -p debian/url-dispatcher/etc/apport/crashdb.conf.d/ + install -m 644 debian/url-dispatcher-crashdb.conf debian/url-dispatcher/etc/apport/crashdb.conf.d/ + dh_apparmor --profile-name=url-dispatcher-bad-url-helper -p url-dispatcher + dh_install --fail-missing --- url-dispatcher-0.1+17.04.20170328.orig/debian/source/format +++ url-dispatcher-0.1+17.04.20170328/debian/source/format @@ -0,0 +1 @@ +1.0 --- url-dispatcher-0.1+17.04.20170328.orig/debian/source_url-dispatcher.py +++ url-dispatcher-0.1+17.04.20170328/debian/source_url-dispatcher.py @@ -0,0 +1,18 @@ +import os.path +from xdg.BaseDirectory import xdg_cache_home +from apport.hookutils import * + +def attach_command_output(report, command_list, key): + log = command_output(command_list) + if not log or log[:5] == "Error": + return + report[key] = log + +def add_info(report): + if not apport.packaging.is_distro_package(report['Package'].split()[0]): + report['ThirdParty'] = 'True' + report['CrashDB'] = 'url_dispatcher' + + dbpath = os.path.join(xdg_cache_home, 'url-dispatcher', 'urls-1.db') + if os.path.exists(dbpath): + attach_command_output(report, ['url-dispatcher-dump'], 'URLDispatcherDB') --- url-dispatcher-0.1+17.04.20170328.orig/debian/url-dispatcher-crashdb.conf +++ url-dispatcher-0.1+17.04.20170328/debian/url-dispatcher-crashdb.conf @@ -0,0 +1,7 @@ + +url_dispatcher = { + 'impl': 'launchpad', + 'distro': 'ubuntu', + 'package': 'url-dispatcher', + 'bug_pattern_base': None, +} --- url-dispatcher-0.1+17.04.20170328.orig/debian/url-dispatcher-testability.install +++ url-dispatcher-0.1+17.04.20170328/debian/url-dispatcher-testability.install @@ -0,0 +1 @@ +/usr/lib/python*/dist-packages/url_dispatcher_testability/* --- url-dispatcher-0.1+17.04.20170328.orig/debian/url-dispatcher-tools-gui.install +++ url-dispatcher-0.1+17.04.20170328/debian/url-dispatcher-tools-gui.install @@ -0,0 +1,2 @@ +/usr/share/applications/ +/usr/share/url-dispatcher/gui/ --- url-dispatcher-0.1+17.04.20170328.orig/debian/url-dispatcher-tools.install +++ url-dispatcher-0.1+17.04.20170328/debian/url-dispatcher-tools.install @@ -0,0 +1 @@ +usr/bin/url-dispatcher --- url-dispatcher-0.1+17.04.20170328.orig/debian/url-dispatcher.install +++ url-dispatcher-0.1+17.04.20170328/debian/url-dispatcher.install @@ -0,0 +1,8 @@ +usr/lib/*/url-dispatcher +usr/lib/*/ubuntu-app-launch/url-overlay/exec-tool +usr/lib/*/ubuntu-app-launch/bad-url/exec-tool +usr/share/dbus-1 +usr/share/upstart/sessions +usr/share/url-dispatcher/bad-url.qml +usr/bin/url-dispatcher-dump +debian/apparmor/url-dispatcher-bad-url-helper etc/apparmor.d --- url-dispatcher-0.1+17.04.20170328.orig/gui/url-dispatcher-gui.qml +++ url-dispatcher-0.1+17.04.20170328/gui/url-dispatcher-gui.qml @@ -1,59 +1,32 @@ import QtQuick 2.4 -import Ubuntu.Components 1.3 -import Ubuntu.Components.ListItems 1.3 - -MainView { - applicationName: "url-dispatcher-gui" - - Page { - header: PageHeader { - title: "URL Dispatcher GUI" - flickable: flickme +import QtQuick.Window 2.2 +import QtQuick.Controls 1.4 +import QtQuick.Layouts 1.3 + +Window { + visible: true + title: "URL Dispatcher GUI" + width: 360 + height: 100 + + ColumnLayout { + anchors.fill: parent + + TextField { + anchors.left: parent.left + anchors.right: parent.right + id: textbox + placeholderText: "URL (e.g. 'http://ubuntu.com')" } - Flickable { - id: flickme - anchors.fill: parent - - Column { - anchors.fill: parent - - ListItem { - contentItem.anchors { - leftMargin: units.gu(2) - rightMargin: units.gu(2) - topMargin: units.gu(1) - bottomMargin: units.gu(1) - } - - TextField { - id: textbox - anchors.fill: parent - placeholderText: "URL (e.g. 'http://ubuntu.com')" - } - } - - ListItem { - contentItem.anchors { - leftMargin: units.gu(2) - rightMargin: units.gu(2) - topMargin: units.gu(1) - bottomMargin: units.gu(1) - } - - Button { - anchors.fill: parent - text: "Send URL" - onClicked: { - console.log("Sending URL: " + textbox.text) - Qt.openUrlExternally(textbox.text) - } - } - } + Button { + anchors.left: parent.left + anchors.right: parent.right + text: "Send URL" + onClicked: { + console.log("Sending URL: " + textbox.text) + Qt.openUrlExternally(textbox.text) } } - } - - } --- url-dispatcher-0.1+17.04.20170328.orig/po/Makefile.in.in +++ url-dispatcher-0.1+17.04.20170328/po/Makefile.in.in @@ -0,0 +1 @@ +XGETTEXT_KEYWORDS=--c++ --copyright-holder='Canonical Ltd.' --keyword=tr --keyword=tr:1,2 --keyword=dtr:2 --keyword=dtr:2,3 --keyword=N_ --- url-dispatcher-0.1+17.04.20170328.orig/po/POTFILES.in +++ url-dispatcher-0.1+17.04.20170328/po/POTFILES.in @@ -0,0 +1,24 @@ +service/bad-url/exec-tool.cpp +service/glib-thread.cpp +service/overlay-tracker-mir.cpp +service/overlay-tracker.cpp +service/scope-checker.cpp +service/service.cpp +tools/url-dispatcher.cpp +liburl-dispatcher/url-dispatcher.c +service/dispatcher.c +service/update-directory.c +service/url-db.c +service/url-overlay/exec-tool.c +liburl-dispatcher/url-dispatcher.h +service/create-db-sql.h +service/dispatcher.h +service/glib-thread.h +service/overlay-tracker-iface.h +service/overlay-tracker-mir.h +service/overlay-tracker.h +service/scope-checker-facade.h +service/scope-checker.h +service/url-db.h +data/bad-url.qml +gui/url-dispatcher-gui.qml --- url-dispatcher-0.1+17.04.20170328.orig/service/CMakeLists.txt +++ url-dispatcher-0.1+17.04.20170328/service/CMakeLists.txt @@ -37,10 +37,7 @@ overlay-tracker.cpp overlay-tracker-iface.h overlay-tracker-mir.h - overlay-tracker-mir.cpp - scope-checker-facade.h - scope-checker.h - scope-checker.cpp) + overlay-tracker-mir.cpp) target_link_libraries(dispatcher-lib url-db-lib @@ -50,7 +47,6 @@ ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES} ${GIO2_LIBRARIES} - ${SCOPES_LIBRARIES} ${SQLITE_LIBRARIES} ${UBUNTU_APP_LAUNCH_LIBRARIES} ${WHOOPSIE_LIBRARIES} --- url-dispatcher-0.1+17.04.20170328.orig/service/dispatcher.c +++ url-dispatcher-0.1+17.04.20170328/service/dispatcher.c @@ -258,12 +258,6 @@ return FALSE; } - /* If it is from a scope we need to overlay onto the - dash instead */ - if (scope_checker_is_scope_pid(checker, pid)) { - pid = _get_pid_from_dbus(conn, "com.canonical.UnityDash"); - } - return overlay_tracker_add(tracker, app_id, pid, url); } @@ -511,17 +505,6 @@ } } - if (g_strcmp0(protocol, "scope") == 0) { - /* Add a check for the scope if we can do that, since it is - a system URL that we can do more checking on */ - if (!scope_checker_is_scope(checker, domain)) { - found = FALSE; - g_clear_pointer(out_appid, g_free); - if (out_url != NULL) - g_clear_pointer(out_url, g_free); - } - } - g_free(protocol); g_free(domain); --- url-dispatcher-0.1+17.04.20170328.orig/service/service.cpp +++ url-dispatcher-0.1+17.04.20170328/service/service.cpp @@ -35,14 +35,8 @@ auto tracker = overlay_tracker_new(); - ScopeChecker* checker = nullptr; - /* Allow disabing for testing */ - if (g_getenv("URL_DISPATCHER_DISABLE_SCOPE_CHECKING") == nullptr) { - checker = scope_checker_new(); - } - /* Initialize Dispatcher */ - if (!dispatcher_init(mainloop, tracker, checker)) { + if (!dispatcher_init(mainloop, tracker, NULL)) { return -1; } @@ -52,7 +46,6 @@ /* Clean up globals */ dispatcher_shutdown(); overlay_tracker_delete(tracker); - scope_checker_delete(checker); g_main_loop_unref(mainloop); return 0; --- url-dispatcher-0.1+17.04.20170328.orig/tests/dispatcher-test.cc +++ url-dispatcher-0.1+17.04.20170328/tests/dispatcher-test.cc @@ -24,7 +24,6 @@ #include "ubuntu-app-launch-mock.h" #include "overlay-tracker-mock.h" #include "url-db.h" -#include "scope-mock.h" #include "apparmor-mock.h" class DispatcherTest : public ::testing::Test @@ -36,7 +35,6 @@ protected: OverlayTrackerMock tracker; - RuntimeMock scope_runtime; GDBusConnection * session = nullptr; virtual void SetUp() { @@ -79,7 +77,7 @@ session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL); mainloop = g_main_loop_new(nullptr, FALSE); - dispatcher_init(mainloop, reinterpret_cast(&tracker), reinterpret_cast(&scope_runtime)); + dispatcher_init(mainloop, reinterpret_cast(&tracker), NULL); return; } @@ -95,7 +93,6 @@ g_main_loop_unref(mainloop); ubuntu_app_launch_mock_clear_last_app_id(); - scope_runtime.clearExceptions(); /* let other threads settle */ g_usleep(500000); @@ -344,28 +341,3 @@ return; } - -TEST_F(DispatcherTest, ScopeTest) -{ - gchar * out_appid = nullptr; - - unity::scopes::NotFoundException scopeException("test", "badscope"); - scope_runtime.addException("badscope.scopemaster_badscope", scopeException); - std::invalid_argument invalidException("confused"); - scope_runtime.addException("confusedscope.scopemaster_confusedscope", invalidException); - - /* Good sanity check */ - dispatcher_url_to_appid("scope://simplescope.scopemaster_simplescope", &out_appid, nullptr); - EXPECT_STREQ("scoper", out_appid); - g_free(out_appid); - - /* Bad scope */ - dispatcher_url_to_appid("scope://badscope.scopemaster_badscope", &out_appid, nullptr); - EXPECT_STRNE("scoper", out_appid); - g_free(out_appid); - - /* Confused scope */ - dispatcher_url_to_appid("scope://confusedscope.scopemaster_confusedscope", &out_appid, nullptr); - EXPECT_STRNE("scoper", out_appid); - g_free(out_appid); -}