--- ubuntu-app-launch-0.12+17.04.20170404.2.orig/CMakeLists.txt +++ ubuntu-app-launch-0.12+17.04.20170404.2/CMakeLists.txt @@ -85,18 +85,12 @@ pkg_check_modules(LTTNG REQUIRED lttng-ust) include_directories(${LTTNG_INCLUDE_DIRS}) -pkg_check_modules(CGMANAGER REQUIRED libcgmanager) -include_directories(${CGMANAGER_INCLUDE_DIRS}) - pkg_check_modules(MIR REQUIRED mirclient) include_directories(${MIR_INCLUDE_DIRS}) pkg_check_modules(WHOOPSIE REQUIRED libwhoopsie) include_directories(${WHOOPSIE_INCLUDE_DIRS}) -pkg_check_modules(LIBERTINE REQUIRED libertine) -include_directories(${LIBERTINE_INCLUDE_DIRS}) - pkg_check_modules(CURL libcurl>=7.47) include_directories(${CURL_INCLUDE_DIRS}) --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/debian/changelog +++ ubuntu-app-launch-0.12+17.04.20170404.2/debian/changelog @@ -0,0 +1,949 @@ +ubuntu-app-launch (0.12+17.04.20170404.2-0ubuntu6) bionic; urgency=medium + + * Drop unused self-build-dep. + + -- Steve Langasek Sun, 04 Mar 2018 15:09:35 +0000 + +ubuntu-app-launch (0.12+17.04.20170404.2-0ubuntu5) bionic; urgency=medium + + * No-change rebuild against libcurl4 + + -- Steve Langasek Wed, 28 Feb 2018 08:53:51 +0000 + +ubuntu-app-launch (0.12+17.04.20170404.2-0ubuntu4) artful; urgency=medium + + * Drop libertine, due to ubuntu-ui-toolkit dep. + + -- Dimitri John Ledkov Thu, 24 Aug 2017 20:31:46 +0100 + +ubuntu-app-launch (0.12+17.04.20170404.2-0ubuntu3) artful; urgency=medium + + * Drop cgmanager bits, no longer used since upstart was dropped. + + -- Dimitri John Ledkov Mon, 24 Apr 2017 14:48:52 +0100 + +ubuntu-app-launch (0.12+17.04.20170404.2-0ubuntu2) zesty; urgency=medium + + * No-change rebuild (LP: #1681870). + + -- Łukasz 'sil2100' Zemczak Tue, 11 Apr 2017 17:33:25 +0100 + +ubuntu-app-launch (0.12+17.04.20170404.2-0ubuntu1) zesty; urgency=medium + + [ Michael Terry ] + * Bump version for new AppID methods + + [ Ted Gould ] + * Cleanup registry references to make them consistent (LP: #1676361) + * Watch system folders for apps added and removed (LP: #1630997, + #1672392) + * Wait with a timeout for the libertine service to start + * Provide equality operators for Application and Application::Instance + objects. (LP: #1677345) + * Force GTK and Qt backends when using XMir + + -- Ted Gould Tue, 04 Apr 2017 21:48:48 +0000 + +ubuntu-app-launch (0.11+17.04.20170328-0ubuntu1) zesty; urgency=medium + + * Explicitly depend on libertine-xmir-tools (#1671938). + + -- Larry Price Tue, 28 Mar 2017 14:16:27 +0000 + +ubuntu-app-launch (0.11+17.04.20170321-0ubuntu1) zesty; urgency=medium + + [ Ted Gould ] + * Migrate untrusted helpers to C++ interfaces and jobs backend + * Put all application specific static functions into a single AppStore + object + * Remove Upstart + * Removing support for Click + + [ Pete Woods ] + * Switch to reference counted memory management in all c++ code + * Run make format target following managed memory branch + + -- Ted Gould Tue, 21 Mar 2017 03:29:09 +0000 + +ubuntu-app-launch (0.10+17.04.20170310-0ubuntu1) zesty; urgency=medium + + [ Ken VanDine ] + * Removed click related manual tests and correct-job-type tests which + no longer seems to apply + + [ Larry Price ] + * Add all icon directories to search paths regardless of context. (LP: + #1669913) + + [ Michael Terry ] + * Use the "mir" interface (not the "unity8" interface) to decide if an + app supports Mir or not. + + -- Rodney Dawes Fri, 10 Mar 2017 15:17:03 +0000 + +ubuntu-app-launch (0.10+17.04.20170307.1-0ubuntu1) zesty; urgency=medium + + * XMir by default for Legacy apps (LP: #1668429) + + -- Ted Gould Tue, 07 Mar 2017 19:07:32 +0000 + +ubuntu-app-launch (0.10+17.04.20170215.1-0ubuntu1) zesty; urgency=medium + + [ Ken VanDine ] + * New upstream version + * Adds Application::Instance::focus and + Application::findInstance(pid_t) API + + [ Ted Gould ] + * Remove unused log functions + * Add missing virtual destructors + * Provide a popularity info item and a signal for info updating + * Run the libertine-service in tests for new libertine >= 1.6 + + -- Ken VanDine Wed, 15 Feb 2017 15:10:49 +0000 + +ubuntu-app-launch (0.9+17.04.20170206-0ubuntu1) zesty; urgency=medium + + * Reset failed units so they can be tried again (LP: #1655754) + + -- Ted Gould Mon, 06 Feb 2017 16:00:40 +0000 + +ubuntu-app-launch (0.9+17.04.20170202.2-0ubuntu1) zesty; urgency=medium + + * SystemD backend added + * Make UAL relocatable for Snappy installs (LP: #1623694) + * Prioritize 'unity8' interfaces over other supported interfaces + * Handle deprecated functions in Mir 0.26 + + -- Ted Gould Thu, 02 Feb 2017 15:10:39 +0000 + +ubuntu-app-launch (0.9+17.04.20170124-0ubuntu1) zesty; urgency=medium + + * Change signals into C++ core::signal objects (LP: #1590442) + * Abstract out jobs backends and make Upstart one + * Move the signals into the jobs classes + * Make the signals support finding the instance of the application + (LP: #1589637) + * Jobs interface specific tests + + -- Ted Gould Tue, 24 Jan 2017 14:15:17 +0000 + +ubuntu-app-launch (0.9+17.04.20170113.1-0ubuntu1) zesty; urgency=medium + + [ Pete Woods ] + * Compatibility with unversioned cmake-extras modules (LP: #1563573) + + [ Rodney Dawes ] + * Handle more common Icon entries in .desktop files for snaps. (LP: + #1639952) + + [ Ted Gould ] + * Fixes to the exec-util test to ensure it is more reliable + * Reenable OnlyShowIn checking for Desktop files (LP: #1580092, + #1606593, #1608546) + + -- Ted Gould Fri, 13 Jan 2017 22:16:18 +0000 + +ubuntu-app-launch (0.9+17.04.20161110.1-0ubuntu1) zesty; urgency=medium + + * Make pause/resume non-blocking + * Removing JSON-GLib version cruft + * Switch to libwhoopsie for recoverable problem support + + -- Ted Gould Thu, 10 Nov 2016 15:39:43 +0000 + +ubuntu-app-launch (0.9+16.10.20161003.1-0ubuntu1) yakkety; urgency=medium + + * Set a base directory for icons that have a full path specified in + their desktop file (LP: #1623636) + * Don't throw an exception when a Desktop file fails to include an + Icon key (LP: #1617348) + * Switch from g_atexit to std::atexit to avoid deprecation warnings + * Use the --id field for launching with libertine-launch and use it + for setting up other X11 environments + * Ensure we don't check the length of a nullptr array + * Make sure we don't check snapd if we know it won't return useful + results + * Make use of the instance parameter consistent through all the + backends (LP: #1626028) + + -- Ted Gould Mon, 03 Oct 2016 23:55:25 +0000 + +ubuntu-app-launch (0.9+16.10.20160928-0ubuntu1) yakkety; urgency=medium + + * Add a try/catch inside the for loop in ::list(). (LP: #1627594) + + -- Rodney Dawes Wed, 28 Sep 2016 17:43:54 +0000 + +ubuntu-app-launch (0.9+16.10.20160913.1-0ubuntu1) yakkety; urgency=medium + + [ Larry Price ] + * Recursively sweep for desktop files for libertine applications. + + [ Ted Gould ] + * Fixes, tools and tests related to listing applications + * Migrate starting and stopping applications to new classes + * Make find and discover use the application implementation functions. + * Support launching applications installed as snaps (LP: #1590445) + + -- Ted Gould Tue, 13 Sep 2016 17:43:33 +0000 + +ubuntu-app-launch (0.9+16.10.20160902-0ubuntu1) yakkety; urgency=medium + + * Disable handshake wait with clients doing handshaking (LP: #1618540) + + -- Ted Gould Fri, 02 Sep 2016 14:51:45 +0000 + +ubuntu-app-launch (0.9+16.10.20160825-0ubuntu1) yakkety; urgency=medium + + * Use at() instead of operator[]() so that we get an exception on + bounds checking + + -- Ted Gould Thu, 25 Aug 2016 14:43:00 +0000 + +ubuntu-app-launch (0.9+16.10.20160817.1-0ubuntu1) yakkety; urgency=medium + + [ Charles Kerr ] + * Fix memory leak in Click::launch() + + [ Rodney Dawes ] + * Use cmake-extras for coverage reporting. (LP: #1609545) + * Backport some fixes for listing installed Click apps. + + [ Ted Gould ] + * Add in eventually timeouts in tests to make them more robust + * Add test for abi compatibility (LP: #1609565) + * Add API to allow adjusting of the OOM score for an application + instance (LP: #1579799) + + [ Rodney Dawes, Ted Gould ] + * Add desktop info fields needed for applications scope + + -- Ted Gould Wed, 17 Aug 2016 15:25:23 +0000 + +ubuntu-app-launch (0.9+16.10.20160803-0ubuntu1) yakkety; urgency=medium + + [ Ken VanDine ] + * Added dev depends on libproperties-cpp-dev + + [ Rodney Dawes ] + * Strip the extra .desktop off of legacy app IDs when loading .desktop + files. (LP: #1606695) + * Use stricter gensymbols check. + * Disable the pauseresume tests to unblock landings for now. + + [ Ted Gould ] + * Pedantic fixes for header files + * Fix to use correct types returned from libclick + + -- Rodney Dawes Wed, 03 Aug 2016 14:10:45 +0000 + +ubuntu-app-launch (0.9+16.04.20160510.2-0ubuntu1) xenial; urgency=medium + + * Allow invalid desktop files for OTA11 quick fix (LP: #1580092) + + -- Ted Gould Tue, 10 May 2016 19:11:21 +0000 + +ubuntu-app-launch (0.9+16.04.20160504.1-0ubuntu1) xenial; urgency=medium + + [ CI Train Bot ] + * Add a depends for cgmanager for the desktop + + [ Larry Price ] + * Add additional cases for not presenting desktop launchers based on + keyfile entries. + * Refactoring IconFinder to include icons from the Humanity theme (LP: + #1558741) + * Update icon search for non-click applications to search the hicolor + theme directory for appropriate icons. (LP: #1576722) + + [ Ted Gould ] + * Add a small commandline tool for application information + * Fix typo in desktop key name (LP: #1578112) + * Handle exceptions and print errors with command line tools (LP: + #1575990) + * Minor cleanup which causes an annoying warning message + + -- Ted Gould Wed, 04 May 2016 20:12:55 +0000 + +ubuntu-app-launch (0.9+16.04.20160427-0ubuntu1) xenial; urgency=medium + + [ Ted Gould ] + * Adjust version regular expression to handle single character version + numbers + + -- Michael Terry Wed, 27 Apr 2016 14:52:33 +0000 + +ubuntu-app-launch (0.9+16.04.20160421.3-0ubuntu1) xenial; urgency=medium + + [ Ted Gould ] + * Add new C++ API that has a retained object for maintaining + connections through multiple calls. Also provides for getting + consistent application metadata. + * Add dependency on libpam-cgfs on Xenial so that cgroups work + properly in Upstart (LP: #1535058) + * Adding support for Read the Docs + * Fix cut-and-paste error in function comment + * If no XDG_DATA_DIRS is set ensure that /usr/share is in the list. + (LP: #1541037) + + [ CI Train Bot ] + * Ensure all pending events on the context are complete before + unref'ing it. (LP: #1495871) + + [ Dimitri John Ledkov ] + * Raise to -std=gnu99, because we really want gnu standards, and thus + e.g. access CLOCK_MONOTONIC in lttng on arm64/armhf. Resolves FTBFS. + + [ Michael Terry ] + * Fix build by correcting typo in function name. + + -- Ted Gould Thu, 21 Apr 2016 19:47:16 +0000 + +ubuntu-app-launch (0.5+15.10.20150817-0ubuntu1) wily; urgency=medium + + [ CI Train Bot ] + * debian/libubuntu-app-launch2.symbols: update to released version. + + [ Robert Ancell ] + * Depend on upstart instead of upstart-bin which is a dummy + transitional package. + + [ Ted Gould ] + * Detect applications that are in a libertine container + * Make demangler path more secure and unset internal environment + variables + * Provide an API to find the desktop file and directory of an AppID + * Start XMir for applications that enable it + + -- CI Train Bot Mon, 17 Aug 2015 21:38:33 +0000 + +ubuntu-app-launch (0.5+15.10.20150629-0ubuntu1) wily; urgency=medium + + [ Andreas Pokorny ] + * mir release 0.14.0 + + -- CI Train Bot Mon, 29 Jun 2015 06:10:46 +0000 + +ubuntu-app-launch (0.5+15.10.20150605-0ubuntu1) wily; urgency=medium + + [ Ted Gould ] + * Don't error on ZG failure (LP: #1452178) + * Fallback to looking for the AppID tag if the source is missing (LP: + #1461138) + + -- CI Train Bot Fri, 05 Jun 2015 19:49:48 +0000 + +ubuntu-app-launch (0.5+15.10.20150604-0ubuntu1) wily; urgency=medium + + [ Ted Gould ] + * Add an untrusted helper that works with Mir trusted prompt sessions. + + [ CI Train Bot ] + * debian/libubuntu-app-launch2.symbols: update to released version. + + -- CI Train Bot Thu, 04 Jun 2015 20:35:57 +0000 + +ubuntu-app-launch (0.4+15.04.20150410-0ubuntu1) vivid; urgency=medium + + [ Ted Gould ] + * Have desktop hook verify source file still exists (LP: #1437355) + + -- CI Train Bot Fri, 10 Apr 2015 16:58:30 +0000 + +ubuntu-app-launch (0.4+15.04.20150403-0ubuntu1) vivid; urgency=medium + + [ Ted Gould ] + * When Mir isn't available just exec with X11 + + -- CI Train Bot Fri, 03 Apr 2015 17:30:48 +0000 + +ubuntu-app-launch (0.4+15.04.20150313.2-0ubuntu1) vivid; urgency=medium + + [ CI Train Bot ] + * New rebuild forced. + + [ Rodney Dawes ] + * Save status from waitpid and exit with it. (LP: #1431565) + + -- CI Train Bot Fri, 13 Mar 2015 16:05:56 +0000 + +ubuntu-app-launch (0.4+15.04.20150305.1-0ubuntu1) vivid; urgency=medium + + [ CI Train Bot ] + * debian/libubuntu-app-launch2.symbols: auto-update to released + version + + [ Ted Gould ] + * Add a test tool to run an application from the command line (LP: + #1425286) + * Emit a signal when applications are paused or resumed (LP: #1425285) + * Remove application log on exit if not in developer mode (LP: + #1414039) + + -- CI Train Bot Thu, 05 Mar 2015 14:36:35 +0000 + +ubuntu-app-launch (0.4+15.04.20141121-0ubuntu1) vivid; urgency=low + + [ Ted Gould ] + * Remove reporting a recoverable problem on cgmanager (LP: #1394919) + * Use a version script to ensure we're not leaking symbols + * Create a custom GMainContext when waiting on the CGManager DBus + connection. (LP: #1394622) + + -- Ubuntu daily release Fri, 21 Nov 2014 21:17:30 +0000 + +ubuntu-app-launch (0.4+15.04.20141118-0ubuntu1) vivid; urgency=low + + [ Ted Gould ] + * Attenting to connect to cgmanager for 1 second and then failing and + reporting a recoverable error. (LP: #1377332) + + -- Ubuntu daily release Tue, 18 Nov 2014 21:10:45 +0000 + +ubuntu-app-launch (0.4+15.04.20141031-0ubuntu1) vivid; urgency=low + + [ Chris Townsend ] + * Change GetTasks to GetTasksRecursive so it searches all pids related + to a cgroup instead of just the first pid. (LP: #1386357) + + [ Leo Arias ] + * On the cgroup manual test, make it clear that the command must be + run on the app. + + -- Ubuntu daily release Fri, 31 Oct 2014 15:02:48 +0000 + +ubuntu-app-launch (0.4+14.10.20141006-0ubuntu1) utopic; urgency=low + + [ Ted Gould ] + * Set OOM adjustment without using temporary files. (LP: #1374177) + * Use a setuid helper for OOM adjustment of Oxide renderers + + -- Ubuntu daily release Mon, 06 Oct 2014 14:33:13 +0000 + +ubuntu-app-launch (0.4+14.10.20140925-0ubuntu1) utopic; urgency=low + + [ Martin Pitt ] + * Upstart dep updated to trunk + + [ Ted Gould ] + * Upstart dep updated to trunk + * Add handling for X-Ubuntu-SymbolicIcon in desktop hook (LP: + #1365408) + + [ CI bot ] + * Adjust upstart recommends to upstart-bin (LP: #1351306) + + -- Ubuntu daily release Thu, 25 Sep 2014 14:43:28 +0000 + +ubuntu-app-launch (0.4+14.10.20140915.3-0ubuntu1) utopic; urgency=medium + + [ Ted Gould ] + * Unrevert cgroup support + * Adding a manual test to verify the job running the application + * CGroup test and clarification comments + * Tracepoint got dropped in refactoring + * Use the Upstart 1.13 feature of multiple set for environment + variables + * Cleanup UAL LTTng tracepoints + * Provide a pause and resume function for AppIDs + * Rotate application and untrusted helper logs faster than other + services + * Add a tool to show application usage + * Reshuffle the pre-start jobs to save precious milliseconds + + [ Ubuntu daily release ] + * debian/libubuntu-app-launch2.symbols: auto-update to released + version + + -- Ubuntu daily release Mon, 15 Sep 2014 19:40:21 +0000 + +ubuntu-app-launch (0.4+14.10.20140808.3.is.0.4+14.10.20140605.3-0ubuntu1) utopic; urgency=medium + + * Temporarily revert the cgroup support introduced in the last + version, as it was causing regressions in our test infrastructure + + -- Lukasz 'sil2100' Zemczak Tue, 19 Aug 2014 09:52:33 +0200 + +ubuntu-app-launch (0.4+14.10.20140808.2-0ubuntu1) utopic; urgency=low + + [ Ted Gould ] + * Use Upstart cgroup support in 1.13 to properly track PIDs + + -- Ubuntu daily release Fri, 08 Aug 2014 03:59:40 +0000 + +ubuntu-app-launch (0.4+14.10.20140605.3-0ubuntu1) utopic; urgency=medium + + [ Ted Gould ] + * Fixing click hook for name change + + -- Ubuntu daily release Thu, 05 Jun 2014 03:40:55 +0000 + +ubuntu-app-launch (0.4+14.10.20140601-0ubuntu2) utopic; urgency=low + + * add Conflicts/Replaces/Provides to ubuntu-app-launch-tools since there are + still packages depending on upstart-app-launch-tools + + -- Oliver Grawert Wed, 04 Jun 2014 10:06:24 +0200 + +ubuntu-app-launch (0.4+14.10.20140601-0ubuntu1) utopic; urgency=medium + + [ Ted Gould ] + * Rename to "Ubuntu App Launch" + + -- Ubuntu daily release Sun, 01 Jun 2014 21:10:43 +0000 + +upstart-app-launch (0.3+14.10.20140521-0ubuntu1) utopic; urgency=low + + [ Ted Gould ] + * Drop Surface Flinger support + * Debug message for valid, though rare, conditions. (LP: #1301173) + * More elegant handling of bad application id errors (LP: #1238068) + * Set LD_LIBRARY_PATH to include the application directory + + -- Ubuntu daily release Wed, 21 May 2014 17:41:20 +0000 + +upstart-app-launch (0.3+14.04.20140411-0ubuntu1) trusty; urgency=low + + [ Ted Gould ] + * Kill all jobs in process group on exit + + -- Ubuntu daily release Fri, 11 Apr 2014 22:14:55 +0000 + +upstart-app-launch (0.3+14.04.20140321-0ubuntu1) trusty; urgency=low + + [ Colin Watson ] + * Use libclick to get the package directory, saving about 0.7 seconds + from Click application startup (on mako). + * Use libclick to get package manifests, saving about 0.7 seconds from + Click application startup (on mako). + + -- Ubuntu daily release Fri, 21 Mar 2014 17:56:24 +0000 + +upstart-app-launch (0.3+14.04.20140320-0ubuntu1) trusty; urgency=low + + [ Thomi Richards ] + * Export the correct environment variable to load apps with + testability enabled. (LP: #1285947) + + [ Ubuntu daily release ] + * New rebuild forced + + -- Ubuntu daily release Thu, 20 Mar 2014 23:22:49 +0000 + +upstart-app-launch (0.3+14.04.20140220-0ubuntu3) trusty; urgency=medium + + * Change dependency on "zeitgeist" to "zeitgeist-core". The former is a + metapackage which pulls in python2 and useless gtk/X data providers, + whereas zeitgeist-core provides the service necessary for + zg-report-app to operate. + + -- Dimitri John Ledkov Sat, 22 Feb 2014 23:00:37 +0000 + +upstart-app-launch (0.3+14.04.20140220-0ubuntu2) trusty; urgency=medium + + * Drop depends:click from a Multi-Arch:same library package, as click is + neither M-A:allowed nor M-A:foreign. This unbreaks cross-compilation. + + -- Dimitri John Ledkov Thu, 20 Feb 2014 23:51:29 +0000 + +upstart-app-launch (0.3+14.04.20140220-0ubuntu1) trusty; urgency=low + + [ Ted Gould ] + * Support for Untrusted Helpers + * A little tool to discover application IDs + * Add observers in the launch tool so that we stick around to handle + events + * Add functions for testing and App ID parsing + + -- Ubuntu daily release Thu, 20 Feb 2014 12:04:30 +0000 + +upstart-app-launch (0.3+14.04.20140213-0ubuntu1) trusty; urgency=low + + [ Ted Gould ] + * Unregister for Unity's Resume signal + * Function to get the log file for the application + * Add GIR support to libual + * Remove an invalid substitution that we weren't using (LP: #1220591) + + [ Ubuntu daily release ] + * debian/*symbols: auto-update new symbols to released version + + -- Ubuntu daily release Thu, 20 Feb 2014 12:04:27 +0000 + +upstart-app-launch (0.3+14.04.20140210-0ubuntu1) trusty; urgency=low + + * debian/*symbols: auto-update new symbols to released version + + -- Ubuntu daily release Thu, 13 Feb 2014 13:14:48 +0000 + +upstart-app-launch (0.3+14.04.20140206-0ubuntu1) trusty; urgency=low + + [ Ted Gould ] + * Basic merge and review requirements. + * On error print the exec line + * Make the last environment variable set synchronous to make Upstart + respond that it received it. (LP: #1275017) + + [ Ubuntu daily release ] + * New rebuild forced + + -- Ubuntu daily release Thu, 06 Feb 2014 16:54:55 +0000 + +upstart-app-launch (0.3+14.04.20140129.1-0ubuntu1) trusty; urgency=low + + [ Ken VanDine ] + * Added upstart_app_launch_triplet_to_app_id to construct an appid + from pkg, app, version triplet. If a specific version isn't + provided, click is used to determine the version from the manifest. + + [ Ted Gould ] + * Set the Upstart job environment using DBus. + * Tests for the exec utilities. + * Add an APP_DESKTOP_FILE_PATH to point to a readable desktop file + under confinement. + * Include an architecture specific directory in the path. + * Making the application job a task. + * Add application list handling to the triplet function. + + [ CI bot ] + * Upload to trusty + + -- Ubuntu daily release Wed, 29 Jan 2014 20:08:11 +0000 + +upstart-app-launch (0.3+14.04.20131218-0ubuntu1) trusty; urgency=low + + [ Ken VanDine ] + * Multi-Arch: same libraries must not depend on run-time application,. + since this breaks cross-compilation. Furthermore, circular + dependencies are never needed: upstart-app-launch depends on + libupstart-app-launch2, which depends on upstart-app-launch. It's + the same reasoning why we do not make libgtk-3.0 depend on epiphany + webbrowser, even though gtk has functions to open URL in a + webbrowser. And in a multi-arch world libgtk-3.0 would never know + which architecture your web-browser is, it could be any. Libraries + should only ever depend on other linked shared libraries. + + [ Ted Gould ] + * Make sure that 'package' sticks around until we setup the + environment. (LP: #1260079) + * Improve readability of the coverage report. + + [ Didier Roche ] + * revert the archictecture specific list: britney doesn't use those + + [ Ubuntu daily release ] + * Automatic snapshot from revision 100 + * debian/*symbols: auto-update new symbols to released version + + -- Ubuntu daily release Wed, 29 Jan 2014 20:08:07 +0000 + +upstart-app-launch (0.3+14.04.20131209-0ubuntu3) trusty; urgency=low + + * Multi-Arch: same libraries must not depend on run-time application, + since this breaks cross-compilation. Furthermore, circular + dependencies are never needed: upstart-app-launch depends on + libupstart-app-launch2, which depends on upstart-app-launch. It's the + same reasoning why we do not make libgtk-3.0 depend on epiphany + webbrowser, even though gtk has functions to open URL in a + webbrowser. And in a multi-arch world libgtk-3.0 would never know + which architecture your web-browser is, it could be any. Libraries + should only ever depend on other linked shared libraries. + + -- Dimitri John Ledkov Thu, 12 Dec 2013 22:32:34 +0000 + +upstart-app-launch (0.3+14.04.20131209-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:47:51 +0100 + +upstart-app-launch (0.3+14.04.20131209-0ubuntu1) trusty; urgency=low + + [ Ubuntu daily release ] + * debian/*symbols: auto-update new symbols to released version + + [ Ted Gould ] + * Use the parsing of the line to split appart the URLs. (LP: #1253703) + * Use Upstart on the session bus instead of the private bus. + * Adding tracing support to application startup. + * Hide click error printed in the Upstart log. + * Handshake for starting applications. (LP: #1243665) + * Link to the right version of upstart-app-launch. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 93 + + -- Ubuntu daily release Mon, 09 Dec 2013 02:05:27 +0000 + +upstart-app-launch (0.3+14.04.20131126-0ubuntu1) trusty; urgency=low + + [ Ted Gould ] + * Bumping to 0.3 to reflect that we added a new env var to the library + which is needed for testing URL Dispatcher + * Reenable ZG and port to libzg-2.0. (LP: #1197569) + * Ensure quoted single URIs passed to a %U are unquoted. (LP: + #1253703) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 86 + + -- Ubuntu daily release Tue, 26 Nov 2013 02:07:13 +0000 + +upstart-app-launch (0.2+14.04.20131119-0ubuntu1) trusty; urgency=low + + [ Ted Gould ] + * Unref the proxy after stopping an application. + * Use shell escaping to ensure we can handle spaces. (LP: #1229354) + * Set the XDG Data Dirs to include the application install directory. + (LP: #1250546) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 82 + + -- Ubuntu daily release Tue, 19 Nov 2013 08:19:25 +0000 + +upstart-app-launch (0.2+13.10.20131014-0ubuntu1) saucy; urgency=low + + [ Ricardo Mendoza ] + * Currently we are signalling observers that app started on the + "starting" signal. This is racy, as the final exec might not have + happened yet, so if a client tries to get the primary PID before the + process has fully started, it might get one of the transitional PIDs + of the scripts that run in between. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 78 + + -- Ubuntu daily release Mon, 14 Oct 2013 07:55:55 +0000 + +upstart-app-launch (0.2+13.10.20131011-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * Bumping to version 0.2 + * Adding a libupstart-app-launch1.symbols file to match + * Use 'click info' to get manifests. (LP: #1232118) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 76 + + -- Ubuntu daily release Fri, 11 Oct 2013 02:09:14 +0000 + +upstart-app-launch (0.1+13.10.20131008.1-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * On second activations send a message to the FD.o application + interface. (LP: #1228345) + * Add observers for focused and resume. + * Testing of the second exec logic. + * Disable ZG logging for Phone 1.0. + * Need a little longer time on recent ARM builds. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 73 + + -- Ubuntu daily release Tue, 08 Oct 2013 10:07:25 +0000 + +upstart-app-launch (0.1+13.10.20130925.2-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * Ensure a failed stop return doesn't block execution. (LP: #1229468) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 67 + + -- Ubuntu daily release Wed, 25 Sep 2013 18:03:51 +0000 + +upstart-app-launch (0.1+13.10.20130925.1-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * Tests for the functions in the core helpers library. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 65 + + -- Ubuntu daily release Wed, 25 Sep 2013 12:54:36 +0000 + +upstart-app-launch (0.1+13.10.20130924.1-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * Evil hack to allow "secondary activations" through killing the first + instance. + * Handle URLs with complex spacing by using C parsing. (LP: #1228387) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 63 + + -- Ubuntu daily release Tue, 24 Sep 2013 06:04:42 +0000 + +upstart-app-launch (0.1+13.10.20130919.4-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * Support a desktop file key so legacy applications can be single + instance. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 60 + + -- Ubuntu daily release Thu, 19 Sep 2013 22:04:58 +0000 + +upstart-app-launch (0.1+13.10.20130919.3-0ubuntu1) saucy; urgency=low + + [ Loïc Minier ] + * Fix LP #1227632 by directly joining the components of the Exec line + split on % instead of joining them with spaces. (LP: #1227632) + + [ Ted Gould ] + * Only split the URIs if there are more than one. + * Try to deduce if we're on Surface Flinger. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 58 + + -- Ubuntu daily release Thu, 19 Sep 2013 14:03:55 +0000 + +upstart-app-launch (0.1+13.10.20130917.1-0ubuntu1) saucy; urgency=low + + [ Sebastien Bacher ] + * typo fix in one of the warning strings. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 54 + + -- Ubuntu daily release Tue, 17 Sep 2013 22:03:45 +0000 + +upstart-app-launch (0.1+13.10.20130912-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * Don't automatically warn on a failed App ID. + * Check to see if an icon exists, and if so prepend the full path. + + [ Jamie Strandboge ] + * application-legacy.conf.in: use aa-exec-click instead of aa-exec + desktop-hook.c: use aa-exec-click instead of aa-exec (LP: #1197047) + debian/control: Depends on click-apparmor. (LP: #1197047) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 52 + + -- Ubuntu daily release Thu, 12 Sep 2013 20:33:42 +0000 + +upstart-app-launch (0.1+13.10.20130905-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * Making sure to look for the application directory. (LP: #1215478) + * Handle click errors by just not setting the value. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 48 + + -- Ubuntu daily release Thu, 05 Sep 2013 09:06:43 +0000 + +upstart-app-launch (0.1+13.10.20130903-0ubuntu1) saucy; urgency=low + + [ Guenter Schwann ] + * Make libupstart-app-launch usable by C++ programs. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 45 + + -- Ubuntu daily release Tue, 03 Sep 2013 18:05:38 +0000 + +upstart-app-launch (0.1+13.10.20130827-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * Completes the base functionality in the libupstart-app-launch + library. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 43 + + -- Ubuntu daily release Tue, 27 Aug 2013 14:04:33 +0000 + +upstart-app-launch (0.1+13.10.20130819-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * Make setting the PATH more robust. + + [ jdstrand ] + * Update click-exec.c to setup the sandbox environment. Specifically: + - explicitly set the XDG base dirs to the user's preference - set + UBUNTU_APPLICATION_ISOLATION - set TMPDIR - set + __GL_SHADER_DISK_CACHE_PATH. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 41 + + -- Ubuntu daily release Mon, 19 Aug 2013 02:04:19 +0000 + +upstart-app-launch (0.1+13.10.20130812-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * Use the click utility to determine path to the package. + * Split profile and exec into two variables. + * Add a click package hook to build desktop files. + * Flesh out the click package execution. + * Switch to CMake and add stub library. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 38 + + -- Ubuntu daily release Mon, 12 Aug 2013 18:04:33 +0000 + +upstart-app-launch (0.1+13.10.20130712-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * Add support for URIs. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 32 + + -- Ubuntu daily release Fri, 12 Jul 2013 00:01:50 +0000 + +upstart-app-launch (0.1+13.10.20130703-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * Split out legacy and click package startup. + * Allow setting the apparmor profile in the dekstop file. + * Add Zeitgeist logging of the start and stop of the applications. + * Adding a shell script to insert the initctl path if on buildd's. + * Switch initialization to be signal based. + * Don't run tests on buildds. + * Changing the script to check for upstart versions. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 30 + + -- Ubuntu daily release Wed, 03 Jul 2013 00:01:31 +0000 + +upstart-app-launch (0.1daily13.06.19-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * Initial release + * The application config file + * Adding debian stuff + * Fixing the make file to make it work-ish + * Adding notification of isolation + * Adding a build for a small executor target + * Fleshing out desktop exec + * Adding the directory into the conf file + * Make the deb stuff work + * Now that we have the tool we need to expect a fork + * Changing the conf file to not need the script suggested by zyga on + #ubuntu-devel + * Switch from using GIO to standard GLib and exec + * Simpler pkgconfig too + * Drop the forking + * Making a little script to help with apps + * Putting some boiler plate dbus in there + * Dump out the PIDs and the nice names + * Putting the type in too + * Close the metal here + * Adding a glib build dependency. + * Searching desktop files in pre-start. + * Adding a COPYING file and file copyrights. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 22 + + -- Ubuntu daily release Wed, 19 Jun 2013 00:01:09 +0000 --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/debian/clean +++ ubuntu-app-launch-0.12+17.04.20170404.2/debian/clean @@ -0,0 +1 @@ +debian/ubuntu-app-launch.postinst --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/debian/compat +++ ubuntu-app-launch-0.12+17.04.20170404.2/debian/compat @@ -0,0 +1 @@ +9 --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/debian/control +++ ubuntu-app-launch-0.12+17.04.20170404.2/debian/control @@ -0,0 +1,118 @@ +Source: ubuntu-app-launch +Section: gnome +Priority: optional +Maintainer: Ted Gould +Build-Depends: abi-compliance-checker, + cmake, + cmake-extras (>= 0.10), + dbus-x11, + dbus-test-runner, + debhelper (>= 9), + googletest | google-mock, + libcurl4-dev | libcurl4-gnutls-dev, + libdbus-1-dev, + libdbustest1-dev (>= 14.04.0), + libgirepository1.0-dev, + libglib2.0-dev, + libgtest-dev, + libjson-glib-dev (>= 1.1.2), + liblttng-ust-dev, + libmirclient-dev (>= 0.5), + libproperties-cpp-dev, + libunity-api-dev (>= 8.4), + libwhoopsie-dev (>= 0.2.52), + libzeitgeist-2.0-dev, + gobject-introspection, + python3-dbusmock, +Standards-Version: 3.9.4 +Homepage: http://launchpad.net/ubuntu-app-launch +# 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/ubuntu-app-launch/trunk.13.10 +Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/ubuntu-app-launch/trunk.13.10/files + +Package: ubuntu-app-launch +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + dbus-user-session, + zeitgeist-core, +Replaces: upstart-app-launch +Conflicts: upstart-app-launch +Provides: upstart-app-launch +Description: Session init system job for Launching Applications + Upstart Job file and associated utilities that is used to launch + applications in a standard and confined way. + +Package: ubuntu-app-launch-tools +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ubuntu-app-launch (= ${binary:Version}), +Replaces: upstart-app-launch-tools +Conflicts: upstart-app-launch-tools +Provides: upstart-app-launch-tools +Description: Tools for working wtih launched applications + Upstart Job file and associated utilities that is used to launch + applications in a standard and confined way. + . + This package provides tools for working with the Upstart App Launch. + +Package: libubuntu-app-launch4 +Section: libs +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + ubuntu-app-launch (= ${binary:Version}), +Pre-Depends: ${misc:Pre-Depends}, +Multi-Arch: same +Description: library for sending requests to the ubuntu app launch + Upstart Job file and associated utilities that is used to launch + applications in a standard and confined way. + . + This package contains shared libraries to be used by applications. + +Package: libubuntu-app-launch3-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + libglib2.0-dev, + libmirclient-dev (>= 0.5), + libproperties-cpp-dev, + libubuntu-app-launch4 (= ${binary:Version}), +Breaks: libubuntu-app-launch2-dev +Replaces: libubuntu-app-launch2-dev +Pre-Depends: ${misc:Pre-Depends}, +Multi-Arch: same +Description: library for sending requests to the ubuntu app launch + Upstart Job file and associated utilities that is used to launch + applications in a standard and confined way. + . + This package contains files that are needed to build applications. + +Package: gir1.2-ubuntu-app-launch-3 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libubuntu-app-launch4 (= ${binary:Version}), + ${gir:Depends}, +Pre-Depends: ${misc:Pre-Depends} +Recommends: ubuntu-app-launch (= ${binary:Version}) +Description: typelib file for libubuntu-app-launch4 + Interface for starting apps and getting info on them. + . + This package can be used by other packages using the GIRepository format to + generate dynamic bindings for libubuntu-app-launch4. + +Package: ubuntu-app-test +Architecture: any +Section: devel +Depends: ${shlibs:Depends}, + ${misc:Depends}, + qtchooser, +Description: Small application to help test apps + Uses trusted prompt sessions to provide a way to easily + run a command on the command line to look at stdout or + stderr for developers. --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/debian/copyright +++ ubuntu-app-launch-0.12+17.04.20170404.2/debian/copyright @@ -0,0 +1,27 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ubuntu-app-launch +Source: https://launchpad.net/ubuntu-app-launch + +Files: * +Copyright: 2013 Canonical +License: GPL-3 + +Files: debian/* +Copyright: 2013 Ted Gould +License: GPL-3 + +License: GPL-3 + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License version 3, as published + by the Free Software Foundation. + . + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranties of + MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU 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 General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/debian/gir1.2-ubuntu-app-launch-3.install +++ ubuntu-app-launch-0.12+17.04.20170404.2/debian/gir1.2-ubuntu-app-launch-3.install @@ -0,0 +1 @@ +usr/lib/*/girepository-1.0 /usr/lib --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/debian/libubuntu-app-launch3-dev.install +++ ubuntu-app-launch-0.12+17.04.20170404.2/debian/libubuntu-app-launch3-dev.install @@ -0,0 +1,4 @@ +usr/lib/*/libubuntu-app-launch.so +usr/lib/*/pkgconfig/* +usr/include/* +usr/share/gir-1.0/* --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/debian/libubuntu-app-launch4.install +++ ubuntu-app-launch-0.12+17.04.20170404.2/debian/libubuntu-app-launch4.install @@ -0,0 +1 @@ +usr/lib/*/libubuntu-app-launch.so.4* --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/debian/libubuntu-app-launch4.shlibs +++ ubuntu-app-launch-0.12+17.04.20170404.2/debian/libubuntu-app-launch4.shlibs @@ -0,0 +1 @@ +libubuntu-app-launch 4 libubuntu-app-launch4 (>= 0.10) --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/debian/rules +++ ubuntu-app-launch-0.12+17.04.20170404.2/debian/rules @@ -0,0 +1,26 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Get full logs in tests +export G_MESSAGES_DEBUG=all + +# Ensure tests fail with criticals +#export G_DEBUG=fatal_criticals + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 +export DPKG_GENSYMBOLS_CHECK_LEVEL=4 + +%: + dh $@ --with gir --fail-missing + +override_dh_installdeb: + sed -e"s/#MULTIARCH#/$(DEB_HOST_MULTIARCH)/g" \ + debian/ubuntu-app-launch.postinst.in \ + > debian/ubuntu-app-launch.postinst + dh_installdeb + +override_dh_auto_test: + # Tests are broken with droppage of libertine + # probably dropped too much of tests + -dh_auto_test --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/debian/ubuntu-app-launch-tools.install +++ ubuntu-app-launch-0.12+17.04.20170404.2/debian/ubuntu-app-launch-tools.install @@ -0,0 +1,2 @@ +usr/bin/ubuntu-app-* +usr/bin/ubuntu-helper-* --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/debian/ubuntu-app-launch.install +++ ubuntu-app-launch-0.12+17.04.20170404.2/debian/ubuntu-app-launch.install @@ -0,0 +1,2 @@ +usr/lib/*/ubuntu-app-launch/* +usr/bin/snappy-xmir* --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/debian/ubuntu-app-launch.postinst.in +++ ubuntu-app-launch-0.12+17.04.20170404.2/debian/ubuntu-app-launch.postinst.in @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +# Make the setuid helper setuid + +if [ "$1" = configure ]; then + chmod u+s /usr/lib/#MULTIARCH#/ubuntu-app-launch/oom-adjust-setuid-helper +fi + +#DEBHELPER# + +exit 0 --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/debian/ubuntu-app-test.install +++ ubuntu-app-launch-0.12+17.04.20170404.2/debian/ubuntu-app-test.install @@ -0,0 +1,4 @@ +usr/share/applications/ubuntu-app-test.desktop +usr/share/ubuntu-app-launch/ubuntu-app-test.qml +usr/share/icons/hicolor/scalable/apps/ubuntu-app-test.svg +usr/bin/app-test/* /usr/bin --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/libubuntu-app-launch/CMakeLists.txt +++ ubuntu-app-launch-0.12+17.04.20170404.2/libubuntu-app-launch/CMakeLists.txt @@ -16,7 +16,6 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Wpedantic") add_definitions ( -DOOM_HELPER="${pkglibexecdir}/oom-adjust-setuid-helper" ) -add_definitions ( -DLIBERTINE_LAUNCH="${CMAKE_INSTALL_FULL_BINDIR}/libertine-launch" ) add_definitions ( -DG_LOG_DOMAIN="ubuntu-app-launch" ) add_definitions ( -DUBUNTU_APP_LAUNCH_ARCH="${UBUNTU_APP_LAUNCH_ARCH}" ) add_definitions ( -DHELPER_EXEC_TOOL_DIR="${pkglibexecdir}" ) @@ -41,8 +40,6 @@ app-store-base.cpp app-store-legacy.h app-store-legacy.cpp -app-store-libertine.h -app-store-libertine.cpp app-store-snap.h app-store-snap.cpp helper.cpp @@ -54,8 +51,6 @@ application-impl-base.cpp application-impl-legacy.h application-impl-legacy.cpp -application-impl-libertine.h -application-impl-libertine.cpp application-impl-snap.h application-impl-snap.cpp application-info-desktop.h @@ -107,7 +102,6 @@ ${CLICK_LIBRARIES} ${ZEITGEIST_LIBRARIES} ${MIR_LIBRARIES} - ${LIBERTINE_LIBRARIES} ${CURL_LIBRARIES} -lpthread -Wl,--no-undefined @@ -133,7 +127,6 @@ ${CLICK_LIBRARIES} ${ZEITGEIST_LIBRARIES} ${MIR_LIBRARIES} - ${LIBERTINE_LIBRARIES} ${CURL_LIBRARIES} -lpthread -Wl,--no-undefined --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/libubuntu-app-launch/app-store-base.cpp +++ ubuntu-app-launch-0.12+17.04.20170404.2/libubuntu-app-launch/app-store-base.cpp @@ -19,7 +19,6 @@ #include "app-store-base.h" #include "app-store-legacy.h" -#include "app-store-libertine.h" #include "app-store-snap.h" namespace ubuntu @@ -43,8 +42,6 @@ return { std::make_shared(registry) /* Legacy */ , - std::make_shared(registry) /* Libertine */ - , std::make_shared(registry) /* Snappy */ }; } --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/libubuntu-app-launch/application-impl-legacy.cpp +++ ubuntu-app-launch-0.12+17.04.20170404.2/libubuntu-app-launch/application-impl-legacy.cpp @@ -170,18 +170,6 @@ execline = std::string{legacyexec} + " " + execline; } - else if (appinfo_->xMirEnable().value()) - { - /* If we're setting up XMir we also need the other helpers - that libertine is helping with */ - auto libertine_launch = g_getenv("UBUNTU_APP_LAUNCH_LIBERTINE_LAUNCH"); - if (libertine_launch == nullptr) - { - libertine_launch = LIBERTINE_LAUNCH; - } - - execline = std::string{libertine_launch} + " " + execline; - } retval.emplace_back(std::make_pair("APP_EXEC", execline)); --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/libubuntu-app-launch/application-impl-snap.cpp +++ ubuntu-app-launch-0.12+17.04.20170404.2/libubuntu-app-launch/application-impl-snap.cpp @@ -295,25 +295,9 @@ std::list> retval; retval.emplace_back(std::make_pair("APP_XMIR_ENABLE", info_->xMirEnable().value() ? "1" : "0")); - if (info_->xMirEnable() && getenv("SNAP") == nullptr) - { - /* If we're setting up XMir we also need the other helpers - that libertine is helping with */ - auto libertine_launch = g_getenv("UBUNTU_APP_LAUNCH_LIBERTINE_LAUNCH"); - if (libertine_launch == nullptr) - { - libertine_launch = LIBERTINE_LAUNCH; - } - - retval.emplace_back( - std::make_pair("APP_EXEC", std::string(libertine_launch) + " " + info_->execLine().value())); - } - else - { - /* If we're in a snap the libertine helpers are setup by - the snap stuff */ - retval.emplace_back(std::make_pair("APP_EXEC", info_->execLine().value())); - } + /* If we're in a snap the libertine helpers are setup by + the snap stuff */ + retval.emplace_back(std::make_pair("APP_EXEC", info_->execLine().value())); return retval; } --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/libubuntu-app-launch/snapd-info.h +++ ubuntu-app-launch-0.12+17.04.20170404.2/libubuntu-app-launch/snapd-info.h @@ -22,6 +22,7 @@ #include #include #include +#include #include --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/libubuntu-app-launch/ubuntu-app-launch-trace.tp +++ ubuntu-app-launch-0.12+17.04.20170404.2/libubuntu-app-launch/ubuntu-app-launch-trace.tp @@ -18,13 +18,6 @@ ctf_string(type, type) ) ) -TRACEPOINT_EVENT(ubuntu_app_launch, libual_determine_libertine, - TP_ARGS(const char *, appid, const char *, executionenv), - TP_FIELDS( - ctf_string(appid, appid) - ctf_string(executionenv, executionenv) - ) -) TRACEPOINT_EVENT(ubuntu_app_launch, libual_job_path_determined, TP_ARGS(const char *, appid, const char *, job_path), TP_FIELDS( --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/libubuntu-app-launch/utils-shared.c +++ ubuntu-app-launch-0.12+17.04.20170404.2/libubuntu-app-launch/utils-shared.c @@ -19,7 +19,6 @@ #include "utils.h" #include -#include #include "ual-tracepoint.h" @@ -97,202 +96,6 @@ return keyfile; } -/* Structure to handle data for the cgmanager connection - set of callbacks */ -typedef struct { - GMainLoop * loop; - GCancellable * cancel; - GDBusConnection * con; -} cgm_connection_t; - -/* Function that gets executed when we timeout trying to connect. This - is related to: LP #1377332 */ -static gboolean -cgroup_manager_connection_timeout_cb (gpointer data) -{ - cgm_connection_t * connection = (cgm_connection_t *)data; - - g_cancellable_cancel(connection->cancel); - - return G_SOURCE_CONTINUE; -} - -static void -cgroup_manager_connection_core_cb (GDBusConnection *(*finish_func)(GAsyncResult * res, GError ** error), GAsyncResult * res, cgm_connection_t * connection) -{ - GError * error = NULL; - - connection->con = finish_func(res, &error); - - if (error != NULL) { - g_warning("Unable to get cgmanager connection: %s", error->message); - g_error_free(error); - } - - g_main_loop_quit(connection->loop); -} - -static void -cgroup_manager_connection_bus_cb (GObject * obj, GAsyncResult * res, gpointer data) -{ - cgroup_manager_connection_core_cb(g_bus_get_finish, res, (cgm_connection_t *)data); -} - -static void -cgroup_manager_connection_addr_cb (GObject * obj, GAsyncResult * res, gpointer data) -{ - cgroup_manager_connection_core_cb(g_dbus_connection_new_for_address_finish, res, (cgm_connection_t *)data); -} - -G_DEFINE_QUARK(CGMANAGER_CONTEXT, cgmanager_context) - -/* Get the connection to the cgroup manager */ -GDBusConnection * -cgroup_manager_connection (void) -{ - gboolean use_session_bus = g_getenv("UBUNTU_APP_LAUNCH_CG_MANAGER_SESSION_BUS") != NULL; - GMainContext * context = g_main_context_new(); - g_main_context_push_thread_default(context); - - cgm_connection_t connection = { - .loop = g_main_loop_new(context, FALSE), - .con = NULL, - .cancel = g_cancellable_new() - }; - - GSource * timesrc = g_timeout_source_new_seconds(1); - g_source_set_callback(timesrc, cgroup_manager_connection_timeout_cb, &connection, NULL); - g_source_attach(timesrc, context); - - if (use_session_bus) { - /* For working dbusmock */ - g_debug("Connecting to CG Manager on session bus"); - g_bus_get(G_BUS_TYPE_SESSION, - connection.cancel, - cgroup_manager_connection_bus_cb, - &connection); - } else { - g_dbus_connection_new_for_address( - CGMANAGER_DBUS_PATH, - G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT, - NULL, /* Auth Observer */ - connection.cancel, /* Cancellable */ - cgroup_manager_connection_addr_cb, - &connection); - } - - g_main_loop_run(connection.loop); - - g_source_destroy(timesrc); - g_source_unref(timesrc); - - g_main_loop_unref(connection.loop); - g_object_unref(connection.cancel); - - g_main_context_pop_thread_default(context); - - if (!use_session_bus && connection.con != NULL) { - g_object_set_qdata(G_OBJECT(connection.con), - cgmanager_context_quark(), - context); - } else { - g_main_context_unref(context); - } - - return connection.con; -} - -/* This does a complex unref for the case that we're not using a shared - pointer. In that case the initialization happens under the context that - we used for the timeout, and it turns out GDBus saves that context to - use for the close event. Upon the task closing it sends an idle source - to that context which free's the last bit of memory. So we need the events - on that context to be executed or we just leak. So what this does is force - a close synchronously so that the event gets placed on the context and then - frees the context to ensure that all of the events are processed. */ -void -cgroup_manager_unref (GDBusConnection * cgmanager) -{ - if (cgmanager == NULL) - return; - - GMainContext * creationcontext = g_object_get_qdata(G_OBJECT(cgmanager), cgmanager_context_quark()); - if (creationcontext == NULL) { - g_object_unref(cgmanager); - return; - } - - GError * error = NULL; - g_dbus_connection_close_sync(cgmanager, NULL, &error); - - if (error != NULL) { - g_warning("Unable to close CGManager Connection: %s", error->message); - g_error_free(error); - } - - g_object_unref(cgmanager); - - while (g_main_context_pending(creationcontext)) { - g_main_context_iteration(creationcontext, TRUE /* may block */); - } - - g_main_context_unref(creationcontext); -} - -/* Get the PIDs for a particular cgroup */ -/* We're using the base cgroup 'freezer' in this code (and - in the Upstart jobs). Really the actual group is meaningless - we just need one that is in every kernel we need to support. - We're just using the cgroup as a bag of PIDs, not for - restricting any particular resource. */ -GList * -pids_from_cgroup (GDBusConnection * cgmanager, const gchar * jobname, const gchar * instancename) -{ - GError * error = NULL; - const gchar * name = g_getenv("UBUNTU_APP_LAUNCH_CG_MANAGER_NAME"); - gchar * groupname = NULL; - if (jobname != NULL) { - groupname = g_strdup_printf("upstart/%s-%s", jobname, instancename); - } - - g_debug("Looking for cg manager '%s' group '%s'", name, groupname); - - GVariant * vtpids = g_dbus_connection_call_sync(cgmanager, - name, /* bus name for direct connection is NULL */ - "/org/linuxcontainers/cgmanager", - "org.linuxcontainers.cgmanager0_0", - "GetTasksRecursive", - g_variant_new("(ss)", "freezer", groupname ? groupname : ""), - G_VARIANT_TYPE("(ai)"), - G_DBUS_CALL_FLAGS_NONE, - -1, /* default timeout */ - NULL, /* cancellable */ - &error); - - g_free(groupname); - - if (error != NULL) { - g_warning("Unable to get PID list from cgroup manager: %s", error->message); - g_error_free(error); - return NULL; - } - - GVariant * vpids = g_variant_get_child_value(vtpids, 0); - GVariantIter iter; - g_variant_iter_init(&iter, vpids); - gint32 pid; - GList * retval = NULL; - - while (g_variant_iter_loop(&iter, "i", &pid)) { - retval = g_list_prepend(retval, GINT_TO_POINTER(pid)); - } - - g_variant_unref(vpids); - g_variant_unref(vtpids); - - return retval; -} - /* Global markers for the ual_tracepoint macro */ int _ual_tracepoints_env_checked = 0; int _ual_tracepoints_enabled = 0; --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/libubuntu-app-launch/utils.h +++ ubuntu-app-launch-0.12+17.04.20170404.2/libubuntu-app-launch/utils.h @@ -38,12 +38,6 @@ int timeout_s); void starting_handshake_wait (handshake_t * handshake); -GDBusConnection * cgroup_manager_connection (void); -void cgroup_manager_unref (GDBusConnection * cgroup_manager); -GList * pids_from_cgroup (GDBusConnection * cgmanager, - const gchar * jobname, - const gchar * instancename); - gboolean verify_keyfile (GKeyFile * inkeyfile, const gchar * desktop); --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/tests/CMakeLists.txt +++ ubuntu-app-launch-0.12+17.04.20170404.2/tests/CMakeLists.txt @@ -146,7 +146,6 @@ info-watcher-zg.cpp jobs-base-test.cpp jobs-systemd.cpp - libertine-service.h registry-mock.h snapd-info-test.cpp snapd-mock.h --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/tests/libual-test.cc +++ ubuntu-app-launch-0.12+17.04.20170404.2/tests/libual-test.cc @@ -32,7 +32,6 @@ #include "ubuntu-app-launch.h" #include "eventually-fixture.h" -#include "libertine-service.h" #include "mir-mock.h" #include "snapd-mock.h" #include "systemd-mock.h" @@ -46,7 +45,6 @@ DbusTestService *service = NULL; DbusTestDbusMock *mock = NULL; DbusTestDbusMock *cgmock = NULL; - std::shared_ptr libertine; std::shared_ptr systemd; GDBusConnection *bus = NULL; std::string last_focus_appid; @@ -93,8 +91,6 @@ virtual void SetUp() { g_setenv("XDG_DATA_DIRS", CMAKE_SOURCE_DIR, TRUE); - g_setenv("XDG_CACHE_HOME", CMAKE_SOURCE_DIR "/libertine-data", TRUE); - g_setenv("XDG_DATA_HOME", CMAKE_SOURCE_DIR "/libertine-home", TRUE); g_setenv("UBUNTU_APP_LAUNCH_SNAPD_SOCKET", LOCAL_SNAPD_TEST_SOCKET, TRUE); g_setenv("UBUNTU_APP_LAUNCH_SNAP_BASEDIR", SNAP_BASEDIR, TRUE); @@ -121,18 +117,6 @@ /* Put it together */ dbus_test_service_add_task(service, *systemd); - /* Add in Libertine */ - libertine = std::make_shared(); - dbus_test_service_add_task(service, *libertine); - - dbus_test_service_start_tasks(service); - - bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL); - g_dbus_connection_set_exit_on_close(bus, FALSE); - g_object_add_weak_pointer(G_OBJECT(bus), (gpointer *)&bus); - - ASSERT_EVENTUALLY_FUNC_EQ(false, std::function{[&] { return libertine->getUniqueName().empty(); }}); - ASSERT_TRUE(ubuntu_app_launch_observer_add_app_focus(focus_cb, this)); ASSERT_TRUE(ubuntu_app_launch_observer_add_app_resume(resume_cb, this)); } @@ -145,7 +129,6 @@ ubuntu::app_launch::Registry::clearDefault(); systemd.reset(); - libertine.reset(); g_clear_object(&service); g_object_unref(bus); @@ -321,13 +304,6 @@ EXPECT_EQ(nullptr, ubuntu_app_launch_triplet_to_app_id("com.test.no-object", NULL, NULL)); EXPECT_EQ(nullptr, ubuntu_app_launch_triplet_to_app_id("com.test.no-version", NULL, NULL)); - /* Libertine tests */ - EXPECT_EQ(nullptr, ubuntu_app_launch_triplet_to_app_id("container-name", NULL, NULL)); - EXPECT_EQ(nullptr, ubuntu_app_launch_triplet_to_app_id("container-name", "not-exist", NULL)); - EXPECT_STREQ("container-name_test_0.0", ubuntu_app_launch_triplet_to_app_id("container-name", "test", NULL)); - EXPECT_STREQ("container-name_user-app_0.0", - ubuntu_app_launch_triplet_to_app_id("container-name", "user-app", NULL)); - snapd.result(); } --- ubuntu-app-launch-0.12+17.04.20170404.2.orig/tests/list-apps.cpp +++ ubuntu-app-launch-0.12+17.04.20170404.2/tests/list-apps.cpp @@ -23,10 +23,8 @@ #include #include "eventually-fixture.h" -#include "libertine-service.h" #include "app-store-legacy.h" -#include "app-store-libertine.h" #include "app-store-snap.h" #include "application-impl-snap.h" #include "application.h" @@ -38,10 +36,6 @@ class ListApps : public EventuallyFixture { protected: - DbusTestService* service = nullptr; - GDBusConnection* bus = nullptr; - std::shared_ptr libertine; - virtual void SetUp() { /* Ensure it is cleared */ @@ -54,30 +48,11 @@ g_setenv("UBUNTU_APP_LAUNCH_SNAPD_SOCKET", SNAPD_LIST_APPS_SOCKET, TRUE); g_setenv("UBUNTU_APP_LAUNCH_SNAP_BASEDIR", SNAP_BASEDIR, TRUE); g_setenv("UBUNTU_APP_LAUNCH_DISABLE_SNAPD_TIMEOUT", "You betcha!", TRUE); - - service = dbus_test_service_new(nullptr); - - libertine = std::make_shared(); - dbus_test_service_add_task(service, *libertine); - - dbus_test_service_start_tasks(service); - - bus = g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr, nullptr); - g_dbus_connection_set_exit_on_close(bus, FALSE); - g_object_add_weak_pointer(G_OBJECT(bus), (gpointer*)&bus); - - ASSERT_EVENTUALLY_FUNC_EQ(false, std::function{[&] { return libertine->getUniqueName().empty(); }}); } virtual void TearDown() { g_unlink(SNAPD_LIST_APPS_SOCKET); - - libertine.reset(); - g_clear_object(&service); - - g_object_unref(bus); - ASSERT_EVENTUALLY_EQ(nullptr, bus); } bool findApp(const std::list>& apps, const std::string& appid) @@ -152,20 +127,6 @@ ubuntu::app_launch::AppID::Version::from_raw({})))); } -TEST_F(ListApps, ListLibertine) -{ - auto registry = std::make_shared(); - ubuntu::app_launch::app_store::Libertine store(registry->impl); - auto apps = store.list(); - - printApps(apps); - - EXPECT_EQ(3, int(apps.size())); - - EXPECT_TRUE(findApp(apps, "container-name_test_0.0")); - EXPECT_TRUE(findApp(apps, "container-name_user-app_0.0")); -} - static std::pair interfaces{ "GET /v2/interfaces HTTP/1.1\r\nHost: snapd\r\nAccept: */*\r\n\r\n", SnapdMock::httpJsonResponse(