Update to 2.10.1.1355

4 files changed, 22 insertions, 229 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 62ccd70bef06..cf49514680c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
+# Generated by mksrcinfo v8
+# Tue Jul  3 08:45:19 UTC 2018
 pkgbase = rescuetime
 	pkgdesc = Application time-tracking for Linux. Stable version
-	pkgver = 2.10.0.1338
+	pkgver = 2.10.1.1355
 	pkgrel = 1
 	url = https://www.rescuetime.com
-	install = rescuetime.install
 	arch = i686
 	arch = x86_64
 	license = GPL2
 	depends = qt4
 	depends = xorg-xprop
 	depends = xprintidle
-	conflicts = rescuetime-beta
-	source_i686 = rescuetime_2.10.0.1338_i686.deb::https://www.rescuetime.com/installers/rescuetime_current_i386.deb
-	sha256sums_i686 = dec8079a7f0888ec92a0b3a26dfbe14c6213e9788de61ad1772f07066753ace8
-	source_x86_64 = rescuetime_2.10.0.1338_amd64.deb::https://www.rescuetime.com/installers/rescuetime_current_amd64.deb
-	sha256sums_x86_64 = 90b30405b98e8da7aa670acdcffa52e79ae212c1f833556646ab31455cd05708
+	source_i686 = rescuetime_2.10.1.1355_i686.deb::https://www.rescuetime.com/installers/rescuetime_current_i386.deb
+	sha256sums_i686 = 25bda638157955d73cf1e48bb0d28f2ab1026fa8bd2cf5853ef99e2de7d0f1e6
+	source_x86_64 = rescuetime_2.10.1.1355_amd64.deb::https://www.rescuetime.com/installers/rescuetime_current_amd64.deb
+	sha256sums_x86_64 = 2d8b970f9d0ac73974cf3c2717340702f4beb450a8945263cbd6c375b199e3d3
 
 pkgname = rescuetime
 
diff --git a/PKGBUILD b/PKGBUILD
index c87f1f3fb5f5..3765edb75e12 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,36 @@
 # Maintainer: Asyrique Thevendran <asyrique+AUR@gmail.com>
 # Contributor: Limao Luo <luolimao+AUR@gmail.com>
 # Contributor: kaptoxic dragos240
+# Contributor: Caleb Maclennan <caleb@alerque.com>
 
 pkgname=rescuetime
-pkgver=2.10.0.1338
+pkgver=2.10.1.1355
 pkgrel=1
 pkgdesc="Application time-tracking for Linux. Stable version"
 arch=('i686' 'x86_64')
 url=https://www.rescuetime.com
 license=('GPL2')
 depends=('qt4' 'xorg-xprop' 'xprintidle')
-conflicts=($pkgname-beta)
-install=$pkgname.install
 source_i686=("${pkgname}_${pkgver}_i686.deb"::"$url/installers/${pkgname}_current_i386.deb")
 source_x86_64=("${pkgname}_${pkgver}_amd64.deb"::"$url/installers/${pkgname}_current_amd64.deb")
-sha256sums_i686=('dec8079a7f0888ec92a0b3a26dfbe14c6213e9788de61ad1772f07066753ace8')
-sha256sums_x86_64=('90b30405b98e8da7aa670acdcffa52e79ae212c1f833556646ab31455cd05708')
+sha256sums_i686=('25bda638157955d73cf1e48bb0d28f2ab1026fa8bd2cf5853ef99e2de7d0f1e6')
+sha256sums_x86_64=('2d8b970f9d0ac73974cf3c2717340702f4beb450a8945263cbd6c375b199e3d3')
 
 pkgver() {
-grep Version control | cut --fields=2 -d' '
+    grep Version control | cut --fields=2 -d' '
 }
 
 prepare() {
-bsdtar -xf control.tar.gz control
-bsdtar -xf data.tar.xz
+    bsdtar -xf control.tar.gz control
+    bsdtar -xf data.tar.xz
 }
 
 package() {
-install -Dm644 {,"$pkgdir"/}usr/share/$pkgname/curl-ca-bundle.crt
-install -Dm755 {,"$pkgdir"/}usr/bin/$pkgname
-}
\ No newline at end of file
+    install -Dm644 {,"$pkgdir"/}usr/share/$pkgname/curl-ca-bundle.crt
+    install -Dm755 {,"$pkgdir"/}usr/bin/$pkgname
+}
+
+post_install() {
+  echo "Firefox Add-on:   https://addons.mozilla.org/en-us/firefox/addon/rescuetime-for-firefox/"
+  echo "Chrome Extension: https://chrome.google.com/webstore/detail/bdakmnplckeopfghnlpocafcepegjeap"
+}
diff --git a/rescuetime.changelog b/rescuetime.changelog
deleted file mode 100644
index 5f93721c962f..000000000000
--- a/rescuetime.changelog
+++ /dev/null
@@ -1,207 +0,0 @@
-RescueTime for Linux Release Notes
-
-2.9.11.1285 - 2016/11/30 (Release)
-Changes
-
-  Updated and rebuilt libcurl (7.50.3) with c-ares (1.12.0) to potentially fix crashing issue.
-  No longer blocking "newtab" from Chrome or Firefox even if included in blocked list.
-  Added dependency ca-certifcates in attempt to use shipped ca-cert-bundles
-
-2.9.10.1273 - 2016/09/13
-Changes
-
-  FocusTime dialog box no longer specifies Very Distracting (-2) scored activities.
-  RescueTime checks to see if another instance of is already running, and then shuts down if it is.
-
-2.9.10.1255 - 2016/04/21
-Changes
-
-  Fixed issue where Chrome was not collecting website information.
-  Removed a major memory leak while collecting website information in Chrome/Firefox.
-  Optimized Chrome website collection.
-
-2.9.10.1250 - 2016/04/15
-Changes
-
-  Updated a software dependency to fix an issue on Windows with RescueTime keeping the computer awake.
-
-2.9.10.1230 - 2015/12/17
-Changes
-
-  Forcing SSL usage and verifying peer for more secure communications.
-
-2.8.9.1185 - 2015/8/31
-Changes
-
-  Fix for opening more than just http:// links from RescueTime alerts.
-
-2.8.9.1170 - 2015/7/9
-Changes
-
-  FocusTime end notifying server for other IFTTT / Zapier services.
-
-2.8.9.1165 - 2015/6/10
-Changes
-
-  FocusTime duration sent to server when starting session.
-  Removed information from debug log, unless higher logging level is used.
-
-2.8.9.1160 - 2015/6/4
-Changes
-
-  Fixed the secondary window title collector, removed extra string and quotes.
-  Now encoding the FocusTime redirect URL.
-
-2.8.9.1155 - 2015/5/28
-Changes
-
-  Fix for configuration loading issue with OfflineTime labels containing - or ,
-  Added more debug prints to track down crashing issues.
-
-2.8.9.1150 - 2015/5/7
-Changes
-
-  Release of Menu changes and fixed ui threading crashes.
-  Fixed pause for 60 minutes displaying until midnight.
-
-2.8.9.1145 - 2015/5/4
-Changes
-
-  Modified Menu to show Pause and Focus time remaining, change to Unpause button.
-  Testing a FocusTime shutoff command from server.
-  Fix for google-chrome-unstable location.
-  Fix for google-chrome location changes for communicating with extension.
-  Several fixed regardning the new menu system.
-  Fix for two possible ui thread crashes.
-
-2.8.8.1040 - 2015/2/3
-
-  Idle Activity feature to not go idle for some period of time with specific activities (for movies).
-  Support for firefox-dev to collect website information.
-
-2.8.7.1025 - 2014/12/29
-Changes
-
-  Idle Activity feature to not go idle for some period of time with specific activities.
-  Support information shows premium/lite status for diagnostic purposes.
-  Support for chrome-stable to collect website information.
-
-2.8.6.1015 - 2014/07/11
-Changes
-
-  Update data version of activity reporting to distinguish between offline and other activities.
-  Removed a misleading cause for unknown default error, should have more information.
-  Fixed user:taken issue when signing in with new user.
-
-2.8.6.988 - 2014/03/31
-Bugs Fixed
-
-  Fixed issue with FocusTime not turning off.
-  Updated activation process.
-  Removed the excessive "unknown default error" status report.
-
-2.8.5.964 - 2013/11/21
-Bugs Fixed
-
-  Reduced server load for activation.
-  Disabled text entry and button on FocusTime window for lite users.
-  Fixed possible but unlikely crash when loading configuration at startup.
-  Fixed crash with alert messages.
-  Fixed issue with seconds vs milliseconds with delay before reading url.
-  Other minor bug fixes and maintenance.
-
-2.8.5.870 - 2013/11/14
-Bugs Fixed
-
-    Removed libXtst requirement from the RPM package.
-    Fixed data loss when loading activity logs with unhandled UTF8 characters.
-    Added url detection for chrome when process name is: google-chrome-stable
-
-New Features
-
-    Packages stdlib statically to install on CentOS/Redhat and other distributions.
-    Enter Offline Time... menu item now added to the menu.
-    Added Survey feature for Team accounts - currently being beta tested, if you are interested please contact for more info
-    PopupTime window to display accumulated distracting time over the day. (By request for select users).
-    Alert to start FocusTime session for X minutes or until midnight. (By request for select users).
-    Alerts that popup on top of all other applications until user clicks okay. (By request for select users).
-    Adjustable delay before reading url from plugin data
-
-2.8.0.783 - 2013/06/07
-New Features
-
-    Menu item layout is now more consistent between Windows, OS X, and Linux versions of RescueTime
-    Offline Time feature now allows you to change your mind if you didn't want to log time but accidentally clicked an option
-
-2.6.9.685 - 2013/05/08
-Bugs Fixed
-
-    Fixed name of the help window to RescueTime Help.
-
-New Features
-
-    RescueTime interface is much more common across all supported platforms.
-    Offline Time now has ability to be dismissed for an hour, and more options button.
-
-2.6.8.557 - 2013/04/01
-Bugs Fixed
-
-    Fixed a data loss issue being caused by certain unicode characters
-    Fixed a problem where unicode window titles details would not be reported properly
-    Fixed a number of crash issues related to slow starting desktop environments
-
-New Features
-
-    Added help menu item to easily provide information to RescueTime Support
-
-2.6.2.274 - 2012/08/01
-Bugs Fixed
-
-    Fixed a large number of xprop errors when scanning applications that hadn't finished loading all properties
-
-New Features
-
-    Added support for Chromium - must use the RescueTime Chrome Plugin from https://www.rescuetime.com/download
-    Added support for Xfce Desktop environment - Big thanks to Waldir for helping us track that down!
-
-2.6.1.218 - 2012/07/10
-New Features
-
-    Many changes to support Fedora 15
-    RPM Package builds for RPM based distributions, Fedora 15 tested
-    Ability to manually check for updates and if an update exists, take you to the download page
-    Automatic update checks will happen every 7 days / 168 hours
-    Changed UI element sizing to accomodate more font family sets
-
-2.6.0.144 - 2012/05/29
-Bugs Fixed
-
-    Many dependency fixes based on feedback from beta testers, the binaries should now work against more common glibc and libstdc++ libraries
-    Fixed a number of segfaults reported by beta users, this version should be much more stable
-    Fixed bad window titles on Fedora
-
-New Features
-
-    Support for Google Chrome URLs - requires https://www.rescuetime.com/installers/rescuetime_chrome.crx extension be installed on Google Chrome
-    Moved the RescueTime configuration and log files to ~/.config/RescueTime.com, users with existing configurations can either copy the RescueTime.com directory manually, or RescueTime will automatically recreate it on first start.
-
-2.6.0.21 - 2012/05/01
-Bugs Fixed
-
-    Fixed application name to use the more friendly name from WM_CLASS
-    Fixed an issue that could cause the last character in a url to be truncated
-
-New Features
-
-    Initial Debian package creation, should automatically install xprintidle if needed
-    Added Offline Time functionality
-    RescueTime will now terminate and output an error in debug_log.txt if xprintidle is not found
-    Updated icons to be more Linux friendly
-
-2.5.1.10 - 2012/04/26
-New Features
-
-    Beta Support for Linux - tested on Ubuntu 11.10 32bit
-    - Dependencies on libxss1 (requires install), xprintidle (included in zip), qt4 shared libraries (should be installed by default Ubuntu installs)
-    - Firefox URL resolution requires https://www.rescuetime.com/installers/rescuetime-firefox-extension.xpi
-    - Currently only support for Firefox URL's and there is no FocusTime feature for Linux yet
diff --git a/rescuetime.install b/rescuetime.install
deleted file mode 100644
index c9f5fff8689a..000000000000
--- a/rescuetime.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install() {
-  echo "Firefox Add-on https://addons.mozilla.org/en-us/firefox/addon/rescuetime-for-firefox/"
-  echo "Chrome Extension https://chrome.google.com/webstore/detail/bdakmnplckeopfghnlpocafcepegjeap"
-}